Make Translator generic towards created entity

src/main/java/com/speedment/code/StandardTranslatorKey.java

@@ -20,6 +20,9 @@
 import com.speedment.config.db.Project;
 import com.speedment.config.db.Table;
 import com.speedment.internal.core.code.TranslatorKeyImpl;
+import com.speedment.internal.codegen.lang.models.Class;
+import com.speedment.internal.codegen.lang.models.ClassOrInterface;
+import com.speedment.internal.codegen.lang.models.Interface;
 import java.util.stream.Stream;
 
 /**
@@ -30,20 +33,22 @@
 @Api(version = "2.3")
 public final class StandardTranslatorKey {
 
-    public final static TranslatorKey<Project> 
-        SPEEDMENT_APPLICATION = new TranslatorKeyImpl<>("SpeedmentApplication"),
-        SPEEDMENT_APPLICATION_METADATA = new TranslatorKeyImpl<>("SpeedmentApplicationMetadata");
+    public final static TranslatorKey<Project, Class> 
+        SPEEDMENT_APPLICATION = new TranslatorKeyImpl<>("SpeedmentApplication", Class.class),
+        SPEEDMENT_APPLICATION_METADATA = new TranslatorKeyImpl<>("SpeedmentApplicationMetadata", Class.class);
 
-    public final static TranslatorKey<Table> 
-        ENTITY = new TranslatorKeyImpl<>("Entity"),
-        ENTITY_IMPL = new TranslatorKeyImpl<>("EntityImpl"),
-        MANAGER_IMPL = new TranslatorKeyImpl<>("ManagerImpl");
+    public final static TranslatorKey<Table, Interface> 
+        ENTITY = new TranslatorKeyImpl<>("Entity", Interface.class);
+
+    public final static TranslatorKey<Table, Class>
+        ENTITY_IMPL = new TranslatorKeyImpl<>("EntityImpl", Class.class),
+        MANAGER_IMPL = new TranslatorKeyImpl<>("ManagerImpl", Class.class);
 
-    public static Stream<TranslatorKey<Project>> projectTranslatorKeys() {
+    public static Stream<TranslatorKey<Project, Class>> projectTranslatorKeys() {
         return Stream.of(SPEEDMENT_APPLICATION, SPEEDMENT_APPLICATION_METADATA);
     }
 
-    public static Stream<TranslatorKey<Table>> tableTranslatorKeys() {
+    public static Stream<TranslatorKey<Table, ? extends ClassOrInterface<?>>> tableTranslatorKeys() {
         return Stream.of(ENTITY, ENTITY_IMPL, MANAGER_IMPL);
     }
 

src/main/java/com/speedment/code/Translator.java

@@ -37,30 +37,30 @@
 import com.speedment.internal.codegen.lang.models.ClassOrInterface;
 import com.speedment.internal.codegen.lang.models.File;
 import java.util.Map;
-import static java.util.Objects.requireNonNull;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
+import static java.util.Objects.requireNonNull;
 
 /**
  * A component that can translate a {@link Document} into something else. This
  * interface is implemented to generate more files from the same database
  * structure.
  *
- * @author pemi
- * @param <T> the Document type to use
- * @param <R> the type to translate into
- * @see Document
- * @since 2.3
+ * @author       pemi
+ * @param <DOC>  the Document type to use
+ * @param <T>    the codegen type to make (Class, Interface or Enum)
+ * @see          Document
+ * @since        2.3
  */
 @Api(version = "2.3")
-public interface Translator<T extends Document & HasMainInterface, R> extends Supplier<R> {
+public interface Translator<DOC extends Document & HasMainInterface, T extends ClassOrInterface<T>> extends Supplier<File> {
 
     /**
      * The document being translated.
      *
      * @return  the document
      */
-    T getDocument();
+    DOC getDocument();
 
     /**
      * The document being translated wrapped in a {@link HasAlias}.
@@ -198,7 +198,7 @@ default <E extends Document> E getDocument(Class<E> clazz) {
                 ));
     }
 
-    default Meta<R, String> generate() {
+    default Meta<File, String> generate() {
         return getCodeGenerator().metaOn(get()).findFirst().orElseThrow(() -> new SpeedmentException("Unable to generate Java code"));
     }
 
@@ -208,16 +208,14 @@ default String toCode() {
 
     Generator getCodeGenerator();
 
-    void onClass(BiConsumer<File, Builder<com.speedment.internal.codegen.lang.models.Class>> action);
-    void onInterface(BiConsumer<File, Builder<com.speedment.internal.codegen.lang.models.Interface>> action);
-    void onEnum(BiConsumer<File, Builder<com.speedment.internal.codegen.lang.models.Enum>> action);
+    void onMake(BiConsumer<File, Builder<T>> action);
 
-    Stream<BiConsumer<File, Builder<com.speedment.internal.codegen.lang.models.Class>>> classListeners();
-    Stream<BiConsumer<File, Builder<com.speedment.internal.codegen.lang.models.Interface>>> interfaceListeners();
-    Stream<BiConsumer<File, Builder<com.speedment.internal.codegen.lang.models.Enum>>> enumListeners();
+    Stream<BiConsumer<File, Builder<T>>> listeners();
 
     interface Builder<T extends ClassOrInterface<T>> {
-        <P extends Document, D extends Document> Builder<T> addConsumer(String key, BiFunction<P, Map<String, Object>, D> constructor, BiConsumer<T, D> consumer);
+        <P extends Document, DOC extends Document> Builder<T> 
+        addConsumer(String key, BiFunction<P, Map<String, Object>, DOC> constructor, BiConsumer<T, DOC> consumer);
+
         Builder<T> addProjectConsumer(BiConsumer<T, Project> consumer);
         Builder<T> addDbmsConsumer(BiConsumer<T, Dbms> consumer);
         Builder<T> addSchemaConsumer(BiConsumer<T, Schema> consumer);
@@ -226,5 +224,7 @@ interface Builder<T extends ClassOrInterface<T>> {
         Builder<T> addIndexConsumer(BiConsumer<T, Index> consumer);
         Builder<T> addForeignKeyConsumer(BiConsumer<T, ForeignKey> consumer);
         Builder<T> addForeignKeyReferencesThisTableConsumer(BiConsumer<T, ForeignKey> consumer);
+
+        T build();
     }
-}
+}

src/main/java/com/speedment/code/TranslatorConstructor.java

@@ -20,16 +20,17 @@
 import com.speedment.annotation.Api;
 import com.speedment.config.db.trait.HasMainInterface;
 import com.speedment.internal.codegen.base.Generator;
-import com.speedment.internal.codegen.lang.models.File;
+import com.speedment.internal.codegen.lang.models.ClassOrInterface;
 
 /**
  *
- * @author Per Minborg
- * @param <T> document type
- * @since 2.3
+ * @author       Emil Forslund
+ * @param <DOC>  document type
+ * @param <T>    codegen model type
+ * @since        2.3
  */
 @Api(version = "2.3")
 @FunctionalInterface
-public interface TranslatorConstructor<T extends HasMainInterface> {
-    Translator<T, File> apply(Speedment speedment, Generator gen, T document);
+public interface TranslatorConstructor<DOC extends HasMainInterface, T extends ClassOrInterface<T>> {
+    Translator<DOC, T> apply(Speedment speedment, Generator gen, DOC document);
 }

src/main/java/com/speedment/code/TranslatorDecorator.java

@@ -19,16 +19,18 @@
 import com.speedment.annotation.Api;
 import com.speedment.config.db.trait.HasMainInterface;
 import com.speedment.config.db.trait.HasName;
+import com.speedment.internal.codegen.lang.models.ClassOrInterface;
 import com.speedment.internal.core.code.JavaClassTranslator;
 
 /**
  *
- * @author     Emil Forslund
- * @param <T>  the document type
- * @since      2.3
+ * @author       Emil Forslund
+ * @param <DOC>  the document type
+ * @param <T>    the codegen model type
+ * @since        2.3
  */
 @Api(version = "2.3")
 @FunctionalInterface
-public interface TranslatorDecorator<T extends HasName & HasMainInterface> {
-    void apply(JavaClassTranslator<T> translator);
+public interface TranslatorDecorator<DOC extends HasName & HasMainInterface, T extends ClassOrInterface<T>> {
+    void apply(JavaClassTranslator<DOC, T> translator);
 }

src/main/java/com/speedment/code/TranslatorKey.java

@@ -18,17 +18,29 @@
 
 import com.speedment.annotation.Api;
 import com.speedment.config.db.trait.HasMainInterface;
+import com.speedment.internal.codegen.lang.models.ClassOrInterface;
 
 /**
  *
- * @author Per Minborg
- * @param <T> Document type
- * @since 2.3
+ * @author      Per Minborg
+ * @param <DOC> Document type
+ * @param <T>   CodeGen main model
+ * @since       2.3
  */
 @Api(version = "2.3")
-public interface TranslatorKey<T extends HasMainInterface> {
+public interface TranslatorKey<DOC extends HasMainInterface, T extends ClassOrInterface<T>> {
 
+    /**
+     * Returns the key that is used to identify this category of translators.
+     * 
+     * @return  the key
+     */
     String getKey();
 
-
+    /**
+     * Returns the CodeGen type that the translator will operate on.
+     * 
+     * @return  codegen main model type
+     */
+    Class<T> getTranslatedType();
 }