Skip to content

Commit

Permalink
Rename to entityCopy() and entityCreate()
Browse files Browse the repository at this point in the history
  • Loading branch information
@minborg
minborg committed Sep 30, 2016
1 parent a579ff1 commit b57b21f
Show file tree
Hide file tree
Showing 18 changed files with 714 additions and 56 deletions.
14 changes: 7 additions & 7 deletions .../speedment/generator/core/internal/translator/manager/GeneratedManagerImplTranslator.java
View file
Expand Up @@ -63,14 +63,14 @@
import java.util.stream.Stream;

import static com.speedment.common.codegen.constant.DefaultAnnotationUsage.OVERRIDE;
import static com.speedment.common.codegen.internal.util.Formatting.block;
import static com.speedment.common.codegen.internal.util.Formatting.indent;
import static com.speedment.generator.core.internal.util.ColumnUtil.optionalGetterName;
import static com.speedment.generator.core.internal.util.ColumnUtil.usesOptional;
import static com.speedment.generator.core.internal.util.GenerateMethodBodyUtil.*;
import com.speedment.runtime.config.util.DocumentDbUtil;
import com.speedment.runtime.core.exception.SpeedmentException;
import static com.speedment.runtime.core.util.DatabaseUtil.dbmsTypeOf;
import static com.speedment.common.codegen.internal.util.Formatting.block;
import static com.speedment.common.codegen.internal.util.Formatting.indent;

/**
*
Expand All @@ -79,8 +79,8 @@
public final class GeneratedManagerImplTranslator extends AbstractEntityAndManagerTranslator<Class> {

public final static String
NEW_ENTITY_FROM_METHOD = "newEntityFrom",
NEW_EMPTY_ENTITY_METHOD = "newEmptyEntity",
ENTITY_COPY_METHOD_NAME = "entityCopy",
ENTITY_CREATE_METHOD_NAME = "entityCreate",
FIELDS_METHOD = "fields",
PRIMARY_KEYS_FIELDS_METHOD = "primaryKeyFields";

Expand Down Expand Up @@ -218,7 +218,7 @@ protected Class makeCodeGenModel(File file) {
.add(Method.of("createSupport", SimpleParameterizedType.create(ManagerSupport.class, getSupport().entityType()))
.protected_().add(OVERRIDE)
.add(Field.of("injector", Injector.class))
.add("return " + JdbcManagerSupport.class.getSimpleName() + ".create(injector, this, this::" + NEW_ENTITY_FROM_METHOD + ");")
.add("return " + JdbcManagerSupport.class.getSimpleName() + ".create(injector, this, this::" + ENTITY_COPY_METHOD_NAME + ");")
.call(() -> file.add(Import.of(JdbcManagerSupport.class)))
)

Expand Down Expand Up @@ -301,7 +301,7 @@ public Type getImplType() {
}

private Method generateNewEntityFrom(TranslatorSupport<Table> support, File file, Supplier<Stream<? extends Column>> columnsSupplier) {
return Method.of(NEW_ENTITY_FROM_METHOD, support.entityType())
return Method.of(ENTITY_COPY_METHOD_NAME, support.entityType())
.protected_()
.add(SQLException.class)
.add(SpeedmentException.class)
Expand Down Expand Up @@ -369,7 +369,7 @@ private Method generateNewCopyOf(File file) {

final String varName = "source";
final String entityName = "copy";
final Method result = Method.of("newCopyOf", getSupport().entityType()).public_().add(OVERRIDE)
final Method result = Method.of(ENTITY_COPY_METHOD_NAME, getSupport().entityType()).public_().add(OVERRIDE)
.add(Field.of(varName, getSupport().entityType()))
.add("final " + getSupport().entityName() + " " + entityName +
" = new " + getSupport().entityImplName() + "();"
Expand Down
9 changes: 6 additions & 3 deletions ...core/src/main/java/com/speedment/generator/core/internal/util/GenerateMethodBodyUtil.java
View file
Expand Up @@ -36,7 +36,10 @@

import static com.speedment.common.codegen.constant.DefaultAnnotationUsage.OVERRIDE;
import static com.speedment.common.codegen.internal.util.Formatting.*;
import static com.speedment.generator.core.internal.translator.manager.GeneratedManagerImplTranslator.NEW_EMPTY_ENTITY_METHOD;
import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.joining;
import static com.speedment.generator.core.internal.translator.manager.GeneratedManagerImplTranslator.ENTITY_CREATE_METHOD_NAME;
import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.joining;

/**
Expand Down Expand Up @@ -77,7 +80,7 @@ public static String[] generateFieldsBody(TranslatorSupport<Table> support, File
}

public static Method generateNewEmptyEntity(TranslatorSupport<Table> support, File file, Supplier<Stream<? extends Column>> columnsSupplier) {
return Method.of(NEW_EMPTY_ENTITY_METHOD, support.entityType())
return Method.of(ENTITY_CREATE_METHOD_NAME, support.entityType())
.public_().add(OVERRIDE)
.add(generateNewEmptyEntityBody(support, file, columnsSupplier));

Expand All @@ -98,7 +101,7 @@ public interface ReadFromResultSet {
public static String[] generateNewEntityFromBody(ReadFromResultSet readFromResultSet, TranslatorSupport<Table> support, File file, Supplier<Stream<? extends Column>> columnsSupplier) {

final List<String> rows = new LinkedList<>();
rows.add("final " + support.entityName() + " entity = " + NEW_EMPTY_ENTITY_METHOD + "();");
rows.add("final " + support.entityName() + " entity = " + ENTITY_CREATE_METHOD_NAME + "();");

final Stream.Builder<String> streamBuilder = Stream.builder();

Expand Down
62 changes: 62 additions & 0 deletions ...rent/json-stream/src/main/java/com/speedment/plugins/json/internal/JsonComponentImpl.java
View file
Expand Up @@ -31,6 +31,68 @@
import com.speedment.runtime.config.identifier.ColumnIdentifier;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNullElements;
import static java.util.Objects.requireNonNull;

/**
*
Expand Down
93 changes: 93 additions & 0 deletions ...nt/core/src/main/java/com/speedment/runtime/core/internal/AbstractApplicationBuilder.java
View file
Expand Up @@ -64,6 +64,99 @@
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.runtime.config.util.DocumentUtil.relativeName;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;

/**
* This abstract class is implemented by classes that can build a
Expand Down
62 changes: 62 additions & 0 deletions ...t/core/src/main/java/com/speedment/runtime/core/internal/component/EntityManagerImpl.java
View file
Expand Up @@ -24,6 +24,68 @@

import java.util.Optional;

import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;
import static com.speedment.common.invariant.NullUtil.requireNonNulls;
import static java.util.Objects.requireNonNull;

Expand Down

0 comments on commit b57b21f

Please sign in to comment.