Move resp of copy to manager, Fix #197

speedment · Apr 28, 2016 · fa86204 · fa86204
1 parent 8395c93
commit fa86204
Show file tree

Hide file tree

Showing 8 changed files with 130 additions and 107 deletions.
diff --git a/src/main/java/com/speedment/SpeedmentVersion.java b/src/main/java/com/speedment/SpeedmentVersion.java
@@ -32,7 +32,7 @@ public final class SpeedmentVersion {
 
     private static final String IMPLEMENTATION_TITLE = "Speedment",
         IMPLEMENTATION_VENDOR  = "Speedment Inc.", // "Speedment, Inc." difficult to enter into POM because of ','
-        IMPLEMENTATION_VERSION = "2.3.2",
+        IMPLEMENTATION_VERSION = "2.3.3",
         SPECIFICATION_VERSION  = "2.3";
 
     private static final boolean PRODUCTION_MODE = true;

diff --git a/src/main/java/com/speedment/internal/core/code/AbstractBaseEntity.java b/src/main/java/com/speedment/internal/core/code/AbstractBaseEntity.java
@@ -81,6 +81,11 @@ public ENTITY remove(Consumer<MetaResult<ENTITY>> consumer) throws SpeedmentExce
         return manager_().remove(selfAsEntity(), consumer);
     }
 
+    @Override
+    public ENTITY copy() {
+        return manager_().newCopyOf(selfAsEntity());
+    }
+
     protected abstract Class<ENTITY> entityClass();
 
     @SuppressWarnings("unchecked")

diff --git a/src/main/java/com/speedment/internal/core/code/entity/GeneratedEntityImplTranslator.java b/src/main/java/com/speedment/internal/core/code/entity/GeneratedEntityImplTranslator.java
@@ -67,7 +67,7 @@ public GeneratedEntityImplTranslator(Speedment speedment, Generator gen, Table t
     @Override
     protected Class makeCodeGenModel(File file) {
         requireNonNull(file);
-        
+
         file.add(Import.of(Type.of(Speedment.class)));
 
         final Map<Table, List<String>> fkStreamers = new HashMap<>();
@@ -114,9 +114,7 @@ protected Class makeCodeGenModel(File file) {
                     + EntityTranslatorSupport.pluralis(fu.getTable(), getNamer())
                     + "By" + getSupport().typeName(fu.getColumn());
                 fkStreamers.computeIfAbsent(fu.getTable(), t -> new ArrayList<>()).add(methodName);
-
+
-
-
                 final Type returnType = Type.of(Stream.class).add(Generic.of().add(fu.getEmt().getSupport().entityType()));
                 final Method method = Method.of(methodName, returnType).public_().add(OVERRIDE)
                     .add("return " + MANAGER_OF_METHOD + "(" + getSupport().typeName(fu.getTable()) + ".class)")
@@ -128,7 +126,7 @@ protected Class makeCodeGenModel(File file) {
              */
             .forEveryForeignKey((clazz, fk) -> {
                 final FkHolder fu = new FkHolder(getSpeedment(), getCodeGenerator(), fk);
-                
+
                 final Type returnType;
                 if (fu.getColumn().isNullable()) {
                     file.add(Import.of(OPTIONAL));
@@ -160,19 +158,18 @@ protected Class makeCodeGenModel(File file) {
                 }
                 clazz.add(method);
             })
-
             /**
              * Class details
              */
             .forEveryTable(Phase.POST_MAKE, (clazz, table) -> {
-                clazz.add(copy(file))
+                clazz
                     .add(toString(file))
                     .add(equalsMethod())
                     .add(hashCodeMethod())
                     .add(Method.of("entityClass", Type.of(java.lang.Class.class).add(Generic.of().add(getSupport().entityType()))).public_().add(OVERRIDE)
                         .add("return " + getSupport().entityName() + ".class;")
                     );
-                
+
                 /**
                  * Create aggregate streaming functions, if any
                  */
@@ -195,7 +192,6 @@ protected Class makeCodeGenModel(File file) {
                     }
                 });
             })
-
             .build()
             .public_()
             .abstract_()
@@ -205,42 +201,6 @@ protected Class makeCodeGenModel(File file) {
 
     }
 
-    private Method copy(File file) {
-        file.add(Import.of(getSupport().entityImplType()));
-
-        final JavaLanguageNamer namer = getSpeedment().getCodeGenerationComponent().javaLanguageNamer();
-        final String entityName = namer.javaVariableName(getSupport().entityName());
-        final Method result = Method.of("copy", getSupport().entityType()).public_().add(OVERRIDE)
-            .add(
-                "final " + getSupport().entityName() + " " + entityName + " = new " + getSupport().entityImplName() + "() {", indent(
-                    "@Override",
-                    "protected final " + Speedment.class.getSimpleName() + " speedment() {", indent(
-                        "return " + getSupport().generatedEntityImplName() + ".this.speedment();"
-                    ), "}"
-                ), "};",
-                ""
-            );
-
-        columns().forEachOrdered(c -> {
-            if (c.isNullable()) {
-                result.add(
-                    GETTER_METHOD_PREFIX + getSupport().typeName(c) +
-                    "().ifPresent(" + entityName + "::" +
-                    SETTER_METHOD_PREFIX + getSupport().typeName(c) +
-                    ");"
-                );
-            } else {
-                result.add(
-                    entityName + "." + SETTER_METHOD_PREFIX + 
-                    getSupport().typeName(c) + "(get" + 
-                    getSupport().typeName(c) + "());"
-                );
-            }
-        });
-
-        return result.add("", "return " + entityName + ";");
-    }
-
     protected Method toString(File file) {
         file.add(Import.of(Type.of(StringJoiner.class)));
         file.add(Import.of(Type.of(Objects.class)));