#1147 - Refactor move DbMigration internals into io.ebeaninternal - change to use DbMigration.create() - move PlatformDdl into internal

src/main/java/io/ebeaninternal/api/SpiEbeanServer.java

@@ -13,6 +13,7 @@ import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.query.CQuery;
@@ -210,4 +211,9 @@ public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionL
    * Check for slow query event.
    */
   void slowQueryCheck(long executionTimeMicros, int rowCount, SpiQuery<?> query);
+
+  /**
+   * Create DDL handler given the platform and configuration of the server.
+   */
+  DdlHandler createDdlHandler();
 }

src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java

@@ -1,6 +1,7 @@
 package io.ebeaninternal.dbmigration.model;
 
 import io.ebean.config.DbConstraintNaming;
+import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
 import io.ebeaninternal.dbmigration.ddlgeneration.platform.DefaultConstraintMaxLength;
@@ -8,7 +9,6 @@ import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.model.build.ModelBuildBeanVisitor;
 import io.ebeaninternal.dbmigration.model.build.ModelBuildContext;
 import io.ebeaninternal.dbmigration.model.visitor.VisitAllUsing;
-import io.ebeaninternal.api.SpiEbeanServer;
 
 import java.io.IOException;
 
@@ -147,7 +147,7 @@ public class CurrentModel {
    * Return the platform specific DdlHandler (to generate DDL).
    */
   private DdlHandler handler() {
-    return server.getDatabasePlatform().createDdlHandler(server.getServerConfig());
+    return server.createDdlHandler();
   }
 
   /**

src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java

@@ -6,9 +6,11 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
 import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.migration.ChangeSetType;
 import io.ebeaninternal.dbmigration.migration.Migration;
+import io.ebeaninternal.server.core.PlatformDdlBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,12 +29,12 @@ public class PlatformDdlWriter {
 
   private final ServerConfig serverConfig;
 
-  private final DatabasePlatform platform;
-
   private final DbMigrationConfig config;
 
+  private final PlatformDdl platformDdl;
+
   public PlatformDdlWriter(DatabasePlatform platform, ServerConfig serverConfig, DbMigrationConfig config) {
-    this.platform = platform;
+    this.platformDdl = PlatformDdlBuilder.create(platform);
     this.serverConfig = serverConfig;
     this.config = config;
   }
@@ -106,7 +108,7 @@ public class PlatformDdlWriter {
    * Return the platform specific DdlHandler (to generate DDL).
    */
   protected DdlHandler handler() {
-    return platform.createDdlHandler(serverConfig);
+    return platformDdl.createDdlHandler(serverConfig);
   }
 
   /**

src/main/java/io/ebeaninternal/server/core/DefaultServer.java

@@ -53,6 +53,7 @@ import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
 import io.ebeaninternal.api.*;
 import io.ebeaninternal.api.SpiQuery.Type;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
 import io.ebeaninternal.server.autotune.AutoTuneService;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -329,6 +330,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return databasePlatform;
   }
 
+  @Override
+  public DdlHandler createDdlHandler() {
+    return PlatformDdlBuilder.create(databasePlatform).createDdlHandler(serverConfig);
+  }
+
   @Override
   public DataTimeZone getDataTimeZone() {
     return dataTimeZone;

src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java

@@ -0,0 +1,44 @@
+package io.ebeaninternal.server.core;
+
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.DB2Ddl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.H2Ddl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.HsqldbDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.MySqlDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.Oracle10Ddl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.PostgresDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.SQLiteDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.SqlServerDdl;
+
+public class PlatformDdlBuilder {
+
+
+  public static PlatformDdl create(DatabasePlatform platform) {
+
+    switch (platform.getPlatform()) {
+      case H2:
+        return new H2Ddl(platform);
+      case DB2:
+        return new DB2Ddl(platform);
+      case MYSQL:
+        return new MySqlDdl(platform);
+      case HSQLDB:
+        return new HsqldbDdl(platform);
+      case ORACLE:
+        return new Oracle10Ddl(platform);
+      case SQLITE:
+        return new SQLiteDdl(platform);
+      case GENERIC:
+        return new PlatformDdl(platform);
+      case POSTGRES:
+        return new PostgresDdl(platform);
+      case SQLSERVER:
+        return new SqlServerDdl(platform);
+      case SQLANYWHERE:
+        return new PlatformDdl(platform);
+      default:
+        return new PlatformDdl(platform);
+    }
+  }
+}