Fix some inconistencies in CodeGen

speedment · Apr 10, 2016 · 0f040dd · 0f040dd
1 parent da76f87
commit 0f040dd
Show file tree

Hide file tree

Showing 21 changed files with 132 additions and 11 deletions.
diff --git a/src/main/java/com/speedment/code/TranslatorSupport.java b/src/main/java/com/speedment/code/TranslatorSupport.java
@@ -33,6 +33,7 @@
 import com.speedment.util.JavaLanguageNamer;
 import static java.util.Objects.requireNonNull;
 import java.util.Optional;
+import static java.util.Objects.requireNonNull;
 
 /**
  * A support class for the {@link Translator} interface that holds various

diff --git a/src/main/java/com/speedment/codegen/model/Field.java b/src/main/java/com/speedment/codegen/model/Field.java
@@ -28,6 +28,7 @@
 import com.speedment.internal.codegen.model.FieldImpl;
 import static java.util.Objects.requireNonNull;
 import java.util.function.BiFunction;
+import static java.util.Objects.requireNonNull;
 
 /**
  * A model that represents a field in code. This can be either as a method
@@ -52,7 +53,7 @@ enum Factory {
     /**
      * Creates a new instance implementing this interface by using the class
      * supplied by the default factory. To change implementation, please use the
-     * {@link #setSupplier(java.util.function.BiFunction) setSupplier} method.
+     * {@link #setMapper(java.util.function.BiFunction) setSupplier} method.
      *
      * @param name the name
      * @param type the type
@@ -68,7 +69,7 @@ static Field of(String name, Type type) {
      *
      * @param mapper the new constructor
      */
-    static void setSupplier(BiFunction<String, Type, Field> mapper) {
+    static void setMapper(BiFunction<String, Type, Field> mapper) {
         Factory.INST.mapper = requireNonNull(mapper);
     }
 }
diff --git a/src/main/java/com/speedment/codegen/model/Generic.java b/src/main/java/com/speedment/codegen/model/Generic.java
@@ -24,6 +24,7 @@
 import static java.util.Objects.requireNonNull;
 import java.util.Optional;
 import java.util.function.Supplier;
+import static java.util.Objects.requireNonNull;
 
 /**
  * A model that represents the generic part of a type declaration in code. A
@@ -152,7 +153,7 @@ enum Factory {
     /**
      * Creates a new instance implementing this interface by using the class
      * supplied by the default factory. To change implementation, please use the
-     * {@link #setSupplier(java.util.function.Supplier) setSupplier} method.
+     * {@link #setMapper(Supplier) setSupplier} method.
      *
      * @return the new instance
      */
@@ -166,7 +167,7 @@ static Generic of() {
      *
      * @param supplier the new constructor
      */
-    static void setSupplier(Supplier<Generic> supplier) {
+    static void setMapper(Supplier<Generic> supplier) {
         Factory.INST.supplier = requireNonNull(supplier);
     }
 }
diff --git a/src/main/java/com/speedment/codegen/model/Type.java b/src/main/java/com/speedment/codegen/model/Type.java
@@ -24,7 +24,7 @@
 import com.speedment.internal.codegen.model.TypeImpl;
 import static java.util.Objects.requireNonNull;
 import java.util.Optional;
-import java.util.function.Supplier;
+import java.util.function.Function;
 
 /**
  * A model that represents a type in code. When classes, enumerations and
@@ -82,31 +82,31 @@ public interface Type extends HasCopy<Type>, HasName<Type>, HasGenerics<Type>,
      * Factory holder.
      */
     enum Factory { INST;
-        private Supplier<Type> supplier = () -> new TypeImpl("");
+        private Function<String, Type> supplier = TypeImpl::new;
     }
 
     /**
      * Creates a new instance implementing this interface by using the class
      * supplied by the default factory. To change implementation, please use
-     * the {@link #setSupplier(java.util.function.Supplier) setSupplier} method.
+     * the {@link #setMapper(java.util.function.Supplier) setSupplier} method.
      * 
      * @param name  the type name
      * @return      the new instance
      */
     static Type of(String name) {
-        return Factory.INST.supplier.get().setName(name);
+        return Factory.INST.supplier.apply(name);
     }
 
     /**
      * Creates a new instance implementing this interface by using the class
      * supplied by the default factory. To change implementation, please use
-     * the {@link #setSupplier(java.util.function.Supplier) setSupplier} method.
+     * the {@link #setMapper(Function) setSupplier} method.
      * 
      * @param clazz  the java implementation
      * @return       the new instance
      */
     static Type of(java.lang.Class<?> clazz) {
-        return Factory.INST.supplier.get().setJavaImpl(clazz);
+        return Factory.INST.supplier.apply(clazz.getName()).setJavaImpl(clazz);
     }
 
     /**
@@ -115,7 +115,7 @@ static Type of(java.lang.Class<?> clazz) {
      * 
      * @param supplier  the new constructor 
      */
-    static void setSupplier(Supplier<Type> supplier) {
+    static void setMapper(Function<String, Type> supplier) {
         Factory.INST.supplier = requireNonNull(supplier);
     }
 }
diff --git a/src/main/java/com/speedment/internal/codegen/controller/AutoEquals.java b/src/main/java/com/speedment/internal/codegen/controller/AutoEquals.java
@@ -38,6 +38,15 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
+import static com.speedment.internal.codegen.util.Formatting.nl;
+import static com.speedment.internal.codegen.util.Formatting.tab;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.codegen.util.Formatting.nl;
+import static com.speedment.internal.codegen.util.Formatting.tab;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.codegen.util.Formatting.nl;
+import static com.speedment.internal.codegen.util.Formatting.tab;
+import static java.util.Objects.requireNonNull;
 
 /**
  * This control can be applied on a class, enum or similar to auto generate

diff --git a/src/main/java/com/speedment/internal/codegen/controller/AutoImports.java b/src/main/java/com/speedment/internal/codegen/controller/AutoImports.java
@@ -35,6 +35,7 @@
 import java.util.Map;
 import static java.util.Objects.requireNonNull;
 import java.util.function.Consumer;
+import static java.util.Objects.requireNonNull;
 
 /**
  * This control can be applied to a {@link File} to automatically add imports

diff --git a/src/main/java/com/speedment/internal/codegen/controller/AutoJavadoc.java b/src/main/java/com/speedment/internal/codegen/controller/AutoJavadoc.java
@@ -31,6 +31,7 @@
 import static com.speedment.internal.codegen.util.Formatting.SS;
 import static java.util.Objects.requireNonNull;
 import java.util.function.Consumer;
+import static java.util.Objects.requireNonNull;
 
 /**
  * This control generates javadoc stubs for all models descending from the

diff --git a/src/main/java/com/speedment/internal/codegen/controller/SetGetAdd.java b/src/main/java/com/speedment/internal/codegen/controller/SetGetAdd.java
@@ -29,6 +29,13 @@
 import java.util.Optional;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
 
 /**
  * Control that is used to generate setters, getters and adders for fields in 

diff --git a/src/main/java/com/speedment/internal/codegen/java/view/GenericView.java b/src/main/java/com/speedment/internal/codegen/java/view/GenericView.java
@@ -23,6 +23,7 @@
 import static com.speedment.util.CollectorUtil.joinIfNotEmpty;
 import static java.util.Objects.requireNonNull;
 import java.util.Optional;
+import static java.util.Objects.requireNonNull;
 
 /**
  * Transforms from a {@link Generic} to java code.

diff --git a/src/main/java/com/speedment/internal/codegen/java/view/TypeView.java b/src/main/java/com/speedment/internal/codegen/java/view/TypeView.java
@@ -26,6 +26,7 @@
 import static java.util.Objects.requireNonNull;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import static java.util.Objects.requireNonNull;
 
 /**
  * Transforms from a {@link Type} to java code.

diff --git a/src/main/java/com/speedment/internal/codegen/model/GenericImpl.java b/src/main/java/com/speedment/internal/codegen/model/GenericImpl.java
@@ -25,6 +25,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import static com.speedment.util.NullUtil.requireNonNullElements;
 
 /**
  * This is the default implementation of the {@link Generic} interface.

diff --git a/src/main/java/com/speedment/internal/codegen/model/TypeImpl.java b/src/main/java/com/speedment/internal/codegen/model/TypeImpl.java
@@ -25,6 +25,7 @@
 import java.util.Objects;
 import static java.util.Objects.requireNonNull;
 import java.util.Optional;
+import static java.util.Objects.requireNonNull;
 
 /**
  * This is the default implementation of the {@link Type} interface.

diff --git a/src/main/java/com/speedment/internal/codegen/model/constant/DefaultType.java b/src/main/java/com/speedment/internal/codegen/model/constant/DefaultType.java
@@ -33,6 +33,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import static java.util.Objects.requireNonNull;
 
 /**
  * Constant implementations of the {@link Type} interface that can be used to

diff --git a/src/main/java/com/speedment/internal/core/code/DefaultJavaClassTranslator.java b/src/main/java/com/speedment/internal/core/code/DefaultJavaClassTranslator.java
@@ -72,6 +72,15 @@
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Stream;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.util.NullUtil.requireNonNulls;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.util.NullUtil.requireNonNulls;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.util.NullUtil.requireNonNulls;
+import static java.util.Objects.requireNonNull;
 
 /**
  *

diff --git a/src/main/java/com/speedment/internal/core/code/entity/EntityTranslatorSupport.java b/src/main/java/com/speedment/internal/core/code/entity/EntityTranslatorSupport.java
@@ -59,6 +59,27 @@
 import static java.util.Objects.requireNonNull;
 import java.util.Optional;
 import java.util.function.Consumer;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.util.NullUtil.requireNonNulls;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.util.NullUtil.requireNonNulls;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.util.NullUtil.requireNonNulls;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.util.NullUtil.requireNonNulls;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.util.NullUtil.requireNonNulls;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.util.NullUtil.requireNonNulls;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.util.NullUtil.requireNonNulls;
+import static java.util.Objects.requireNonNull;
 
 /**
  *

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
@@ -50,6 +50,20 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import static com.speedment.internal.codegen.util.Formatting.indent;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.codegen.util.Formatting.indent;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.codegen.util.Formatting.indent;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.codegen.util.Formatting.indent;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.codegen.util.Formatting.indent;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.codegen.util.Formatting.indent;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.codegen.util.Formatting.indent;
+import static java.util.Objects.requireNonNull;
 
 /**
  *

diff --git a/src/main/java/com/speedment/internal/core/code/entity/GeneratedEntityTranslator.java b/src/main/java/com/speedment/internal/core/code/entity/GeneratedEntityTranslator.java
@@ -53,6 +53,13 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Stream;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
 
 /**
  *

diff --git a/...eedment/internal/core/code/lifecycle/GeneratedSpeedmentApplicationMetadataTranslator.java b/...eedment/internal/core/code/lifecycle/GeneratedSpeedmentApplicationMetadataTranslator.java
@@ -36,6 +36,9 @@
 import com.speedment.internal.util.document.DocumentTranscoder;
 import static java.util.Objects.requireNonNull;
 import java.util.stream.Stream;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNull;
 
 /**
  *

diff --git a/...a/com/speedment/internal/core/code/lifecycle/GeneratedSpeedmentApplicationTranslator.java b/...a/com/speedment/internal/core/code/lifecycle/GeneratedSpeedmentApplicationTranslator.java
@@ -46,6 +46,12 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import static java.util.stream.Collectors.toSet;
+import static com.speedment.internal.util.document.DocumentDbUtil.traverseOver;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.util.document.DocumentDbUtil.traverseOver;
+import static java.util.Objects.requireNonNull;
+import static com.speedment.internal.util.document.DocumentDbUtil.traverseOver;
+import static java.util.Objects.requireNonNull;
 
 /**
  *

diff --git a/...n/java/com/speedment/internal/core/code/manager/GeneratedEntityManagerImplTranslator.java b/...n/java/com/speedment/internal/core/code/manager/GeneratedEntityManagerImplTranslator.java
@@ -56,6 +56,34 @@
 import java.util.stream.Collectors;
 import static java.util.stream.Collectors.joining;
 import java.util.stream.Stream;
+import static com.speedment.internal.codegen.util.Formatting.block;
+import static com.speedment.internal.codegen.util.Formatting.indent;
+import static com.speedment.internal.codegen.util.Formatting.nl;
+import static java.util.stream.Collectors.joining;
+import static com.speedment.internal.codegen.util.Formatting.block;
+import static com.speedment.internal.codegen.util.Formatting.indent;
+import static com.speedment.internal.codegen.util.Formatting.nl;
+import static java.util.stream.Collectors.joining;
+import static com.speedment.internal.codegen.util.Formatting.block;
+import static com.speedment.internal.codegen.util.Formatting.indent;
+import static com.speedment.internal.codegen.util.Formatting.nl;
+import static java.util.stream.Collectors.joining;
+import static com.speedment.internal.codegen.util.Formatting.block;
+import static com.speedment.internal.codegen.util.Formatting.indent;
+import static com.speedment.internal.codegen.util.Formatting.nl;
+import static java.util.stream.Collectors.joining;
+import static com.speedment.internal.codegen.util.Formatting.block;
+import static com.speedment.internal.codegen.util.Formatting.indent;
+import static com.speedment.internal.codegen.util.Formatting.nl;
+import static java.util.stream.Collectors.joining;
+import static com.speedment.internal.codegen.util.Formatting.block;
+import static com.speedment.internal.codegen.util.Formatting.indent;
+import static com.speedment.internal.codegen.util.Formatting.nl;
+import static java.util.stream.Collectors.joining;
+import static com.speedment.internal.codegen.util.Formatting.block;
+import static com.speedment.internal.codegen.util.Formatting.indent;
+import static com.speedment.internal.codegen.util.Formatting.nl;
+import static java.util.stream.Collectors.joining;
 
 /**
  *

diff --git a/src/main/java/com/speedment/internal/core/code/manager/GeneratedEntityManagerTranslator.java b/src/main/java/com/speedment/internal/core/code/manager/GeneratedEntityManagerTranslator.java
@@ -34,6 +34,13 @@
 import static com.speedment.internal.util.document.DocumentUtil.relativeName;
 import java.util.Arrays;
 import java.util.stream.Collectors;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
+import static com.speedment.internal.util.document.DocumentUtil.relativeName;
 
 /**
  *