Fix remaining test bugs

pom.xml

@@ -84,6 +84,10 @@
             <name>Maria Sparenberg (GitHub:marylla)</name>
             <timezone>Europe/Berlin</timezone>
         </contributor>
+        <contributor>
+            <name>Anton Johansson (GitHub:anton-johansson)</name>
+            <timezone>Europe/Stockholm</timezone>
+        </contributor>
     </contributors>
 
     <issueManagement>

src/main/java/com/speedment/internal/core/code/DefaultJavaClassTranslator.java

@@ -37,7 +37,6 @@
 import com.speedment.config.db.Dbms;
 import com.speedment.config.Document;
 import com.speedment.config.db.ForeignKey;
-import com.speedment.config.db.ForeignKeyColumn;
 import com.speedment.config.db.Index;
 import com.speedment.config.db.Project;
 import com.speedment.config.db.Schema;

src/main/java/com/speedment/internal/core/code/MainGenerator.java

@@ -33,7 +33,6 @@
 import com.speedment.event.BeforeGenerate;
 import com.speedment.internal.logging.Logger;
 import com.speedment.internal.logging.LoggerManager;
-import static com.speedment.internal.util.document.DocumentDbUtil.traverseOver;
 
 import com.speedment.internal.util.Statistics;
 import java.io.IOException;
@@ -49,15 +48,14 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import static java.util.stream.Collectors.toList;
-import static java.util.Objects.requireNonNull;
 import static com.speedment.internal.util.document.DocumentDbUtil.traverseOver;
 import static java.util.Objects.requireNonNull;
 
 /**
  *
  * @author pemi
  */
-public final class MainGenerator implements Consumer<Project> {
+public class MainGenerator implements Consumer<Project> {
 
     private final static Logger LOGGER = LoggerManager.getLogger(MainGenerator.class);
     private final AtomicInteger fileCounter = new AtomicInteger(0);
@@ -113,7 +111,7 @@ public int getFilesCreated() {
         return fileCounter.get();
     }
 
-    public static void writeToFile(Project project, Meta<File, String> meta, AtomicInteger fileCounter) {
+    protected void writeToFile(Project project, Meta<File, String> meta, AtomicInteger fileCounter) {
         requireNonNull(meta);
 
         final String fname = project.getPackageLocation()

src/main/java/com/speedment/internal/core/config/BaseDocument.java

@@ -45,8 +45,8 @@ public BaseDocument(Map<String, Object> data) {
     }
 
     public BaseDocument(Document parent, Map<String, Object> data) {
-        this.parent = parent;
-        this.config = data;
+        this.parent = requireNonNull(parent);
+        this.config = requireNonNull(data);
     }
 
     @Override

src/main/java/com/speedment/internal/core/runtime/SpeedmentApplicationLifecycle.java

@@ -30,6 +30,7 @@
 import com.speedment.internal.util.document.DocumentTranscoder;
 import com.speedment.config.db.Schema;
 import com.speedment.config.db.trait.HasEnabled;
+import com.speedment.config.db.trait.HasName;
 import com.speedment.internal.core.config.db.immutable.ImmutableProject;
 import com.speedment.internal.logging.Logger;
 import com.speedment.internal.logging.LoggerManager;
@@ -116,7 +117,7 @@ public <C extends Document & HasEnabled> T with(final Class<C> type, final Strin
      * @return this instance
      */
     public <C extends Document & HasEnabled> T with(final Class<C> type, final Consumer<C> consumer) {
-        requireNonNulls(type, consumer);       
+        requireNonNulls(type, consumer);
 //        @SuppressWarnings("unchecked")
 //        final Consumer<? extends Document> consumerCasted = (Consumer<? extends Document>) requireNonNull(consumer);
         withsAll.add(Tuples.of(type, consumer));
@@ -133,7 +134,7 @@ public <C extends Document & HasEnabled> T with(final Class<C> type, final Consu
      */
     public T withPassword(final String password) {
         // password nullable
-        with(Dbms.class, d -> d.setPassword(password));
+        with(Dbms.class, dbms -> speedment.getPasswordComponent().put(dbms, password));
         return self();
     }
 
@@ -148,7 +149,7 @@ public T withPassword(final String password) {
      */
     public T withPassword(final String dbmsName, final String password) {
         // password nullable
-        with(Dbms.class, dbmsName, d -> d.setPassword(password));
+        with(Dbms.class, dbmsName, dbms -> speedment.getPasswordComponent().put(dbms, password));
         return self();
     }
 
@@ -242,9 +243,9 @@ public T withPort(final String dbmsName, final int port) {
      * schema name will then be applied after the configuration has been read
      * and after the System properties have been applied.
      * <p>
-     * This method is useful for multi-tenant projects where there are several 
+     * This method is useful for multi-tenant projects where there are several
      * identical schemas separated only by their names.
-     * 
+     *
      * @param schemaName to use for all schemas this project
      * @return this instance
      */
@@ -259,9 +260,9 @@ public T withSchema(final String schemaName) {
      * schema name will then be applied after the configuration has been read
      * and after the System properties have been applied.
      * <p>
-     * This method is useful for multi-tenant projects where there are several 
+     * This method is useful for multi-tenant projects where there are several
      * identical schemas separated only by their names.
-     * 
+     *
      * @param oldSchemaName the current name of a schema
      * @param schemaName to use for the named schema
      * @return this instance
@@ -325,17 +326,19 @@ protected void onStop() {
      * Builds up the complete Project meta data tree.
      */
     protected void loadAndSetProject() {
-        try {
-            final Optional<Path> oPath = getConfigPath();
-            final Project project;
-            if (oPath.isPresent()) {
-                project = DocumentTranscoder.load(oPath.get());
-            } else {
-                project = DocumentTranscoder.load(getSpeedmentApplicationMetadata().getMetadata());
-            }
-
-            // Apply overridden values from the system properties (if any)
-            //final Function<Document, Stream<Node>> traverser = n -> n.asParent().map(p -> p.stream()).orElse(Stream.empty()).map(c -> (Node) c);
+        final Optional<Path> oPath = getConfigPath();
+        final Project project;
+        if (oPath.isPresent()) {
+            project = DocumentTranscoder.load(oPath.get());
+        } else {
+            project = DocumentTranscoder.load(getSpeedmentApplicationMetadata().getMetadata());
+        }
+
+        // Apply overridden values from the system properties (if any)
+        //final Function<Document, Stream<Node>> traverser = n -> n.asParent().map(p -> p.stream()).orElse(Stream.empty()).map(c -> (Node) c);
+
+        /*
+
             DocumentUtil.traverseOver(project)
 //            Trees.traverse(project, traverser, Trees.TraversalOrder.DEPTH_FIRST_PRE)
                     .forEach((Document node) -> {
@@ -364,36 +367,36 @@ protected void loadAndSetProject() {
                         );
                     });
 
-            // Apply overidden item (if any) for all ConfigEntities of a given class
-            withsAll.forEach(t2 -> {
-                final Class<? extends Document> clazz = t2.get0();
-                final Consumer<? extends Document> consumer = t2.get1();
-                traverseOver(project)
-                        .filter(c -> clazz.isAssignableFrom(c.getClass()))
-                        .map(Document.class::cast)
-                        .forEachOrdered(consumer::accept);
-            });
-
-            // Apply a named overidden item (if any) for all ConfigEntities of a given class
-            withsNamed.forEach(t3 -> {
-                final Class<? extends Node> clazz = t3.get0();
-                final String name = t3.get1();
-
-                @SuppressWarnings("unchecked")
-                final Consumer<Node> consumer = (Consumer<Node>) t3.get2();
-
-                project.traverse()
-                        .filter(c -> clazz.isAssignableFrom(c.getClass()))
-                        .map(Node.class::cast)
-                        .filter(c -> name.equals(c.getRelativeName(Project.class)))
-                        .forEachOrdered(consumer::accept);
-            });
-
-            speedment.getProjectComponent().setProject(project);
-
-        } catch (IOException ioe) {
-            throw new SpeedmentException("Failed to read config file", ioe);
-        }
+         */
+        // Apply overidden item (if any) for all ConfigEntities of a given class
+        withsAll.forEach(t2 -> {
+            final Class<? extends Document> clazz = t2.get0();
+            @SuppressWarnings("unchecked")
+            final Consumer<Document> consumer = (Consumer<Document>) t2.get1();
+            traverseOver(project)
+                    .filter(c -> clazz.isAssignableFrom(c.getClass()))
+                    .map(Document.class::cast)
+                    .forEachOrdered(consumer::accept);
+        });
+
+        // Apply a named overidden item (if any) for all ConfigEntities of a given class
+        withsNamed.forEach(t3 -> {
+            final Class<? extends Document> clazz = t3.get0();
+            final String name = t3.get1();
+
+            @SuppressWarnings("unchecked")
+            final Consumer<Document> consumer = (Consumer<Document>) t3.get2();
+
+            traverseOver(project)
+                    .filter(c -> clazz.isAssignableFrom(c.getClass()))
+                    .filter(HasName.class::isInstance)
+                    .map(d -> (Document & HasName) d)
+                    .filter(c -> name.equals(relativeName(c, Project.class)))
+                    .forEachOrdered(consumer::accept);
+        });
+
+        speedment.getProjectComponent().setProject(project);
+
     }
 
     protected <ENTITY> void put(Manager<ENTITY> manager) {
@@ -457,7 +460,7 @@ public Speedment build() {
         }
         // Replace the metadata model with an immutable version (potentially much faster)
         final Project project = speedment.getProjectComponent().getProject();
-        final Project immutableProject = new ImmutableProject(project);
+        final Project immutableProject = ImmutableProject.wrap(project);
         speedment.getProjectComponent().setProject(immutableProject);
         //
         return speedment;

src/main/java/com/speedment/internal/util/document/DocumentTranscoder.java

@@ -34,7 +34,7 @@
 @Api(version = "2.3")
 public final class DocumentTranscoder {
 
-    public static final String ROOT = "project";
+    public static final String ROOT = "config";
 
     public static String save(Project project) throws SpeedmentException {
         final Gson gson   = new Gson();

src/main/java/com/speedment/internal/util/document/DocumentUtil.java

@@ -83,7 +83,7 @@ public static Map<String, Object> newDocument(Document document, String key) {
 
     public static <T extends Document & HasName, D extends Document & HasName> String relativeName(D document, final Class<T> from, Function<String, String> nameMapper) {
         requireNonNulls(document, from, nameMapper);
-        final StringJoiner sj = new StringJoiner(".", "", ".").setEmptyValue("");
+        final StringJoiner sj = new StringJoiner(".").setEmptyValue("");
         final List<Document> ancestors = document.ancestors()/*.map(p -> (Parent<?>) p)*/.collect(toList());
         boolean add = false;
         for (final Document parent : ancestors) {

src/test/java/com/speedment/internal/core/code/model/java/MainGeneratorTest.java

@@ -16,8 +16,11 @@
  */
 package com.speedment.internal.core.code.model.java;
 
+import com.speedment.config.db.Project;
+import com.speedment.internal.codegen.base.Meta;
+import com.speedment.internal.codegen.lang.models.File;
 import com.speedment.internal.core.code.MainGenerator;
-import org.junit.Ignore;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Test;
 
 /**
@@ -31,7 +34,15 @@ public class MainGeneratorTest extends SimpleModelTest {
     public void testAccept() {
         System.out.println("accept");
 
-        final MainGenerator instance = new MainGenerator(speedment);
+        final MainGenerator instance = new MainGenerator(speedment) {
+
+            @Override
+            protected void writeToFile(Project project, Meta<File, String> meta, AtomicInteger fileCounter) {
+                System.out.println("Processing "+meta.getModel().getName());
+                // Do nothing on file...
+            }
+
+        };
         instance.accept(project);
     }
 

src/test/java/com/speedment/internal/core/code/model/java/SimpleModelTest.java

@@ -29,8 +29,14 @@
 import com.speedment.config.db.Project;
 import com.speedment.config.db.Schema;
 import com.speedment.config.db.Table;
+import com.speedment.config.db.mapper.TypeMapper;
+import com.speedment.config.db.parameters.DbmsType;
+import com.speedment.config.db.trait.HasName;
+import static com.speedment.internal.codegen.util.Formatting.indent;
+import com.speedment.internal.core.config.dbms.MySqlDbmsType;
+import com.speedment.internal.core.config.dbms.StandardDbmsType;
+import com.speedment.internal.core.config.mapper.identity.StringIdentityMapper;
 import com.speedment.internal.core.platform.SpeedmentFactory;
-import static java.util.stream.Collectors.joining;
 import java.util.stream.Stream;
 import org.junit.Before;
 import static java.util.stream.Collectors.joining;
@@ -57,30 +63,39 @@ private String quote(String s) {
     }
 
     private String name(String s) {
-        return quote("name") + " : " + quote(s);
+        return quote(HasName.NAME) + " : " + quote(s);
+    }
+
+    private String typeMapper(Class<? extends TypeMapper> tmc) {
+        return quote(Column.TYPE_MAPPER) + " : " + quote(tmc.getName());
+    }
+
+    private String dbTypeName(String dbmsTypeName) {
+        return quote(Dbms.TYPE_NAME) + " : " + quote(dbmsTypeName);
     }
 
     private String array(String name, String... s) {
-        return quote(name) + " : [\n" + Stream.of(s).collect(joining(",\n")) + "\n]";
+        return quote(name) + " : [\n" + indent(Stream.of(s).collect(joining(",\n"))) + "\n]";
     }
 
     private String objectWithKey(String name, String... s) {
         return quote(name) + " : " + object(s);
     }
 
     private String object(String... s) {
-        return "{\n" + Stream.of(s).collect(joining(",\n")) + "\n}";
+        return "{\n" + indent(Stream.of(s).collect(joining(",\n"))) + "\n}";
     }
 
     @Before
-    public void setUp() {
+    public void simpleModelTestSetUp() {
 
         final String json = "{"
                 + objectWithKey(DocumentTranscoder.ROOT,
                         name("myProject"),
                         array(Project.DBMSES,
                                 object(
                                         name("myDbms"),
+                                        dbTypeName(StandardDbmsType.defaultType().getName()),
                                         array(Dbms.SCHEMAS,
                                                 object(
                                                         name("mySchema"),
@@ -89,7 +104,8 @@ public void setUp() {
                                                                         name(TABLE_NAME),
                                                                         array(Table.COLUMNS,
                                                                                 object(
-                                                                                        name(COLUMN_NAME)
+                                                                                        name(COLUMN_NAME),
+                                                                                        typeMapper(StringIdentityMapper.class)
                                                                                 )
                                                                         ),
                                                                         array(Table.PRIMARY_KEY_COLUMNS,
@@ -104,15 +120,14 @@ public void setUp() {
                                 )
                         )
                 )
-                +"}";
+                + "}";
 
         System.out.println(json);
-        
+
         project = DocumentTranscoder.load(json);
-        
+
         System.out.println(project);
-
-
+
         speedment = SpeedmentFactory.newSpeedmentInstance();
 //        project = new ProjectImpl(speedment);
 //        dbms = project.addNewDbms();

src/test/java/com/speedment/internal/core/code/model/java/entity/EntityTranslatorTest.java

@@ -16,6 +16,7 @@
  */
 package com.speedment.internal.core.code.model.java.entity;
 
+import com.speedment.config.Document;
 import com.speedment.internal.core.code.entity.EntityTranslator;
 import com.speedment.internal.codegen.base.Generator;
 import com.speedment.internal.codegen.java.JavaGenerator;
@@ -40,8 +41,9 @@ public void testApply() {
         final Generator cg = new JavaGenerator();
 
         final Table table2 = traverseOver(project, Table.class)
-            .filter(e -> TABLE_NAME.equals(e.getName()))
-            .findAny().get();
+                .peek(this::print)
+                .filter(e -> TABLE_NAME.equals(e.getName()))
+                .findAny().get();
 
         final EntityTranslator instance = new EntityTranslator(speedment, cg, table2);
         final File file = instance.get();
@@ -52,4 +54,10 @@ public void testApply() {
 
         System.out.println(code.get());
     }
+
+    private void print(Document d) {
+        System.out.println(d);
+    }
+
+
 }