Generator: Refactor generator into multiple modules

speedment · Oct 2, 2016 · b8dad03 · b8dad03
1 parent 60949e7
commit b8dad03
Show file tree

Hide file tree

Showing 81 changed files with 656 additions and 310 deletions.
diff --git a/build-parent/generator/pom.xml b/build-parent/generator/pom.xml
@@ -62,65 +62,18 @@
 
         <dependency>
             <groupId>com.speedment.generator</groupId>
-            <artifactId>generator-core</artifactId>
+            <artifactId>generator-translator</artifactId>
-        </dependency>
-
-<!--         com.speedment.common 
-        <dependency>
-            <groupId>com.speedment.common</groupId>
-            <artifactId>injector</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>com.speedment.common</groupId>
-            <artifactId>codegen</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>com.speedment.common</groupId>
-            <artifactId>json</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>com.speedment.common</groupId>
-            <artifactId>mapstream</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>com.speedment.common</groupId>
-            <artifactId>tuple</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>com.speedment.common</groupId>
-            <artifactId>function</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>com.speedment.common</groupId>
-            <artifactId>logger</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.speedment.common</groupId>
+            <groupId>com.speedment.generator</groupId>
-            <artifactId>invariant</artifactId>
+            <artifactId>generator-standard</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>com.speedment.runtime</groupId>
-            <artifactId>runtime-config</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.speedment.runtime</groupId>
+            <groupId>com.speedment.generator</groupId>
-            <artifactId>runtime-typemapper</artifactId>
+            <artifactId>generator-core</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.speedment.runtime</groupId>
-            <artifactId>runtime-core</artifactId>
-        </dependency>-->
-
-
     </dependencies>
 </project>
diff --git a/...parent/maven-plugin/src/main/java/com/speedment/maven/abstractmojo/AbstractClearMojo.java b/...parent/maven-plugin/src/main/java/com/speedment/maven/abstractmojo/AbstractClearMojo.java
@@ -16,7 +16,7 @@
  */
 package com.speedment.maven.abstractmojo;
 
-import com.speedment.generator.core.translator.TranslatorManager;
+import com.speedment.generator.translator.TranslatorManager;
 import com.speedment.maven.typemapper.Mapping;
 import com.speedment.runtime.core.ApplicationBuilder;
 import com.speedment.runtime.core.Speedment;

diff --git a/...ent/maven-plugin/src/main/java/com/speedment/maven/abstractmojo/AbstractGenerateMojo.java b/...ent/maven-plugin/src/main/java/com/speedment/maven/abstractmojo/AbstractGenerateMojo.java
@@ -16,7 +16,7 @@
  */
 package com.speedment.maven.abstractmojo;
 
-import com.speedment.generator.core.translator.TranslatorManager;
+import com.speedment.generator.translator.TranslatorManager;
 import com.speedment.maven.typemapper.Mapping;
 import com.speedment.runtime.core.ApplicationBuilder;
 import com.speedment.runtime.core.Speedment;

diff --git a/...nt/maven-plugin/src/main/java/com/speedment/maven/abstractmojo/AbstractSpeedmentMojo.java b/...nt/maven-plugin/src/main/java/com/speedment/maven/abstractmojo/AbstractSpeedmentMojo.java
@@ -21,8 +21,8 @@
 import com.speedment.common.injector.annotation.InjectKey;
 import com.speedment.common.injector.annotation.WithState;
 import com.speedment.generator.core.GeneratorBundle;
-import com.speedment.generator.core.component.TypeMapperComponent;
+import com.speedment.generator.translator.component.TypeMapperComponent;
-import com.speedment.generator.core.internal.component.CodeGenerationComponentImpl;
+import com.speedment.generator.translator.internal.component.CodeGenerationComponentImpl;
 import com.speedment.maven.component.MavenPathComponent;
 import com.speedment.maven.typemapper.Mapping;
 import com.speedment.runtime.core.ApplicationBuilder;

diff --git a/generator-parent/generator-all/pom.xml b/generator-parent/generator-all/pom.xml
@@ -107,6 +107,90 @@
                 <groupId>com.speedment.generator</groupId>
                 <artifactId>generator-translator</artifactId>
                 <version>${speedment.version}</version>
+
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.speedment.common</groupId>
+                        <artifactId>codegen</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>com.speedment.common</groupId>
+                        <artifactId>injector</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>com.speedment.common</groupId>
+                        <artifactId>mapstream</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>com.speedment.runtime</groupId>
+                        <artifactId>runtime-core</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>com.speedment.runtime</groupId>
+                        <artifactId>runtime-config</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>com.speedment.runtime</groupId>
+                        <artifactId>runtime-typemapper</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>com.speedment.generator</groupId>
+                <artifactId>generator-standard</artifactId>
+                <version>${speedment.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.speedment.common</groupId>
+                        <artifactId>function</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>com.speedment.common</groupId>
+                        <artifactId>codegen</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>com.speedment.common</groupId>
+                        <artifactId>injector</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>com.speedment.common</groupId>
+                        <artifactId>invariant</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>com.speedment.common</groupId>
+                        <artifactId>mapstream</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>com.speedment.common</groupId>
+                        <artifactId>json</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>com.speedment.runtime</groupId>
+                        <artifactId>runtime-config</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>com.speedment.runtime</groupId>
+                        <artifactId>runtime-typemapper</artifactId>
+                    </exclusion>
+
+                    <exclusion>
+                        <groupId>com.speedment.runtime</groupId>
+                        <artifactId>runtime-core</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/generator-parent/generator-core/pom.xml b/generator-parent/generator-core/pom.xml
@@ -47,8 +47,6 @@
                     <instructions>
                         <Export-Package>
                             com.speedment.generator.core.exception.*,
-                            com.speedment.generator.core.translator.*,
-                            com.speedment.generator.core.namer.*,
                             com.speedment.generator.core.component.*,
                             com.speedment.generator.core.event.*,
                             com.speedment.generator.core.util.*,
@@ -115,11 +113,29 @@
             <groupId>com.speedment.runtime</groupId>
             <artifactId>runtime-core</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>com.speedment.generator</groupId>
             <artifactId>generator-translator</artifactId>
             <version>${speedment.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.speedment.generator</groupId>
+            <artifactId>generator-standard</artifactId>
+            <version>${speedment.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Test dependencies -->

diff --git a/...tor-parent/generator-core/src/main/java/com/speedment/generator/core/GeneratorBundle.java b/...tor-parent/generator-core/src/main/java/com/speedment/generator/core/GeneratorBundle.java
@@ -17,7 +17,11 @@
 package com.speedment.generator.core;
 
 import com.speedment.common.injector.InjectBundle;
-import com.speedment.generator.core.internal.component.CodeGenerationComponentImpl;
+import com.speedment.generator.StandardTranslatorBundle;
+import com.speedment.generator.core.internal.component.EventComponentImpl;
+import com.speedment.generator.core.internal.component.PathComponentImpl;
+import com.speedment.generator.core.internal.translator.TranslatorManagerImpl;
+import com.speedment.generator.translator.TranslatorBundle;
 
 import java.util.stream.Stream;
 
@@ -29,9 +33,12 @@ public class GeneratorBundle implements InjectBundle {
 
     @Override
     public Stream<Class<?>> injectables() {
-        return InjectBundle.of(CodeGenerationComponentImpl.class)
+        return InjectBundle.of(
-            .andThen(CodeGenerationComponentImpl.include())
+                EventComponentImpl.class,
+                TranslatorManagerImpl.class,
+                PathComponentImpl.class
+            ).andThen(TranslatorBundle.class)
+            .andThen(StandardTranslatorBundle.class)
             .injectables();
     }
-
 }
diff --git a/...parent/generator-core/src/main/java/com/speedment/generator/core/event/AfterGenerate.java b/...parent/generator-core/src/main/java/com/speedment/generator/core/event/AfterGenerate.java
@@ -18,7 +18,7 @@
 
 import com.speedment.common.codegen.Generator;
 import com.speedment.generator.core.event.trait.ProjectEvent;
-import com.speedment.generator.core.translator.TranslatorManager;
+import com.speedment.generator.translator.TranslatorManager;
 import com.speedment.runtime.config.Project;
 
 import static java.util.Objects.requireNonNull;

diff --git a/...arent/generator-core/src/main/java/com/speedment/generator/core/event/BeforeGenerate.java b/...arent/generator-core/src/main/java/com/speedment/generator/core/event/BeforeGenerate.java
@@ -18,7 +18,7 @@
 
 import com.speedment.common.codegen.Generator;
 import com.speedment.generator.core.event.trait.ProjectEvent;
-import com.speedment.generator.core.translator.TranslatorManager;
+import com.speedment.generator.translator.TranslatorManager;
 import com.speedment.runtime.config.Project;
 
 import static java.util.Objects.requireNonNull;

diff --git a/...arent/generator-core/src/main/java/com/speedment/generator/core/event/GeneratorEvent.java b/...arent/generator-core/src/main/java/com/speedment/generator/core/event/GeneratorEvent.java
@@ -17,7 +17,7 @@
 package com.speedment.generator.core.event;
 
 import com.speedment.common.codegen.Generator;
-import com.speedment.generator.core.translator.TranslatorManager;
+import com.speedment.generator.translator.TranslatorManager;
 
 
 /**

diff --git a/...src/main/java/com/speedment/generator/core/internal/translator/TranslatorManagerImpl.java b/...src/main/java/com/speedment/generator/core/internal/translator/TranslatorManagerImpl.java
@@ -24,15 +24,14 @@
 import com.speedment.common.injector.annotation.Inject;
 import com.speedment.common.logger.Logger;
 import com.speedment.common.logger.LoggerManager;
-import com.speedment.generator.core.component.CodeGenerationComponent;
 import com.speedment.generator.core.component.EventComponent;
 import com.speedment.generator.core.component.PathComponent;
 import com.speedment.generator.core.event.AfterGenerate;
 import com.speedment.generator.core.event.BeforeGenerate;
 import com.speedment.generator.core.event.FileGenerated;
 import com.speedment.generator.core.internal.util.HashUtil;
-import com.speedment.generator.core.translator.Translator;
+import com.speedment.generator.translator.Translator;
-import com.speedment.generator.core.translator.TranslatorManager;
+import com.speedment.generator.translator.TranslatorManager;
 import com.speedment.runtime.core.component.InfoComponent;
 import com.speedment.runtime.config.Project;
 import com.speedment.runtime.config.Table;
@@ -53,6 +52,7 @@
 import java.util.stream.Stream;
 
 import static com.speedment.common.codegen.internal.util.NullUtil.requireNonNulls;
+import com.speedment.generator.translator.component.CodeGenerationComponent;
 import static com.speedment.runtime.config.util.DocumentDbUtil.traverseOver;
 import static java.util.Objects.requireNonNull;
 

diff --git a/...nt/generator-core/src/test/java/com/speedment/generator/DefaultJavaLanguageNamerTest.java b/...nt/generator-core/src/test/java/com/speedment/generator/DefaultJavaLanguageNamerTest.java
@@ -21,16 +21,16 @@
  */
 package com.speedment.generator;
 
-import com.speedment.generator.core.internal.namer.JavaLanguageNamerImpl;
+import com.speedment.generator.translator.internal.namer.JavaLanguageNamerImpl;
-import com.speedment.generator.core.namer.JavaLanguageNamer;
+import com.speedment.generator.translator.namer.JavaLanguageNamer;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static com.speedment.generator.core.namer.JavaLanguageNamer.toHumanReadable;
+import static com.speedment.generator.translator.namer.JavaLanguageNamer.toHumanReadable;
 import static org.junit.Assert.assertEquals;
 
 /**

diff --git a/generator-parent/generator-core/src/test/java/com/speedment/generator/SimpleModel.java b/generator-parent/generator-core/src/test/java/com/speedment/generator/SimpleModel.java
@@ -20,7 +20,7 @@
 import com.speedment.common.codegen.Meta;
 import com.speedment.common.codegen.model.File;
 import com.speedment.generator.core.internal.translator.TranslatorManagerImpl;
-import com.speedment.generator.core.translator.TranslatorManager;
+import com.speedment.generator.translator.TranslatorManager;
 import com.speedment.runtime.core.Speedment;
 import com.speedment.runtime.core.component.ProjectComponent;
 import com.speedment.runtime.config.Column;

diff --git a/...or-parent/generator-core/src/test/java/com/speedment/generator/TranslatorManagerTest.java b/...or-parent/generator-core/src/test/java/com/speedment/generator/TranslatorManagerTest.java
@@ -17,11 +17,11 @@
 package com.speedment.generator;
 
 import com.speedment.common.codegen.model.Interface;
-import com.speedment.generator.core.component.CodeGenerationComponent;
+import com.speedment.generator.translator.namer.JavaLanguageNamer;
-import com.speedment.generator.core.namer.JavaLanguageNamer;
+import com.speedment.generator.standard.StandardTranslatorKey;
-import com.speedment.generator.core.translator.StandardTranslatorKey;
+import com.speedment.generator.translator.Translator;
-import com.speedment.generator.core.translator.Translator;
+import com.speedment.generator.translator.TranslatorManager;
-import com.speedment.generator.core.translator.TranslatorManager;
+import com.speedment.generator.translator.component.CodeGenerationComponent;
 import com.speedment.runtime.config.Table;
 import org.junit.Test;
 

diff --git a/...or-parent/generator-core/src/test/java/com/speedment/generator/TranslatorSupportTest.java b/...or-parent/generator-core/src/test/java/com/speedment/generator/TranslatorSupportTest.java
@@ -22,8 +22,8 @@
 package com.speedment.generator;
 
 import com.speedment.common.injector.Injector;
-import com.speedment.generator.core.namer.JavaLanguageNamer;
+import com.speedment.generator.translator.namer.JavaLanguageNamer;
-import com.speedment.generator.core.translator.TranslatorSupport;
+import com.speedment.generator.translator.TranslatorSupport;
 import com.speedment.runtime.config.Table;
 import org.junit.After;
 import org.junit.AfterClass;