Generator: Optimize SqlAdapter generation by using SqlTypeMapperHelper

speedment · Oct 3, 2016 · 8e63ec5 · 8e63ec5
1 parent 189e4d6
commit 8e63ec5
Show file tree

Hide file tree

Showing 6 changed files with 205 additions and 119 deletions.
diff --git a/.../src/main/java/com/speedment/generator/standard/entity/GeneratedEntityImplTranslator.java b/.../src/main/java/com/speedment/generator/standard/entity/GeneratedEntityImplTranslator.java
@@ -68,6 +68,16 @@ protected Class makeCodeGenModel(File file) {
 
         return newBuilder(file, getSupport().generatedEntityImplName())
 
+            /**
+             * Class details
+             */
+            .forEveryTable((clazz, table) -> {
+                clazz.public_()
+                    .abstract_()
+                    .add(getSupport().entityType())
+                    .add(Constructor.of().protected_());
+            })
+
             /**
              * Getters
              */
@@ -99,7 +109,7 @@ protected Class makeCodeGenModel(File file) {
             .forEveryColumn((clazz, col) -> {
                 clazz
                     .add(Method.of(SETTER_METHOD_PREFIX + getSupport().typeName(col), getSupport().entityType())
-                        .public_().final_()
+                        .public_()
                         .add(OVERRIDE)
                         .add(fieldFor(col))
                         .add("this." + getSupport().variableName(col) + " = " + getSupport().variableName(col) + ";")
@@ -149,22 +159,15 @@ protected Class makeCodeGenModel(File file) {
                     );
                 });
             })
-
+
-            /**
-             * Class details
-             */
             // We need to make it POST_MAKE because other plugins might add fields
             .forEveryTable(Phase.POST_MAKE, (clazz, table) -> {
                 clazz
                     .add(toStringMethod(file))
                     .add(equalsMethod())
                     .add(hashCodeMethod());
             })
-            .build()
+            .build();
-            .public_()
-            .abstract_()
-            .add(getSupport().generatedEntityType())
-            .add(Constructor.of().protected_());
 
     }
 

diff --git a/.../src/main/java/com/speedment/generator/standard/internal/util/GenerateMethodBodyUtil.java b/.../src/main/java/com/speedment/generator/standard/internal/util/GenerateMethodBodyUtil.java
@@ -95,8 +95,10 @@ public interface ReadFromResultSet {
         String readFromResultSet(File file, Column c, AtomicInteger position);
     }
 
-    public static String[] generateNewEntityFromBody(ReadFromResultSet readFromResultSet, TranslatorSupport<Table> support, File file, Supplier<Stream<? extends Column>> columnsSupplier) {
+    public static String[] generateApplyResultSetBody(ReadFromResultSet readFromResultSet, TranslatorSupport<Table> support, File file, Supplier<Stream<? extends Column>> columnsSupplier) {
 
+        file.add(Import.of(SQLException.class));
+
         final List<String> rows = new LinkedList<>();
         rows.add("final " + support.entityName() + " entity = manager." + ENTITY_CREATE_METHOD_NAME + "();");
 
@@ -110,7 +112,7 @@ public static String[] generateNewEntityFromBody(ReadFromResultSet readFromResul
             });
 
         rows.add("try " + block(streamBuilder.build()));
-        rows.add("catch (" + SQLException.class.getSimpleName() + " sqle) " + block(
+        rows.add("catch (final " + SQLException.class.getSimpleName() + " sqle) " + block(
             "throw new " + SpeedmentException.class.getSimpleName() + "(sqle);"
         ));
         rows.add("return entity;");