[maven-release-plugin] prepare release ebean-11.2.1

The issue was due to the loaded status not being recursively set on embedded
beans after inserts. The test case invoked lazy loading due to that which
lead to the issue.

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>10.4.5</version>
+  <version>11.2.1</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -17,7 +17,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-10.4.5</tag>
+    <tag>ebean-11.2.1</tag>
   </scm>
 
   <profiles>
@@ -87,7 +87,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>2.4</version>
+      <version>3.1</version>
     </dependency>
 
     <dependency>
@@ -117,7 +117,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>10.2.1</version>
+      <version>10.3.1</version>
     </dependency>
 
     <dependency>
@@ -210,7 +210,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-agent</artifactId>
-      <version>10.4.1</version>
+      <version>11.1.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -283,7 +283,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>10.4.1</version>
+        <version>11.1.1</version>
         <executions>
           <execution>
             <id>test</id>
@@ -340,7 +340,7 @@
           <overview>src/main/java/io/ebean/overview.html</overview>
           <source>1.8</source>
           <doclet>org.avaje.doclet.PygmentsDoclet</doclet>
-          <excludePackageNames>io.ebeaninternal.*:com.avaje.ebean.util:io.ebean.dbmigration.ddlgeneration:io.ebean.dbmigration.migration:io.ebean.dbmigration.migrationreader:io.ebean.dbmigration.model</excludePackageNames>
+          <excludePackageNames>io.ebeaninternal.*:com.avaje.ebean.util</excludePackageNames>
           <docletArtifact>
             <groupId>org.avaje</groupId>
             <artifactId>pygments-doclet</artifactId>

src/main/java/io/ebean/CacheMode.java

@@ -0,0 +1,57 @@
+package io.ebean;
+/**
+ * Enum to control the different cache modes for queryCache (and maybe later) beanCache.
+ * 
+ * If cache is enabled, you must be careful, what you do with the returned collection.
+ * By default the returned collections are read only and you will get an exception if you try
+ * to change them.
+ * If you add ".setReadOnly(false)" to your query, you'll get a collection that is a clone from the
+ * one in the cache. That means, changing does not affect the cache
+ * 
+ * @author Roland Praml, FOCONIS AG
+ */
+public enum CacheMode {
+  /**
+   * Do not use cache.
+   */
+  OFF(false, false),
+  
+  /**
+   * Use the cace (query & store the resut). 
+   */
+  ON(true, true), 
+  
+  /**
+   * Do not read from cache, but write retrived value to cache.
+   * Use this, if you want to get the fresh value from database and a CacheMode.ON query will follow.
+   */
+  RECACHE(false, true),
+  
+  /**
+   * Query the cache for value. If it is there, use it, otherwise hit database but do NOT put the value
+   * into the cache. (this mode is for completeness. There's probably no use case for this)
+   */
+  QUERY_ONLY(true,false);
+  
+  private boolean get;
+  private boolean put;
+
+  private CacheMode(boolean get, boolean put) {
+    this.get = get;
+    this.put = put;
+  }
+  
+  /**
+   * Retruns <code>true</code> if value is read from cache.
+   */
+  public boolean isGet() {
+    return get;
+  }
+  
+  /**
+   * Returns <code>true</code> if value (from database) is written to cache.
+   */
+  public boolean isPut() {
+    return put;
+  }
+}

src/main/java/io/ebean/Ebean.java

@@ -1,5 +1,6 @@
 package io.ebean;
 
+import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.config.ServerConfig;
 import io.ebean.text.csv.CsvReader;
@@ -1240,14 +1241,6 @@ public final class Ebean {
     return serverMgr.getDefaultServer().executeCall(scope, c);
   }
 
-  /**
-   * Deprecated - please migrate to executeCall().
-   */
-  @Deprecated
-  public static <T> T execute(TxScope scope, TxCallable<T> c) {
-    return serverMgr.getDefaultServer().executeCall(scope, c);
-  }
-
   /**
    * Execute a Callable in a Transaction with the default scope.
    * <p>
@@ -1281,14 +1274,6 @@ public final class Ebean {
     return serverMgr.getDefaultServer().executeCall(c);
   }
 
-  /**
-   * Deprecated - please migrate to executeCall().
-   */
-  @Deprecated
-  public static <T> T execute(TxCallable<T> c) {
-    return serverMgr.getDefaultServer().execute(c);
-  }
-
   /**
    * Inform Ebean that tables have been modified externally. These could be the
    * result of from calling a stored procedure, other JDBC calls or external

src/main/java/io/ebean/EbeanServer.java

@@ -1,5 +1,6 @@
 package io.ebean;
 
+import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.config.ServerConfig;
 import io.ebean.meta.MetaInfoManager;
@@ -561,8 +562,8 @@ public interface EbeanServer {
    * Start a transaction typically specifying REQUIRES_NEW or REQUIRED semantics.
    * <p>
    * <p>
-   * Note that this provides an try finally alternative to using {@link #execute(TxScope, TxCallable)} or
-   * {@link #execute(TxScope, TxRunnable)}.
+   * Note that this provides an try finally alternative to using {@link #executeCall(TxScope, Callable)} or
+   * {@link #execute(TxScope, Runnable)}.
    * </p>
    * <p>
    * <h3>REQUIRES_NEW example:</h3>
@@ -1097,7 +1098,9 @@ public interface EbeanServer {
    */
   @Deprecated
   @Nullable
-  <T> T findUnique(Query<T> query, Transaction transaction);
+  default <T> T findUnique(Query<T> query, Transaction transaction) {
+    return findOne(query, transaction);
+  }
 
   /**
    * Execute as a delete query deleting the 'root level' beans that match the predicates
@@ -1190,7 +1193,9 @@ public interface EbeanServer {
    */
   @Deprecated
   @Nullable
-  SqlRow findUnique(SqlQuery query, Transaction transaction);
+  default SqlRow findUnique(SqlQuery query, Transaction transaction) {
+    return findOne(query, transaction);
+  }
 
   /**
    * Either Insert or Update the bean depending on its state.
@@ -1661,13 +1666,7 @@ public interface EbeanServer {
   <T> T executeCall(TxScope scope, Callable<T> callable);
 
   /**
-   * Deprecated - please migrate to executeCall().
-   */
-  @Deprecated
-  <T> T execute(TxScope scope, TxCallable<T> callable);
-
-  /**
-   * Execute a Callable in a Transaction with the default scope.
+   * Execute a TxCallable in a Transaction with the default scope.
    * <p>
    * The default scope runs with REQUIRED and by default will rollback on any
    * exception (checked or runtime).
@@ -1694,12 +1693,6 @@ public interface EbeanServer {
    */
   <T> T executeCall(Callable<T> callable);
 
-  /**
-   * Deprecated - please migrate to executeCall().
-   */
-  @Deprecated
-  <T> T execute(TxCallable<T> callable);
-
   /**
    * Return the manager of the server cache ("L2" cache).
    */

src/main/java/io/ebean/EbeanServerFactory.java

@@ -1,13 +1,14 @@
 package io.ebean;
 
-import io.ebean.common.SpiContainer;
 import io.ebean.config.ContainerConfig;
 import io.ebean.config.ServerConfig;
-import io.ebeaninternal.server.lib.ShutdownManager;
+import io.ebean.service.SpiContainer;
+import io.ebean.service.SpiContainerFactory;
 
 import javax.persistence.PersistenceException;
-import java.lang.reflect.Constructor;
+import java.util.Iterator;
 import java.util.Properties;
+import java.util.ServiceLoader;
 
 /**
  * Creates EbeanServer instances.
@@ -30,8 +31,6 @@ import java.util.Properties;
 public class EbeanServerFactory {
 
 
-  private static final String DEFAULT_CONTAINER = "io.ebeaninternal.server.core.DefaultContainer";
-
   private static SpiContainer container;
 
   /**
@@ -99,7 +98,7 @@ public class EbeanServerFactory {
    * </p>
    */
   public static synchronized void shutdown() {
-    ShutdownManager.shutdown();
+    container.shutdown();
   }
 
 
@@ -135,14 +134,10 @@ public class EbeanServerFactory {
    */
   protected static SpiContainer createContainer(ContainerConfig containerConfig) {
 
-    String implClassName = System.getProperty("ebean.container", DEFAULT_CONTAINER);
-
-    try {
-      Class<?> cls = Class.forName(implClassName);
-      Constructor<?> constructor = cls.getConstructor(ContainerConfig.class);
-      return (SpiContainer) constructor.newInstance(containerConfig);
-    } catch (Exception ex) {
-      throw new RuntimeException(ex);
+    Iterator<SpiContainerFactory> factories = ServiceLoader.load(SpiContainerFactory.class).iterator();
+    if (factories.hasNext()) {
+      return factories.next().create(containerConfig);
     }
+    throw new IllegalStateException("Service loader didn't find a SpiContainerFactory?");
   }
 }

src/main/java/io/ebean/ExpressionList.java

@@ -283,7 +283,9 @@ public interface ExpressionList<T> {
    */
   @Deprecated
   @Nullable
-  T findUnique();
+  default T findUnique() {
+    return findOne();
+  }
 
   /**
    * Execute find row count query in a background thread.
@@ -443,12 +445,21 @@ public interface ExpressionList<T> {
   Query<T> setUseCache(boolean useCache);
 
   /**
-   * Set to true to use the query for executing this query.
+   * Set the {@link CacheMode} to use the query for executing this query.
    *
    * @see Query#setUseQueryCache(boolean)
    */
-  Query<T> setUseQueryCache(boolean useCache);
+  Query<T> setUseQueryCache(CacheMode useCache);
 
+  /**
+   * Calls {@link #setUseQueryCache(CacheMode)} with <code>ON</code> or <code>OFF</code>.
+   * 
+   * @see Query#setUseQueryCache(CacheMode)
+   */
+  default Query<T> setUseQueryCache(boolean enabled) {
+    return setUseQueryCache(enabled ? CacheMode.ON : CacheMode.OFF);
+  }
+  
   /**
    * Set to true if this query should execute against the doc store.
    * <p>

src/main/java/io/ebean/Query.java

@@ -215,11 +215,6 @@ public interface Query<T> {
     SKIPLOCKED
   }
 
-  /**
-   * Return the RawSql that was set to use for this query.
-   */
-  RawSql getRawSql();
-
   /**
    * Set RawSql to use for this query.
    */
@@ -871,7 +866,9 @@ public interface Query<T> {
    */
   @Deprecated
   @Nullable
-  T findUnique();
+  default T findUnique() {
+    return findOne();
+  }
 
   /**
    * Return versions of a @History entity bean.
@@ -1323,9 +1320,16 @@ public interface Query<T> {
   Query<T> setUseCache(boolean useCache);
 
   /**
-   * Set this to true to use the query cache.
+   * Set the {@link CacheMode} to use the query for executing this query.
    */
-  Query<T> setUseQueryCache(boolean useQueryCache);
+  Query<T> setUseQueryCache(CacheMode useQueryCache);
+
+  /**
+   * Calls {@link #setUseQueryCache(CacheMode)} with <code>ON</code> or <code>OFF</code>.
+   */
+  default Query<T> setUseQueryCache(boolean enabled) {
+    return setUseQueryCache(enabled ? CacheMode.ON : CacheMode.OFF);
+  }
 
   /**
    * Set to true if this query should execute against the doc store.

src/main/java/io/ebean/RawSql.java

@@ -169,566 +169,6 @@ import java.util.Map;
  * Note that lazy loading also works with object graphs built with RawSql.
  * </p>
  */
-public final class RawSql implements Serializable {
+public interface RawSql {
 
-  private static final long serialVersionUID = 1L;
-
-  private final ResultSet resultSet;
-
-  private final Sql sql;
-
-  private final ColumnMapping columnMapping;
-
-  /**
-   * Construct with a ResultSet and properties that the columns map to.
-   * <p>
-   * The properties listed in the propertyNames must be in the same order as the columns in the
-   * resultSet.
-   * <p>
-   * When a query executes this RawSql object then it will close the resultSet.
-   */
-  public RawSql(ResultSet resultSet, String... propertyNames) {
-    this.resultSet = resultSet;
-    this.sql = null;
-    this.columnMapping = new ColumnMapping(propertyNames);
-  }
-
-  protected RawSql(ResultSet resultSet, Sql sql, ColumnMapping columnMapping) {
-    this.resultSet = resultSet;
-    this.sql = sql;
-    this.columnMapping = columnMapping;
-  }
-
-  /**
-   * Return the Sql either unparsed or in parsed (broken up) form.
-   */
-  public Sql getSql() {
-    return sql;
-  }
-
-  /**
-   * Return the key;
-   */
-  public Key getKey() {
-    boolean parsed = sql != null && sql.parsed;
-    String unParsedSql = (sql == null) ? "" : sql.unparsedSql;
-    return new Key(parsed, unParsedSql, columnMapping);
-  }
-
-  /**
-   * Return the resultSet if this is a ResultSet based RawSql.
-   */
-  public ResultSet getResultSet() {
-    return resultSet;
-  }
-
-  /**
-   * Return the column mapping for the SQL columns to bean properties.
-   */
-  public ColumnMapping getColumnMapping() {
-    return columnMapping;
-  }
-
-  /**
-   * Represents the sql part of the query. For parsed RawSql the sql is broken
-   * up so that Ebean can insert extra WHERE and HAVING expressions into the
-   * SQL.
-   */
-  public static final class Sql implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private final boolean parsed;
-
-    private final String unparsedSql;
-
-    private final String preFrom;
-
-    private final String preWhere;
-
-    private final boolean andWhereExpr;
-
-    private final String preHaving;
-
-    private final boolean andHavingExpr;
-
-    private final String orderByPrefix;
-
-    private final String orderBy;
-
-    private final boolean distinct;
-
-    /**
-     * Construct for unparsed SQL.
-     */
-    protected Sql(String unparsedSql) {
-      this.parsed = false;
-      this.unparsedSql = unparsedSql;
-      this.preFrom = null;
-      this.preHaving = null;
-      this.preWhere = null;
-      this.andHavingExpr = false;
-      this.andWhereExpr = false;
-      this.orderByPrefix = null;
-      this.orderBy = null;
-      this.distinct = false;
-    }
-
-    /**
-     * Construct for parsed SQL.
-     */
-    protected Sql(String unparsedSql, String preFrom, String preWhere, boolean andWhereExpr,
-                  String preHaving, boolean andHavingExpr, String orderByPrefix, String orderBy, boolean distinct) {
-
-      this.unparsedSql = unparsedSql;
-      this.parsed = true;
-      this.preFrom = preFrom;
-      this.preHaving = preHaving;
-      this.preWhere = preWhere;
-      this.andHavingExpr = andHavingExpr;
-      this.andWhereExpr = andWhereExpr;
-      this.orderByPrefix = orderByPrefix;
-      this.orderBy = orderBy;
-      this.distinct = distinct;
-    }
-
-    @Override
-    public String toString() {
-      if (!parsed) {
-        return "unparsed[" + unparsedSql + "]";
-      }
-      return "select[" + preFrom + "] preWhere[" + preWhere + "] preHaving[" + preHaving + "] orderBy[" + orderBy + "]";
-    }
-
-    public boolean isDistinct() {
-      return distinct;
-    }
-
-    /**
-     * Return true if the SQL is left completely unmodified.
-     * <p>
-     * This means Ebean can't add WHERE or HAVING expressions into the query -
-     * it will be left completely unmodified.
-     * </p>
-     */
-    public boolean isParsed() {
-      return parsed;
-    }
-
-    /**
-     * Return the SQL when it is unparsed.
-     */
-    public String getUnparsedSql() {
-      return unparsedSql;
-    }
-
-    /**
-     * Return the SQL prior to FROM clause.
-     */
-    public String getPreFrom() {
-      return preFrom;
-    }
-
-    /**
-     * Return the SQL prior to WHERE clause.
-     */
-    public String getPreWhere() {
-      return preWhere;
-    }
-
-    /**
-     * Return true if there is already a WHERE clause and any extra where
-     * expressions start with AND.
-     */
-    public boolean isAndWhereExpr() {
-      return andWhereExpr;
-    }
-
-    /**
-     * Return the SQL prior to HAVING clause.
-     */
-    public String getPreHaving() {
-      return preHaving;
-    }
-
-    /**
-     * Return true if there is already a HAVING clause and any extra having
-     * expressions start with AND.
-     */
-    public boolean isAndHavingExpr() {
-      return andHavingExpr;
-    }
-
-    /**
-     * Return the 'order by' keywords.
-     * This can contain additional keywords, for example 'order siblings by' as Oracle syntax.
-     */
-    public String getOrderByPrefix() {
-      return (orderByPrefix == null) ? "order by" : orderByPrefix;
-    }
-
-    /**
-     * Return the SQL ORDER BY clause.
-     */
-    public String getOrderBy() {
-      return orderBy;
-    }
-
-  }
-
-  /**
-   * Defines the column mapping for raw sql DB columns to bean properties.
-   */
-  public static final class ColumnMapping implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private final LinkedHashMap<String, Column> dbColumnMap;
-
-    private final Map<String, String> propertyMap;
-
-    private final Map<String, Column> propertyColumnMap;
-
-    private final boolean parsed;
-
-    private final boolean immutable;
-
-    /**
-     * Construct from parsed sql where the columns have been identified.
-     */
-    protected ColumnMapping(List<Column> columns) {
-      this.immutable = false;
-      this.parsed = true;
-      this.propertyMap = null;
-      this.propertyColumnMap = null;
-      this.dbColumnMap = new LinkedHashMap<>();
-      for (Column c : columns) {
-        dbColumnMap.put(c.getDbColumnKey(), c);
-      }
-    }
-
-    /**
-     * Construct for unparsed sql.
-     */
-    protected ColumnMapping() {
-      this.immutable = false;
-      this.parsed = false;
-      this.propertyMap = null;
-      this.propertyColumnMap = null;
-      this.dbColumnMap = new LinkedHashMap<>();
-    }
-
-    /**
-     * Construct for ResultSet use.
-     */
-    protected ColumnMapping(String... propertyNames) {
-      this.immutable = false;
-      this.parsed = false;
-      this.propertyMap = null;
-      this.dbColumnMap = new LinkedHashMap<>();
-
-      int pos = 0;
-      for (String prop : propertyNames) {
-        dbColumnMap.put(prop, new Column(pos++, prop, null, prop));
-      }
-      propertyColumnMap = dbColumnMap;
-    }
-
-    /**
-     * Construct an immutable ColumnMapping based on collected information.
-     */
-    protected ColumnMapping(boolean parsed, LinkedHashMap<String, Column> dbColumnMap) {
-      this.immutable = true;
-      this.parsed = parsed;
-      this.dbColumnMap = dbColumnMap;
-
-      HashMap<String, Column> pcMap = new HashMap<>();
-      HashMap<String, String> pMap = new HashMap<>();
-
-      for (Column c : dbColumnMap.values()) {
-        pMap.put(c.getPropertyName(), c.getDbColumn());
-        pcMap.put(c.getPropertyName(), c);
-      }
-      this.propertyMap = Collections.unmodifiableMap(pMap);
-      this.propertyColumnMap = Collections.unmodifiableMap(pcMap);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-      ColumnMapping that = (ColumnMapping) o;
-      return dbColumnMap.equals(that.dbColumnMap);
-    }
-
-    @Override
-    public int hashCode() {
-      return dbColumnMap.hashCode();
-    }
-
-    /**
-     * Return true if the property is mapped.
-     */
-    public boolean contains(String property) {
-      return this.propertyColumnMap.containsKey(property);
-    }
-
-    /**
-     * Creates an immutable copy of this ColumnMapping.
-     *
-     * @throws IllegalStateException when a propertyName has not been defined for a column.
-     */
-    protected ColumnMapping createImmutableCopy() {
-
-      for (Column c : dbColumnMap.values()) {
-        c.checkMapping();
-      }
-
-      return new ColumnMapping(parsed, dbColumnMap);
-    }
-
-    protected void columnMapping(String dbColumn, String propertyName) {
-
-      if (immutable) {
-        throw new IllegalStateException("Should never happen");
-      }
-      if (!parsed) {
-        int pos = dbColumnMap.size();
-        dbColumnMap.put(dbColumn, new Column(pos, dbColumn, null, propertyName));
-      } else {
-        Column column = dbColumnMap.get(dbColumn);
-        if (column == null) {
-          String msg = "DB Column [" + dbColumn + "] not found in mapping. Expecting one of [" + dbColumnMap.keySet() + "]";
-          throw new IllegalArgumentException(msg);
-        }
-        column.setPropertyName(propertyName);
-      }
-    }
-
-    /**
-     * Returns true if the Columns where supplied by parsing the sql select
-     * clause.
-     * <p>
-     * In the case where the columns where parsed then we can do extra checks on
-     * the column mapping such as, is the column a valid one in the sql and
-     * whether all the columns in the sql have been mapped.
-     * </p>
-     */
-    public boolean isParsed() {
-      return parsed;
-    }
-
-    /**
-     * Return the number of columns in this column mapping.
-     */
-    public int size() {
-      return dbColumnMap.size();
-    }
-
-    /**
-     * Return the column mapping.
-     */
-    protected Map<String, Column> mapping() {
-      return dbColumnMap;
-    }
-
-    /**
-     * Return the mapping by DB column.
-     */
-    public Map<String, String> getMapping() {
-      return propertyMap;
-    }
-
-    /**
-     * Return the index position by bean property name.
-     */
-    public int getIndexPosition(String property) {
-      Column c = propertyColumnMap.get(property);
-      return c == null ? -1 : c.getIndexPos();
-    }
-
-    /**
-     * Return an iterator of the Columns.
-     */
-    public Iterator<Column> getColumns() {
-      return dbColumnMap.values().iterator();
-    }
-
-    /**
-     * Modify any column mappings with the given table alias to have the path prefix.
-     * <p>
-     * For example modify all mappings with table alias "c" to have the path prefix "customer".
-     * </p>
-     * <p>
-     * For the "Root type" you don't need to specify a tableAliasMapping.
-     * </p>
-     */
-    public void tableAliasMapping(String tableAlias, String path) {
-
-      String startMatch = tableAlias + ".";
-      for (Map.Entry<String, Column> entry : dbColumnMap.entrySet()) {
-        if (entry.getKey().startsWith(startMatch)) {
-          entry.getValue().tableAliasMapping(path);
-        }
-      }
-    }
-
-    /**
-     * A Column of the RawSql that is mapped to a bean property (or ignored).
-     */
-    public static class Column implements Serializable {
-
-      private static final long serialVersionUID = 1L;
-      private final int indexPos;
-      private final String dbColumn;
-
-      private final String dbAlias;
-
-      private String propertyName;
-
-      /**
-       * Construct a Column.
-       */
-      public Column(int indexPos, String dbColumn, String dbAlias) {
-        this(indexPos, dbColumn, dbAlias, derivePropertyName(dbAlias, dbColumn));
-      }
-
-      private Column(int indexPos, String dbColumn, String dbAlias, String propertyName) {
-        this.indexPos = indexPos;
-        this.dbColumn = dbColumn;
-        this.dbAlias = dbAlias;
-        if (propertyName == null && dbAlias != null) {
-          this.propertyName = dbAlias;
-        } else {
-          this.propertyName = propertyName;
-        }
-      }
-
-      protected static String derivePropertyName(String dbAlias, String dbColumn) {
-        if (dbAlias != null) {
-          return CamelCaseHelper.toCamelFromUnderscore(dbAlias);
-        }
-        int dotPos = dbColumn.indexOf('.');
-        if (dotPos > -1) {
-          dbColumn = dbColumn.substring(dotPos + 1);
-        }
-        return CamelCaseHelper.toCamelFromUnderscore(dbColumn);
-      }
-
-      private void checkMapping() {
-        if (propertyName == null) {
-          String msg = "No propertyName defined (Column mapping) for dbColumn [" + dbColumn + "]";
-          throw new IllegalStateException(msg);
-        }
-      }
-
-      @Override
-      public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        Column that = (Column) o;
-        if (indexPos != that.indexPos) return false;
-        if (!dbColumn.equals(that.dbColumn)) return false;
-        if (dbAlias != null ? !dbAlias.equals(that.dbAlias) : that.dbAlias != null) return false;
-        return propertyName != null ? propertyName.equals(that.propertyName) : that.propertyName == null;
-      }
-
-      @Override
-      public int hashCode() {
-        int result = indexPos;
-        result = 92821 * result + dbColumn.hashCode();
-        result = 92821 * result + (dbAlias != null ? dbAlias.hashCode() : 0);
-        result = 92821 * result + (propertyName != null ? propertyName.hashCode() : 0);
-        return result;
-      }
-
-      @Override
-      public String toString() {
-        return dbColumn + "->" + propertyName;
-      }
-
-      /**
-       * Return the index position of this column.
-       */
-      public int getIndexPos() {
-        return indexPos;
-      }
-
-      /**
-       * Return the DB column alias if specified otherwise DB column.
-       * This is used as the key for mapping a column to a logical property.
-       */
-      public String getDbColumnKey() {
-        return (dbAlias != null) ? dbAlias : dbColumn;
-      }
-
-      /**
-       * Return the DB column name including table alias (if it has one).
-       */
-      public String getDbColumn() {
-        return dbColumn;
-      }
-
-      /**
-       * Return the bean property this column is mapped to.
-       */
-      public String getPropertyName() {
-        return propertyName;
-      }
-
-      /**
-       * Set the property name mapped to this db column.
-       */
-      private void setPropertyName(String propertyName) {
-        this.propertyName = propertyName;
-      }
-
-      /**
-       * Prepend the path to the property name.
-       * <p/>
-       * For example if path is "customer" then "name" becomes "customer.name".
-       */
-      public void tableAliasMapping(String path) {
-        if (path != null) {
-          propertyName = path + "." + propertyName;
-        }
-      }
-    }
-  }
-
-  /**
-   * A key for the RawSql object using for the query plan.
-   */
-  public static final class Key {
-
-    private final boolean parsed;
-    private final ColumnMapping columnMapping;
-    private final String unParsedSql;
-
-    Key(boolean parsed, String unParsedSql, ColumnMapping columnMapping) {
-      this.parsed = parsed;
-      this.unParsedSql = unParsedSql;
-      this.columnMapping = columnMapping;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-
-      Key that = (Key) o;
-      return parsed == that.parsed
-        && columnMapping.equals(that.columnMapping)
-        && unParsedSql.equals(that.unParsedSql);
-    }
-
-    @Override
-    public int hashCode() {
-      int result = (parsed ? 1 : 0);
-      result = 92821 * result + columnMapping.hashCode();
-      result = 92821 * result + unParsedSql.hashCode();
-      return result;
-    }
-  }
 }

src/main/java/io/ebean/RawSqlBuilder.java

@@ -1,8 +1,5 @@
 package io.ebean;
 
-import io.ebean.RawSql.ColumnMapping;
-import io.ebean.RawSql.Sql;
-
 import java.sql.ResultSet;
 
 /**
@@ -14,18 +11,7 @@ import java.sql.ResultSet;
  *
  * @see RawSql
  */
-public class RawSqlBuilder {
-
-  /**
-   * Special property name assigned to a DB column that should be ignored.
-   */
-  public static final String IGNORE_COLUMN = "$$_IGNORE_COLUMN_$$";
-
-  private final ResultSet resultSet;
-
-  private final Sql sql;
-
-  private final ColumnMapping columnMapping;
+public interface RawSqlBuilder {
 
   /**
    * Create and return a RawSql object based on the resultSet and list of properties the columns in
@@ -34,8 +20,8 @@ public class RawSqlBuilder {
    * The properties listed in the propertyNames must be in the same order as the columns in the
    * resultSet.
    */
-  public static RawSql resultSet(ResultSet resultSet, String... propertyNames) {
-    return new RawSql(resultSet, propertyNames);
+  static RawSql resultSet(ResultSet resultSet, String... propertyNames) {
+    return XServiceProvider.get().resultSet(resultSet, propertyNames);
   }
 
   /**
@@ -43,10 +29,8 @@ public class RawSqlBuilder {
    * modified - so no additional WHERE or HAVING expressions can be added to
    * this query.
    */
-  public static RawSqlBuilder unparsed(String sql) {
-
-    Sql s = new Sql(sql);
-    return new RawSqlBuilder(s, new ColumnMapping());
+  static RawSqlBuilder unparsed(String sql) {
+    return XServiceProvider.get().unparsed(sql);
   }
 
   /**
@@ -62,19 +46,8 @@ public class RawSqlBuilder {
    * correct column names are entered into the mapping.
    * </p>
    */
-  public static RawSqlBuilder parse(String sql) {
-
-    Sql sql2 = DRawSqlParser.parse(sql);
-    String select = sql2.getPreFrom();
-
-    ColumnMapping mapping = DRawSqlColumnsParser.parse(select);
-    return new RawSqlBuilder(sql2, mapping);
-  }
-
-  private RawSqlBuilder(Sql sql, ColumnMapping columnMapping) {
-    this.sql = sql;
-    this.columnMapping = columnMapping;
-    this.resultSet = null;
+  static RawSqlBuilder parse(String sql) {
+    return XServiceProvider.get().parsed(sql);
   }
 
   /**
@@ -87,17 +60,12 @@ public class RawSqlBuilder {
    * @param dbColumn     the DB column that we are mapping to a bean property
    * @param propertyName the bean property that we are mapping the DB column to.
    */
-  public RawSqlBuilder columnMapping(String dbColumn, String propertyName) {
-    columnMapping.columnMapping(dbColumn, propertyName);
-    return this;
-  }
+  RawSqlBuilder columnMapping(String dbColumn, String propertyName);
 
   /**
    * Ignore this DB column. It is not mapped to any bean property.
    */
-  public RawSqlBuilder columnMappingIgnore(String dbColumn) {
-    return columnMapping(dbColumn, IGNORE_COLUMN);
-  }
+  RawSqlBuilder columnMappingIgnore(String dbColumn);
 
   /**
    * Modify any column mappings with the given table alias to have the path prefix.
@@ -108,24 +76,12 @@ public class RawSqlBuilder {
    * For the "Root type" you don't need to specify a tableAliasMapping.
    * </p>
    */
-  public RawSqlBuilder tableAliasMapping(String tableAlias, String path) {
-    columnMapping.tableAliasMapping(tableAlias, path);
-    return this;
-  }
+  RawSqlBuilder tableAliasMapping(String tableAlias, String path);
 
   /**
    * Create the immutable RawSql object. Do this after all the column mapping
    * has been defined.
    */
-  public RawSql create() {
-    return new RawSql(resultSet, sql, columnMapping.createImmutableCopy());
-  }
-
-  /**
-   * Return the internal parsed Sql object (for testing).
-   */
-  protected Sql getSql() {
-    return sql;
-  }
+  RawSql create();
 
 }

src/main/java/io/ebean/SqlQuery.java

@@ -82,7 +82,9 @@ public interface SqlQuery extends Serializable {
    * Deprecated - please migrate to findOne().
    */
   @Deprecated
-  SqlRow findUnique();
+  default SqlRow findUnique() {
+    return findOne();
+  }
 
   /**
    * The same as bind for named parameters.

src/main/java/io/ebean/Transaction.java

@@ -1,6 +1,7 @@
 package io.ebean;
 
 import io.ebean.annotation.DocStoreMode;
+import io.ebean.annotation.PersistBatch;
 import io.ebean.config.DocStoreConfig;
 import io.ebean.config.ServerConfig;
 

src/main/java/io/ebean/TxCallable.java

@@ -1,50 +0,0 @@
-package io.ebean;
-
-import java.util.concurrent.Callable;
-
-/**
- * Deprecated - please migrate to just using Callable instead with executeCall().
- *
- * Execute a TxCallable in a Transaction scope.
- * <p>
- * Use this with the {@link Ebean#executeCall(Callable)} method.
- * </p>
- * <p>
- * Note that this is basically the same as TxRunnable except that it returns an
- * Object (and you specify the return type via generics).
- * </p>
- * <p>
- * See also {@link TxRunnable}.
- * </p>
- * <p>
- * <pre>{@code
- *
- * Ebean.execute(new TxCallable<String>() {
- *   public String call() {
- *     User u1 = Ebean.find(User.class, 1);
- *     User u2 = Ebean.find(User.class, 2);
- *
- *     u1.setName("u1 mod");
- *     u2.setName("u2 mod");
- *
- *     Ebean.save(u1);
- *     Ebean.save(u2);
- *
- *     return u1.getEmail();
- *   }
- * });
- *
- * }</pre>
- */
-@Deprecated
-public interface TxCallable<T> extends Callable<T> {
-
-  /**
-   * Execute the method within a transaction scope returning the result.
-   * <p>
-   * If you do not want to return a result you should look to use TxRunnable
-   * instead.
-   * </p>
-   */
-  T call();
-}

src/main/java/io/ebean/TxRunnable.java

@@ -1,41 +0,0 @@
-package io.ebean;
-
-/**
- * Deprecated - please migrate to using just Runnable.
- *
- *
- * Execute a TxRunnable in a Transaction scope.
- * <p>
- * Use this with the {@link Ebean#execute(Runnable)} method.
- * </p>
- * <p>
- * <pre>{@code
- *
- * // this run method runs in a transaction scope
- * // which by default is TxScope.REQUIRED
- *
- * Ebean.execute(new TxRunnable() {
- *   public void run() {
- *     User u1 = Ebean.find(User.class, 1);
- *     User u2 = Ebean.find(User.class, 2);
- *
- *     u1.setName("u1 mod");
- *     u2.setName("u2 mod");
- *
- *     Ebean.save(u1);
- *     Ebean.save(u2);
- *   }
- * });
- *
- * }</pre>
- *
- * @see TxCallable
- */
-@Deprecated
-public interface TxRunnable extends Runnable {
-
-  /**
-   * Run the method in a transaction sope.
-   */
-  void run();
-}

src/main/java/io/ebean/TxScope.java

@@ -1,24 +1,27 @@
 package io.ebean;
 
+import io.ebean.annotation.PersistBatch;
+import io.ebean.annotation.TxIsolation;
+import io.ebean.annotation.TxType;
+
 import java.util.ArrayList;
+import java.util.concurrent.Callable;
 
 /**
  * Holds the definition of how a transactional method should run.
  * <p>
  * This information matches the features of the Transactional annotation. You
- * can use it directly with TxRunnable or TxCallable via
- * {@link Ebean#execute(TxScope, TxCallable)} or
- * {@link Ebean#execute(TxScope, TxRunnable)}.
+ * can use it directly with Runnable or Callable via
+ * {@link Ebean#execute(TxScope, Runnable)} or
+ * {@link Ebean#executeCall(TxScope, Callable)}.
  * </p>
  * <p>
  * This object is used internally with the enhancement of a method with
  * Transactional annotation.
  * </p>
  *
- * @see TxCallable
- * @see TxRunnable
- * @see Ebean#execute(TxScope, TxCallable)
- * @see Ebean#execute(TxScope, TxRunnable)
+ * @see Ebean#execute(TxScope, Runnable)
+ * @see Ebean#executeCall(TxScope, Callable)
  */
 public final class TxScope {
 
@@ -38,6 +41,11 @@ public final class TxScope {
 
   boolean readOnly;
 
+  /**
+   * Set this to false if the JDBC batch should not be automatically be flushed when a query is executed.
+   */
+  boolean flushOnQuery = true;
+
   ArrayList<Class<? extends Throwable>> rollbackFor;
 
   ArrayList<Class<? extends Throwable>> noRollbackFor;
@@ -235,6 +243,21 @@ public final class TxScope {
     return this;
   }
 
+  /**
+   * Return false if the JDBC batch buffer should not be flushed automatically when a query is executed.
+   */
+  public boolean isFlushOnQuery() {
+    return flushOnQuery;
+  }
+
+  /**
+   * Set flushOnQuery to be false to stop automatically flushing the JDBC batch buffer when a query is executed.
+   */
+  public TxScope setFlushOnQuery(boolean flushOnQuery) {
+    this.flushOnQuery = flushOnQuery;
+    return this;
+  }
+
   /**
    * Return the Isolation level this transaction should run with.
    */

src/main/java/io/ebean/XServiceProvider.java

@@ -0,0 +1,30 @@
+package io.ebean;
+
+import io.ebean.service.SpiRawSqlService;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+/**
+ * Lookup internal services.
+ */
+class XServiceProvider {
+
+  private static SpiRawSqlService builder = init();
+
+  private static SpiRawSqlService init() {
+
+    Iterator<SpiRawSqlService> loader = ServiceLoader.load(SpiRawSqlService.class).iterator();
+    if (loader.hasNext()) {
+      return loader.next();
+    }
+    throw new IllegalStateException("No service implementation found for SpiRawSqlService?");
+  }
+
+  /**
+   * Return the RawSqlService implementation.
+   */
+  static SpiRawSqlService get() {
+    return builder;
+  }
+}

src/main/java/io/ebean/bean/BeanCollection.java

@@ -226,4 +226,9 @@ public interface BeanCollection<E> extends Serializable {
    * additions and removals have been processed.
    */
   void modifyReset();
+
+  /**
+   * Return a shallow copy of this collection that is modifiable.
+   */
+  BeanCollection<E> getShallowCopy();
 }

src/main/java/io/ebean/bean/BeanDiffVisitor.java

@@ -0,0 +1,22 @@
+package io.ebean.bean;
+
+/**
+ * Visitor for collecting new/old values for a bean update.
+ */
+public interface BeanDiffVisitor {
+
+  /**
+   * Collect a new/old value pair.
+   */
+  void visit(int position, Object newVal, Object oldVal);
+
+  /**
+   * Start processing an associated bean.
+   */
+  void visitPush(int position);
+
+  /**
+   * Stop processing an associated bean.
+   */
+  void visitPop();
+}

src/main/java/io/ebean/bean/EntityBeanIntercept.java

@@ -507,6 +507,15 @@ public final class EntityBeanIntercept implements Serializable {
     loadedProps[propertyIndex] = true;
   }
 
+  /**
+   * Set all properties to be loaded (post insert).
+   */
+  public void setLoadedPropertyAll() {
+    for (int i = 0; i < loadedProps.length; i++) {
+      loadedProps[i] = true;
+    }
+  }
+
   /**
    * Return true if the property is loaded.
    */
@@ -694,6 +703,28 @@ public final class EntityBeanIntercept implements Serializable {
     }
   }
 
+  /**
+   * Recursively add dirty properties.
+   */
+  public void addDirtyPropertyValues(BeanDiffVisitor visitor) {
+    int len = getPropertyLength();
+    for (int i = 0; i < len; i++) {
+      if (changedProps != null && changedProps[i]) {
+        // the property has been changed on this bean
+        Object newVal = owner._ebean_getField(i);
+        Object oldVal = getOrigValue(i);
+        visitor.visit(i, newVal, oldVal);
+
+      } else if (embeddedDirty != null && embeddedDirty[i]) {
+        // an embedded property has been changed - recurse
+        EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i);
+        visitor.visitPush(i);
+        embeddedBean._ebean_getIntercept().addDirtyPropertyValues(visitor);
+        visitor.visitPop();
+      }
+    }
+  }
+
   /**
    * Return a dirty property hash taking into account embedded beans.
    */
@@ -1124,4 +1155,11 @@ public final class EntityBeanIntercept implements Serializable {
     }
     return (pcs == null) ? null : new PropertyChangeEvent(owner, getProperty(propertyIndex), oldValue, newValue);
   }
+
+  /**
+   * Explicitly set an old value.
+   */
+  public void setOldValue(int propertyIndex,Object oldValue) {
+    setChangedPropertyValue(propertyIndex, true, oldValue);
+  }
 }

src/main/java/io/ebean/common/AbstractBeanCollection.java

@@ -213,4 +213,16 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   boolean holdsModifications() {
     return modifyHolder != null && modifyHolder.hasModifications();
   }
+  
+  /**
+   * Copies all relevant properties for a clone. See {@link #getShallowCopy()}
+   * @param other
+   */
+  protected void setFromOriginal(AbstractBeanCollection<E> other) {
+    this.disableLazyLoad = other.disableLazyLoad;
+    this.ebeanServerName = other.ebeanServerName;
+    this.loader = other.loader;
+    this.ownerBean = other.ownerBean;
+    this.propertyName = other.propertyName;
+  }
 }

src/main/java/io/ebean/common/BeanList.java

@@ -541,4 +541,11 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
     }
 
   }
+
+  @Override
+  public BeanCollection<E> getShallowCopy() {
+    BeanList<E> copy = new BeanList<>(new CopyOnFirstWriteList<>(list));
+    copy.setFromOriginal(this);
+    return copy;
+  }
 }

src/main/java/io/ebean/common/BeanMap.java

@@ -340,4 +340,10 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
     return map.values();
   }
 
+  @Override
+  public BeanCollection<E> getShallowCopy() {
+    BeanMap<K, E> copy = new BeanMap<>(new LinkedHashMap<>(map));
+    copy.setFromOriginal(this);
+    return copy;
+  }
 }

src/main/java/io/ebean/common/BeanSet.java

@@ -377,5 +377,11 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
       throw new IllegalStateException("This collection is in ReadOnly mode");
     }
   }
-
+  
+  @Override
+  public BeanCollection<E> getShallowCopy() {
+    BeanSet<E> copy = new BeanSet<>(new LinkedHashSet<>(set));
+    copy.setFromOriginal(this);
+    return copy;
+  }
 }

src/main/java/io/ebean/common/CopyOnFirstWriteList.java

@@ -0,0 +1,180 @@
+package io.ebean.common;
+
+import java.io.Serializable;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
+
+/**
+ * List that copies itself on first write access. Needed to keep memory footprint low and the ability
+ * to modify lists from cache.
+ * 
+ * @author Roland Praml, FOCONIS AG
+ */
+public final class CopyOnFirstWriteList<E> extends AbstractList<E> implements List<E>, Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * The underlying List implementation.
+   */
+  private List<E> list;
+  
+  
+  public CopyOnFirstWriteList(List<E> list) {
+    super();
+    this.list = list;
+  }
+
+  private volatile boolean copied = false;
+
+  @Override
+  public int size() {
+    return list.size();
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return list.isEmpty();
+  }
+
+  @Override
+  public boolean contains(Object o) {
+    return list.contains(o);
+  }
+
+  @Override
+  public Object[] toArray() {
+    return list.toArray();
+  }
+
+  @Override
+  public <T> T[] toArray(T[] a) {
+    return list.toArray(a);
+  }
+
+  @Override
+  public boolean add(E e) {
+    checkCopyOnWrite();
+    return list.add(e);
+  }
+
+  @Override
+  public boolean remove(Object o) {
+    checkCopyOnWrite();
+    return list.remove(o);
+  }
+
+  @Override
+  public boolean containsAll(Collection<?> c) {
+    return list.containsAll(c);
+  }
+
+  @Override
+  public boolean addAll(Collection<? extends E> c) {
+    checkCopyOnWrite();
+    return list.addAll(c);
+  }
+
+  @Override
+  public boolean addAll(int index, Collection<? extends E> c) {
+    checkCopyOnWrite();
+    return list.addAll(index, c);
+  }
+
+  @Override
+  public boolean removeAll(Collection<?> c) {
+    checkCopyOnWrite();
+    return list.removeAll(c);
+  }
+
+  @Override
+  public boolean retainAll(Collection<?> c) {
+    checkCopyOnWrite();
+    return list.retainAll(c);
+  }
+
+  @Override
+  public void replaceAll(UnaryOperator<E> operator) {
+    checkCopyOnWrite();
+    list.replaceAll(operator);
+  }
+
+  @Override
+  public boolean removeIf(Predicate<? super E> filter) {
+    checkCopyOnWrite();
+    return list.removeIf(filter);
+  }
+
+  @Override
+  public void sort(Comparator<? super E> c) {
+    checkCopyOnWrite();
+    list.sort(c);
+  }
+
+  @Override
+  public void clear() {
+    if (!copied) {
+      list = new ArrayList<>();
+      copied = true;
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    return list.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return list.hashCode();
+  }
+
+  @Override
+  public E get(int index) {
+    return list.get(index);
+  }
+
+  @Override
+  public E set(int index, E element) {
+    checkCopyOnWrite();
+    return list.set(index, element);
+  }
+
+  @Override
+  public void add(int index, E element) {
+    checkCopyOnWrite();
+    list.add(index, element);
+  }
+
+  @Override
+  public E remove(int index) {
+    checkCopyOnWrite();
+    return list.remove(index);
+  }
+
+  @Override
+  public int indexOf(Object o) {
+    return list.indexOf(o);
+  }
+
+  @Override
+  public int lastIndexOf(Object o) {
+    return list.lastIndexOf(o);
+  }
+  
+  private void checkCopyOnWrite() {
+    if (!copied) {
+      synchronized (this) {
+        if (!copied) {
+          list = new ArrayList<>(list);
+          copied = true;
+        }
+      }
+    }
+  }
+}

src/main/java/io/ebean/config/AbstractNamingConvention.java

@@ -1,7 +1,7 @@
 package io.ebean.config;
 
 import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebeaninternal.server.deploy.parse.AnnotationBase;
+import io.ebean.util.AnnotationUtil;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -219,8 +219,8 @@ public abstract class AbstractNamingConvention implements NamingConvention {
    * Return true if this class is part of entity inheritance.
    */
   protected boolean hasInheritance(Class<?> supCls) {
-    return AnnotationBase.findAnnotationRecursive(supCls, Inheritance.class) != null 
-        || AnnotationBase.findAnnotation(supCls, DiscriminatorValue.class) != null;
+    return AnnotationUtil.findAnnotationRecursive(supCls, Inheritance.class) != null
+        || AnnotationUtil.findAnnotation(supCls, DiscriminatorValue.class) != null;
   }
 
 
@@ -253,7 +253,7 @@ public abstract class AbstractNamingConvention implements NamingConvention {
    */
   protected TableName getTableNameFromAnnotation(Class<?> beanClass) {
 
-    final Table t = AnnotationBase.findAnnotationRecursive(beanClass, Table.class);
+    final Table t = AnnotationUtil.findAnnotationRecursive(beanClass, Table.class);
 
     // Take the annotation if defined
     if (t != null && !isEmpty(t.name())) {

src/main/java/io/ebean/config/CustomDbTypeMapping.java

@@ -1,7 +1,7 @@
 package io.ebean.config;
 
 import io.ebean.config.dbplatform.DbType;
-import io.ebean.Platform;
+import io.ebean.annotation.Platform;
 
 /**
  * Custom mappings for DB types that override the default.

src/main/java/io/ebean/config/DbMigrationConfig.java

@@ -1,6 +1,6 @@
 package io.ebean.config;
 
-import io.ebean.Platform;
+import io.ebean.annotation.Platform;
 import io.ebean.migration.MigrationConfig;
 import io.ebean.migration.MigrationRunner;
 import org.slf4j.Logger;

src/main/java/io/ebean/config/DbTypeConfig.java

@@ -2,7 +2,7 @@ package io.ebean.config;
 
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
-import io.ebean.Platform;
+import io.ebean.annotation.Platform;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/io/ebean/config/ServerConfig.java

@@ -2,18 +2,16 @@ package io.ebean.config;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import io.ebean.EbeanServerFactory;
-import io.ebean.PersistBatch;
 import io.ebean.PersistenceContextScope;
-import io.ebean.Platform;
 import io.ebean.Query;
 import io.ebean.Transaction;
 import io.ebean.annotation.Encrypted;
+import io.ebean.annotation.PersistBatch;
+import io.ebean.annotation.Platform;
 import io.ebean.cache.ServerCachePlugin;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.config.dbplatform.DbType;
-import io.ebean.dbmigration.DbOffline;
-import io.ebean.migration.MigrationRunner;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanPersistController;
 import io.ebean.event.BeanPersistListener;
@@ -28,8 +26,8 @@ import io.ebean.event.changelog.ChangeLogRegister;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetaInfoManager;
+import io.ebean.migration.MigrationRunner;
 import io.ebean.util.StringHelper;
-
 import org.avaje.datasource.DataSourceConfig;
 
 import javax.sql.DataSource;
@@ -439,6 +437,16 @@ public class ServerConfig {
    */
   private boolean disableL2Cache;
 
+  /**
+   * The time in millis used to determine when a query is alerted for being slow.
+   */
+  private long slowQueryMillis;
+
+  /**
+   * The listener for processing slow query events.
+   */
+  private SlowQueryListener slowQueryListener;
+
   /**
    * Construct a Server Configuration for programmatically creating an EbeanServer.
    */
@@ -446,6 +454,34 @@ public class ServerConfig {
 
   }
 
+  /**
+   * Return the slow query time in millis.
+   */
+  public long getSlowQueryMillis() {
+    return slowQueryMillis;
+  }
+
+  /**
+   * Set the slow query time in millis.
+   */
+  public void setSlowQueryMillis(long slowQueryMillis) {
+    this.slowQueryMillis = slowQueryMillis;
+  }
+
+  /**
+   * Return the slow query event listener.
+   */
+  public SlowQueryListener getSlowQueryListener() {
+    return slowQueryListener;
+  }
+
+  /**
+   * Set the slow query event listener.
+   */
+  public void setSlowQueryListener(SlowQueryListener slowQueryListener) {
+    this.slowQueryListener = slowQueryListener;
+  }
+
   /**
    * Put a service object into configuration such that it can be passed to a plugin.
    * <p>
@@ -1632,16 +1668,6 @@ public class ServerConfig {
     this.encryptor = encryptor;
   }
 
-  /**
-   * Return true if the instance is coming up in offline mode.
-   * <p>
-   * Offline mode is mostly used when generating DB migration.
-   * </p>
-   */
-  public boolean isOfflineMode() {
-    return dbOffline || DbOffline.isSet();
-  }
-
   /**
    * Return true if the EbeanServer instance should be created in offline mode.
    */
@@ -2534,6 +2560,7 @@ public class ServerConfig {
       dbTypeConfig.setGeometrySRID(srid);
     }
 
+    slowQueryMillis = p.getLong("slowQueryMillis", slowQueryMillis);
     docStoreOnly = p.getBoolean("docStoreOnly", docStoreOnly);
     disableL2Cache = p.getBoolean("disableL2Cache", disableL2Cache);
     explicitTransactionBeginMode = p.getBoolean("explicitTransactionBeginMode", explicitTransactionBeginMode);

src/main/java/io/ebean/config/SlowQueryEvent.java

@@ -0,0 +1,59 @@
+package io.ebean.config;
+
+import io.ebean.bean.ObjectGraphNode;
+
+/**
+ * Slow query event.
+ */
+public class SlowQueryEvent {
+
+  private final String sql;
+
+  private final long timeMillis;
+
+  private final int rowCount;
+
+  private final ObjectGraphNode originNode;
+
+  /**
+   * Construct with the SQL and execution time in millis.
+   */
+  public SlowQueryEvent(String sql, long timeMillis, int rowCount, ObjectGraphNode originNode) {
+    this.sql = sql;
+    this.timeMillis = timeMillis;
+    this.rowCount = rowCount;
+    this.originNode = originNode;
+  }
+
+  /**
+   * Return the SQL for the slow query.
+   */
+  public String getSql() {
+    return sql;
+  }
+
+  /**
+   * Return the execution time in millis.
+   */
+  public long getTimeMillis() {
+    return timeMillis;
+  }
+
+  /**
+   * Return the total row count associated with the query.
+   */
+  public int getRowCount() {
+    return rowCount;
+  }
+
+  /**
+   * Return the origin point for the root query.
+   * <p>
+   * Typically the <code>originNode.getOriginQueryPoint().getFirstStackElement()</code> provides the stack line that
+   * shows the code that invoked the query.
+   * </p>
+   */
+  public ObjectGraphNode getOriginNode() {
+    return originNode;
+  }
+}

src/main/java/io/ebean/config/SlowQueryListener.java

@@ -0,0 +1,13 @@
+package io.ebean.config;
+
+/**
+ * Listener for slow query events.
+ */
+@FunctionalInterface
+public interface SlowQueryListener {
+
+  /**
+   * Process a slow query event.
+   */
+  void process(SlowQueryEvent event);
+}

src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java

@@ -2,13 +2,10 @@ package io.ebean.config.dbplatform;
 
 import io.ebean.BackgroundExecutor;
 import io.ebean.Query;
+import io.ebean.annotation.PersistBatch;
+import io.ebean.annotation.Platform;
 import io.ebean.config.CustomDbTypeMapping;
 import io.ebean.config.DbTypeConfig;
-import io.ebean.PersistBatch;
-import io.ebean.Platform;
-import io.ebean.config.ServerConfig;
-import io.ebean.dbmigration.ddlgeneration.DdlHandler;
-import io.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -162,8 +159,6 @@ public class DatabasePlatform {
    */
   protected PersistBatch persistBatchOnCascade = PersistBatch.ALL;
 
-  protected PlatformDdl platformDdl;
-
   /**
    * The maximum length of table names - used specifically when derived
    * default table names for intersection tables.
@@ -276,23 +271,6 @@ public class DatabasePlatform {
     return maxConstraintNameLength;
   }
 
-  /**
-   * Return the platform specific DDL.
-   */
-  public PlatformDdl getPlatformDdl() {
-    return platformDdl;
-  }
-
-  /**
-   * Create and return a DDL handler for generating DDL scripts.
-   */
-  public DdlHandler createDdlHandler(ServerConfig serverConfig) {
-    if (platformDdl == null) {
-      throw new IllegalStateException("Platform " + getName() + " has no DDL Handler");
-    }
-    return platformDdl.createDdlHandler(serverConfig);
-  }
-
   /**
    * Return true if the JDBC driver does not allow additional queries to execute
    * when a resultSet is being 'streamed' as is the case with findEach() etc.

src/main/java/io/ebean/config/dbplatform/DbIdentity.java

@@ -1,6 +1,5 @@
 package io.ebean.config.dbplatform;
 
-import io.ebean.dbmigration.migration.IdentityType;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -121,28 +120,4 @@ public class DbIdentity {
     this.idType = idType;
   }
 
-  /**
-   * Determine the id type to use based on requested identityType and
-   * the support for that in the database platform.
-   */
-  public IdType useIdentityType(IdentityType identityType) {
-
-    if (identityType == null) {
-      // use the default
-      return idType;
-    }
-    switch (identityType) {
-      case GENERATOR:
-        return IdType.GENERATOR;
-      case EXTERNAL:
-        return IdType.EXTERNAL;
-      case SEQUENCE:
-        return supportsSequence ? IdType.SEQUENCE : idType;
-      case IDENTITY:
-        return supportsIdentity ? IdType.IDENTITY : idType;
-      default:
-        return idType;
-    }
-
-  }
 }

src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java

@@ -1,14 +1,13 @@
 package io.ebean.config.dbplatform.db2;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.PersistBatch;
-import io.ebean.Platform;
+import io.ebean.annotation.PersistBatch;
+import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.SqlErrorCodes;
-import io.ebean.dbmigration.ddlgeneration.platform.DB2Ddl;
 
 import javax.sql.DataSource;
 import java.sql.Types;
@@ -24,7 +23,6 @@ public class DB2Platform extends DatabasePlatform {
     this.maxTableNameLength = 18;
     this.maxConstraintNameLength = 18;
     this.sqlLimiter = new Db2SqlLimiter();
-    this.platformDdl = new DB2Ddl(this);
 
     this.dbIdentity.setSupportsGetGeneratedKeys(true);
     this.dbIdentity.setSupportsSequence(true);
@@ -44,7 +42,7 @@ public class DB2Platform extends DatabasePlatform {
     dbTypeMap.put(DbType.BIGINT, new DbPlatformType("bigint", false));
     dbTypeMap.put(DbType.REAL, new DbPlatformType("real"));
     dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("decimal", 15));
-    
+
     persistBatchOnCascade = PersistBatch.NONE;
   }
 

src/main/java/io/ebean/config/dbplatform/h2/H2Platform.java

@@ -1,15 +1,14 @@
 package io.ebean.config.dbplatform.h2;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.Platform;
 import io.ebean.Query;
+import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.SqlErrorCodes;
-import io.ebean.dbmigration.ddlgeneration.platform.H2Ddl;
 
 import javax.sql.DataSource;
 
@@ -22,7 +21,6 @@ public class H2Platform extends DatabasePlatform {
     super();
     this.platform = Platform.H2;
     this.dbEncrypt = new H2DbEncrypt();
-    this.platformDdl = new H2Ddl(this);
     this.historySupport = new H2HistorySupport();
     this.nativeUuidType = true;
     this.dbDefaultValue.setNow("now()");

src/main/java/io/ebean/config/dbplatform/hsqldb/HsqldbPlatform.java

@@ -1,7 +1,7 @@
 package io.ebean.config.dbplatform.hsqldb;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.Platform;
+import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
@@ -9,7 +9,6 @@ import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.h2.H2DbEncrypt;
 import io.ebean.config.dbplatform.h2.H2SequenceIdGenerator;
-import io.ebean.dbmigration.ddlgeneration.platform.HsqldbDdl;
 
 import javax.sql.DataSource;
 
@@ -22,7 +21,6 @@ public class HsqldbPlatform extends DatabasePlatform {
     super();
     this.platform = Platform.HSQLDB;
     this.dbEncrypt = new H2DbEncrypt();
-    this.platformDdl = new HsqldbDdl(this);
 
     this.dbIdentity.setIdType(IdType.IDENTITY);
     this.dbIdentity.setSupportsGetGeneratedKeys(true);

src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java

@@ -1,15 +1,14 @@
 package io.ebean.config.dbplatform.mysql;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.Platform;
 import io.ebean.Query;
+import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.SqlErrorCodes;
-import io.ebean.dbmigration.ddlgeneration.platform.MySqlDdl;
 
 import javax.sql.DataSource;
 import java.sql.Types;
@@ -32,7 +31,6 @@ public class MySqlPlatform extends DatabasePlatform {
     this.useExtraTransactionOnIterateSecondaryQueries = true;
     this.selectCountWithAlias = true;
     this.dbEncrypt = new MySqlDbEncrypt();
-    this.platformDdl = new MySqlDdl(this);
     this.historySupport = new MySqlHistorySupport();
     this.columnAliasPrefix = null;
 

src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java

@@ -1,8 +1,8 @@
 package io.ebean.config.dbplatform.oracle;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.Platform;
 import io.ebean.Query;
+import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.BasicSqlAnsiLimiter;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
@@ -10,7 +10,6 @@ import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.RownumSqlLimiter;
-import io.ebean.dbmigration.ddlgeneration.platform.Oracle10Ddl;
 
 import javax.sql.DataSource;
 import java.sql.Types;
@@ -28,7 +27,6 @@ public class OraclePlatform extends DatabasePlatform {
     this.dbEncrypt = new OracleDbEncrypt();
     this.sqlLimiter = new RownumSqlLimiter();
     this.basicSqlLimiter = new BasicSqlAnsiLimiter();
-    this.platformDdl = new Oracle10Ddl(this);
     this.historySupport = new OracleDbHistorySupport();
 
     // Not using getGeneratedKeys as instead we will

src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java

@@ -1,17 +1,14 @@
 package io.ebean.config.dbplatform.postgres;
 
 import io.ebean.BackgroundExecutor;
-import io.ebean.Platform;
 import io.ebean.Query;
-import io.ebean.config.ServerConfig;
+import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.SqlErrorCodes;
-import io.ebean.dbmigration.ddlgeneration.DdlHandler;
-import io.ebean.dbmigration.ddlgeneration.platform.PostgresDdl;
 
 import javax.sql.DataSource;
 import java.sql.Types;
@@ -36,7 +33,6 @@ public class PostgresPlatform extends DatabasePlatform {
 
     this.dbEncrypt = new PostgresDbEncrypt();
     this.historySupport = new PostgresHistorySupport();
-    this.platformDdl = new PostgresDdl(this);
 
     // Use Identity and getGeneratedKeys
     this.dbIdentity.setIdType(IdType.IDENTITY);
@@ -90,14 +86,6 @@ public class PostgresPlatform extends DatabasePlatform {
     return new DbPlatformType("geometry(" + type + "," + srid + ")");
   }
 
-  /**
-   * Return a DdlHandler instance for generating DDL for the specific platform.
-   */
-  @Override
-  public DdlHandler createDdlHandler(ServerConfig serverConfig) {
-    return this.platformDdl.createDdlHandler(serverConfig);
-  }
-
   /**
    * Create a Postgres specific sequence IdGenerator.
    */

src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java

@@ -1,6 +1,6 @@
 package io.ebean.config.dbplatform.sqlanywhere;
 
-import io.ebean.Platform;
+import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;

src/main/java/io/ebean/config/dbplatform/sqlite/SQLitePlatform.java

@@ -1,11 +1,10 @@
 package io.ebean.config.dbplatform.sqlite;
 
-import io.ebean.Platform;
+import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
-import io.ebean.dbmigration.ddlgeneration.platform.SQLiteDdl;
 
 import java.sql.Types;
 
@@ -14,8 +13,6 @@ public class SQLitePlatform extends DatabasePlatform {
   public SQLitePlatform() {
     super();
     this.platform = Platform.SQLITE;
-    this.platformDdl = new SQLiteDdl(this);
-
     this.dbIdentity.setIdType(IdType.IDENTITY);
     this.dbIdentity.setSupportsGetGeneratedKeys(false);
     this.dbIdentity.setSupportsSequence(false);

src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java

@@ -1,13 +1,13 @@
 package io.ebean.config.dbplatform.sqlserver;
 
-import io.ebean.PersistBatch;
-import io.ebean.Platform;
+import io.ebean.annotation.PersistBatch;
+import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.SqlErrorCodes;
-import io.ebean.dbmigration.ddlgeneration.platform.SqlServerDdl;
+
 import java.sql.Types;
 
 /**
@@ -25,7 +25,6 @@ public class SqlServerPlatform extends DatabasePlatform {
     this.selectCountWithAlias = true;
     this.sqlLimiter = new SqlServerSqlLimiter();
     this.basicSqlLimiter = new SqlServerBasicSqlLimiter();
-    this.platformDdl = new SqlServerDdl(this);
     this.historySupport = new SqlServerHistorySupport();
     this.dbIdentity.setIdType(IdType.IDENTITY);
     this.dbIdentity.setSupportsGetGeneratedKeys(true);

src/main/java/io/ebean/dbmigration/DbMigration.java

@@ -1,105 +1,52 @@
 package io.ebean.dbmigration;
 
-import io.ebean.Ebean;
 import io.ebean.EbeanServer;
-import io.ebean.config.DbConstraintNaming;
-import io.ebean.config.DbMigrationConfig;
-import io.ebean.Platform;
+import io.ebean.annotation.Platform;
 import io.ebean.config.ServerConfig;
-import io.ebean.config.dbplatform.db2.DB2Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.config.dbplatform.h2.H2Platform;
-import io.ebean.config.dbplatform.hsqldb.HsqldbPlatform;
-import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
-import io.ebean.config.dbplatform.mysql.MySqlPlatform;
-import io.ebean.config.dbplatform.oracle.OraclePlatform;
-import io.ebean.config.dbplatform.postgres.PostgresPlatform;
-import io.ebean.config.dbplatform.sqlanywhere.SqlAnywherePlatform;
-import io.ebean.config.dbplatform.sqlite.SQLitePlatform;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.migration.Migration;
-import io.ebean.dbmigration.migrationreader.MigrationXmlWriter;
-import io.ebean.dbmigration.model.CurrentModel;
-import io.ebean.dbmigration.model.MConfiguration;
-import io.ebean.dbmigration.model.MigrationModel;
-import io.ebean.dbmigration.model.MigrationVersion;
-import io.ebean.dbmigration.model.ModelContainer;
-import io.ebean.dbmigration.model.ModelDiff;
-import io.ebean.dbmigration.model.PlatformDdlWriter;
-import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.extraddl.model.DdlScript;
-import io.ebeaninternal.extraddl.model.ExtraDdl;
-import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Iterator;
+import java.util.ServiceLoader;
 
 /**
- * Generates DB Migration xml and sql scripts.
+ * Generates DDL migration scripts based on changes to the current model.
+ *
  * <p>
- * Reads the prior migrations and compares with the current model of the EbeanServer
- * and generates a migration 'diff' in the form of xml document with the logical schema
- * changes and a series of sql scripts to apply, rollback the applied changes if necessary
- * and drop objects (drop tables, drop columns).
- * </p>
- * <p>
- * This does not run the migration or ddl scripts but just generates them.
+ * Typically this is run as a main method in src/test once a developer is happy
+ * with the next set of changes to the model.
  * </p>
+ *
+ * <h3>Example: Run for a single specific platform</h3>
+ *
  * <pre>{@code
  *
- *       DbMigration migration = new DbMigration();
- *       migration.setPathToResources("src/main/resources");
- *       migration.setPlatform(DbPlatformName.ORACLE);
+ *    // optionally specify the version and name
+ *    //System.setProperty("ddl.migration.version", "1.1");
+ *    //System.setProperty("ddl.migration.name", "add bars");
  *
- *       migration.generateMigration();
+ *    // generate a migration using drops from a prior version
+ *    //System.setProperty("ddl.migration.pendingDropsFor", "1.2");
+ *
+ *    DbMigration migration = DbMigration.create();
+ *
+ *    migration.setPlatform(Platform.POSTGRES);
+ *    migration.generateMigration();
  *
  * }</pre>
  */
-public class DbMigration {
-
-  protected static final Logger logger = LoggerFactory.getLogger(DbMigration.class);
-
-  private static final String initialVersion = "1.0";
-
-  private static final String GENERATED_COMMENT = "THIS IS A GENERATED FILE - DO NOT MODIFY";
+public interface DbMigration {
 
   /**
-   * Set to true if DbMigration run with online EbeanServer instance.
+   * Create a DbMigration implementation to use.
    */
-  protected final boolean online;
+  static DbMigration create() {
 
-  protected SpiEbeanServer server;
-
-  protected DbMigrationConfig migrationConfig;
-
-  protected String pathToResources = "src/main/resources";
-
-  protected DatabasePlatform databasePlatform;
-
-  protected List<Pair> platforms = new ArrayList<>();
-
-  protected ServerConfig serverConfig;
-
-  protected DbConstraintNaming constraintNaming;
-
-  /**
-   * Create for offline migration generation.
-   */
-  public DbMigration() {
-    this.online = false;
-  }
-
-  /**
-   * Create using online EbeanServer.
-   */
-  public DbMigration(EbeanServer server) {
-    this.online = true;
-    setServer(server);
+    Iterator<DbMigration> loader = ServiceLoader.load(DbMigration.class).iterator();
+    if (loader.hasNext()) {
+      return loader.next();
+    }
+    throw new IllegalStateException("No service implementation found for DbMigration?");
   }
 
   /**
@@ -107,33 +54,18 @@ public class DbMigration {
    * <p>
    * This defaults to maven style 'src/main/resources'.
    */
-  public void setPathToResources(String pathToResources) {
-    this.pathToResources = pathToResources;
-  }
+  void setPathToResources(String pathToResources);
 
   /**
    * Set the server to use to determine the current model.
    * Typically this is not called explicitly.
    */
-  public void setServer(EbeanServer ebeanServer) {
-    this.server = (SpiEbeanServer) ebeanServer;
-    setServerConfig(server.getServerConfig());
-  }
+  void setServer(EbeanServer ebeanServer);
 
   /**
    * Set the serverConfig to use. Typically this is not called explicitly.
    */
-  public void setServerConfig(ServerConfig config) {
-    if (this.serverConfig == null) {
-      this.serverConfig = config;
-    }
-    if (migrationConfig == null) {
-      this.migrationConfig = serverConfig.getMigrationConfig();
-    }
-    if (constraintNaming == null) {
-      this.constraintNaming = serverConfig.getConstraintNaming();
-    }
-  }
+  void setServerConfig(ServerConfig config);
 
   /**
    * Set the specific platform to generate DDL for.
@@ -141,9 +73,7 @@ public class DbMigration {
    * If not set this defaults to the platform of the default server.
    * </p>
    */
-  public void setPlatform(Platform platform) {
-    setPlatform(getPlatform(platform));
-  }
+  void setPlatform(Platform platform);
 
   /**
    * Set the specific platform to generate DDL for.
@@ -151,12 +81,7 @@ public class DbMigration {
    * If not set this defaults to the platform of the default server.
    * </p>
    */
-  public void setPlatform(DatabasePlatform databasePlatform) {
-    this.databasePlatform = databasePlatform;
-    if (!online) {
-      DbOffline.setPlatform(databasePlatform.getPlatform());
-    }
-  }
+  void setPlatform(DatabasePlatform databasePlatform);
 
   /**
    * Add an additional platform to write the migration DDL.
@@ -165,9 +90,7 @@ public class DbMigration {
    * from the migration (e.g. generate migration sql for MySql, Postgres and Oracle).
    * </p>
    */
-  public void addPlatform(Platform platform, String prefix) {
-    platforms.add(new Pair(getPlatform(platform), prefix));
-  }
+  void addPlatform(Platform platform, String prefix);
 
   /**
    * Generate the next migration xml file and associated apply and rollback sql scripts.
@@ -177,394 +100,30 @@ public class DbMigration {
    * <h3>Example: Run for a single specific platform</h3>
    * <pre>{@code
    *
-   *       DbMigration migration = new DbMigration();
-   *       migration.setPathToResources("src/main/resources");
-   *       migration.setPlatform(DbPlatformName.ORACLE);
+   *   DbMigration migration = DbMigration.create();
    *
-   *       migration.generateMigration();
+   *   migration.setPlatform(Platform.POSTGRES);
+   *
+   *   migration.generateMigration();
    *
    * }</pre>
    * <p>
    * <h3>Example: Run migration generating DDL for multiple platforms</h3>
    * <pre>{@code
    *
-   *       DbMigration migration = new DbMigration();
-   *       migration.setPathToResources("src/main/resources");
+   *   DbMigration migration = DbMigration.create();
    *
-   *       migration.addPlatform(DbPlatformName.POSTGRES, "pg");
-   *       migration.addPlatform(DbPlatformName.MYSQL, "mysql");
-   *       migration.addPlatform(DbPlatformName.ORACLE, "mysql");
+   *   migration.setPathToResources("src/main/resources");
    *
-   *       migration.generateMigration();
+   *   migration.addPlatform(Platform.POSTGRES, "pg");
+   *   migration.addPlatform(Platform.MYSQL, "mysql");
+   *   migration.addPlatform(Platform.ORACLE, "oracle");
+   *
+   *   migration.generateMigration();
    *
    * }</pre>
-   * @return the generated migration or null
+   *
+   * @return the version of the generated migration or null
    */
-  public String generateMigration() throws IOException {
-
-    // use this flag to stop other plugins like full DDL generation
-    if (!online) {
-      DbOffline.setGenerateMigration();
-      if (databasePlatform == null && !platforms.isEmpty()) {
-        // for multiple platform generation set the general platform
-        // to H2 so that it runs offline without DB connection
-        setPlatform(platforms.get(0).platform);
-      }
-    }
-    setDefaults();
-    try {
-      Request request = createRequest();
-
-      if (platforms.isEmpty()) {
-        generateExtraDdl(request.migrationDir, databasePlatform);
-      }
-
-      String pendingVersion = generatePendingDrop();
-      if (pendingVersion != null) {
-        return generatePendingDrop(request, pendingVersion);
-      } else {
-        return generateDiff(request);
-      }
-
-    } finally {
-      if (!online) {
-        DbOffline.reset();
-      }
-    }
-  }
-
-  /**
-   * Generate "repeatable" migration scripts.
-   * <p>
-   * These take scrips from extra-dll.xml (typically views) and outputs "repeatable"
-   * migration scripts (starting with "R__") to be run by FlywayDb or Ebean's own
-   * migration runner.
-   * </p>
-   */
-  private void generateExtraDdl(File migrationDir, DatabasePlatform dbPlatform) throws IOException {
-
-    if (dbPlatform != null) {
-      ExtraDdl extraDdl = ExtraDdlXmlReader.read("/extra-ddl.xml");
-      if (extraDdl != null) {
-        List<DdlScript> ddlScript = extraDdl.getDdlScript();
-        for (DdlScript script : ddlScript) {
-          if (ExtraDdlXmlReader.matchPlatform(dbPlatform.getName(), script.getPlatforms())) {
-            writeExtraDdl(migrationDir, script);
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Write (or override) the "repeatable" migration script.
-   */
-  private void writeExtraDdl(File migrationDir, DdlScript script) throws IOException {
-
-    String fullName = repeatableMigrationName(script.getName());
-
-    logger.info("writing repeatable script {}", fullName);
-
-    File file = new File(migrationDir, fullName);
-    try (FileWriter writer = new FileWriter(file)) {
-      writer.write(script.getValue());
-      writer.flush();
-    }
-  }
-
-  private String repeatableMigrationName(String scriptName) {
-    return "R__" + scriptName.replace(' ', '_') + migrationConfig.getApplySuffix();
-  }
-
-  /**
-   * Generate the diff migration.
-   */
-  private String generateDiff(Request request) throws IOException {
-
-    List<String> pendingDrops = request.getPendingDrops();
-    if (!pendingDrops.isEmpty()) {
-      logger.info("Pending un-applied drops in versions {}", pendingDrops);
-    }
-
-    Migration migration = request.createDiffMigration();
-    if (migration == null) {
-      logger.info("no changes detected - no migration written");
-      return null;
-    } else {
-      // there were actually changes to write
-      return generateMigration(request, migration, null);
-    }
-  }
-
-  /**
-   * Generate the migration based on the pendingDrops from a prior version.
-   */
-  private String generatePendingDrop(Request request, String pendingVersion) throws IOException {
-
-    Migration migration = request.migrationForPendingDrop(pendingVersion);
-
-    String version = generateMigration(request, migration, pendingVersion);
-
-    List<String> pendingDrops = request.getPendingDrops();
-    if (!pendingDrops.isEmpty()) {
-      logger.info("... remaining pending un-applied drops in versions {}", pendingDrops);
-    }
-    return version;
-  }
-
-  private Request createRequest() {
-    return new Request();
-  }
-
-  private class Request {
-
-    final File migrationDir;
-    final File modelDir;
-    final MigrationModel migrationModel;
-    final CurrentModel currentModel;
-    final ModelContainer migrated;
-    final ModelContainer current;
-
-    private Request() {
-      this.migrationDir = getMigrationDirectory();
-      this.modelDir = getModelDirectory(migrationDir);
-      this.migrationModel = new MigrationModel(modelDir, migrationConfig.getModelSuffix());
-      this.migrated = migrationModel.read();
-      this.currentModel = new CurrentModel(server, constraintNaming);
-      this.current = currentModel.read();
-    }
-
-    /**
-     * Return the migration for the pending drops for a given version.
-     */
-    public Migration migrationForPendingDrop(String pendingVersion) {
-
-      Migration migration = migrated.migrationForPendingDrop(pendingVersion);
-
-      // register any remaining pending drops
-      migrated.registerPendingHistoryDropColumns(current);
-      return migration;
-    }
-
-    /**
-     * Return the list of versions that have pending un-applied drops.
-     */
-    public List<String> getPendingDrops() {
-      return migrated.getPendingDrops();
-    }
-
-    /**
-     * Create and return the diff of the current model to the migration model.
-     */
-    public Migration createDiffMigration() {
-      ModelDiff diff = new ModelDiff(migrated);
-      diff.compareTo(current);
-      return diff.isEmpty() ? null : diff.getMigration();
-    }
-  }
-
-  private String generateMigration(Request request, Migration dbMigration, String dropsFor) throws IOException {
-
-    String fullVersion = getFullVersion(request.migrationModel, dropsFor);
-
-    logger.info("generating migration:{}", fullVersion);
-    if (!writeMigrationXml(dbMigration, request.modelDir, fullVersion)) {
-      logger.warn("migration already exists, not generating DDL");
-      return null;
-    } else {
-      if (!platforms.isEmpty()) {
-        writeExtraPlatformDdl(fullVersion, request.currentModel, dbMigration, request.migrationDir);
-
-      } else if (databasePlatform != null) {
-        // writer needs the current model to provide table/column details for
-        // history ddl generation (triggers, history tables etc)
-        DdlWrite write = new DdlWrite(new MConfiguration(), request.current);
-        PlatformDdlWriter writer = createDdlWriter(databasePlatform);
-        writer.processMigration(dbMigration, write, request.migrationDir, fullVersion);
-      }
-      return fullVersion;
-    }
-  }
-
-  /**
-   * Return true if the next pending drop changeSet should be generated as the next migration.
-   */
-  private String generatePendingDrop() {
-
-    String nextDrop = System.getProperty("ddl.migration.pendingDropsFor");
-    if (nextDrop != null) {
-      return nextDrop;
-    }
-    return migrationConfig.getGeneratePendingDrop();
-  }
-
-  /**
-   * Return the full version for the migration being generated.
-   * <p>
-   * The full version can contain a comment suffix after a "__" double underscore.
-   */
-  private String getFullVersion(MigrationModel migrationModel, String dropsFor) {
-
-    String version = migrationConfig.getVersion();
-    if (version == null) {
-      version = migrationModel.getNextVersion(initialVersion);
-    }
-
-    String fullVersion = migrationConfig.getApplyPrefix() + version;
-    if (migrationConfig.getName() != null) {
-      fullVersion += "__" + toUnderScore(migrationConfig.getName());
-
-    } else if (dropsFor != null) {
-      fullVersion += "__" + toUnderScore("dropsFor_" + MigrationVersion.trim(dropsFor));
-
-    } else if (version.equals(initialVersion)) {
-      fullVersion += "__initial";
-    }
-    return fullVersion;
-  }
-
-  /**
-   * Replace spaces with underscores.
-   */
-  private String toUnderScore(String name) {
-    return name.replace(' ', '_');
-  }
-
-  /**
-   * Write any extra platform ddl.
-   */
-  protected void writeExtraPlatformDdl(String fullVersion, CurrentModel currentModel, Migration dbMigration, File writePath) throws IOException {
-
-    for (Pair pair : platforms) {
-      DdlWrite platformBuffer = new DdlWrite(new MConfiguration(), currentModel.read());
-      PlatformDdlWriter platformWriter = createDdlWriter(pair.platform);
-      File subPath = platformWriter.subPath(writePath, pair.prefix);
-      platformWriter.processMigration(dbMigration, platformBuffer, subPath, fullVersion);
-
-      generateExtraDdl(subPath, pair.platform);
-    }
-  }
-
-  private PlatformDdlWriter createDdlWriter(DatabasePlatform platform) {
-    return new PlatformDdlWriter(platform, serverConfig, migrationConfig);
-  }
-
-  /**
-   * Write the migration xml.
-   */
-  protected boolean writeMigrationXml(Migration dbMigration, File resourcePath, String fullVersion) {
-
-    String modelFile = fullVersion + migrationConfig.getModelSuffix();
-    File file = new File(resourcePath, modelFile);
-    if (file.exists()) {
-      return false;
-    }
-    String comment = migrationConfig.isIncludeGeneratedFileComment() ? GENERATED_COMMENT : null;
-    MigrationXmlWriter xmlWriter = new MigrationXmlWriter(comment);
-    xmlWriter.write(dbMigration, file);
-    return true;
-  }
-
-  /**
-   * Set default server and platform if necessary.
-   */
-  protected void setDefaults() {
-    if (server == null) {
-      setServer(Ebean.getDefaultServer());
-    }
-    if (databasePlatform == null && platforms.isEmpty()) {
-      // not explicitly set not set a list of platforms so
-      // default to the platform of the default server
-      databasePlatform = server.getDatabasePlatform();
-      logger.debug("set platform to {}", databasePlatform.getName());
-    }
-  }
-
-  /**
-   * Return the file path to write the xml and sql to.
-   */
-  protected File getMigrationDirectory() {
-
-    // path to src/main/resources in typical maven project
-    File resourceRootDir = new File(pathToResources);
-    String resourcePath = migrationConfig.getMigrationPath();
-
-    // expect to be a path to something like - src/main/resources/dbmigration/model
-    File path = new File(resourceRootDir, resourcePath);
-    if (!path.exists()) {
-      if (!path.mkdirs()) {
-        logger.debug("Unable to ensure migration directory exists at {}", path.getAbsolutePath());
-      }
-    }
-    return path;
-  }
-
-  /**
-   * Return the model directory (relative to the migration directory).
-   */
-  protected File getModelDirectory(File migrationDirectory) {
-    String modelPath = migrationConfig.getModelPath();
-    if (modelPath == null || modelPath.isEmpty()) {
-      return migrationDirectory;
-    }
-    File modelDir = new File(migrationDirectory, migrationConfig.getModelPath());
-    if (!modelDir.exists() && !modelDir.mkdirs()) {
-      logger.debug("Unable to ensure migration model directory exists at {}", modelDir.getAbsolutePath());
-    }
-    return modelDir;
-  }
-
-  /**
-   * Return the DatabasePlatform given the platform key.
-   */
-  protected DatabasePlatform getPlatform(Platform platform) {
-    switch (platform) {
-      case H2:
-        return new H2Platform();
-      case HSQLDB:
-        return new HsqldbPlatform();
-      case POSTGRES:
-        return new PostgresPlatform();
-      case MYSQL:
-        return new MySqlPlatform();
-      case ORACLE:
-        return new OraclePlatform();
-      case SQLANYWHERE:
-        return new SqlAnywherePlatform();
-      case SQLSERVER:
-        return new SqlServerPlatform();
-      case DB2:
-        return new DB2Platform();
-      case SQLITE:
-        return new SQLitePlatform();
-      case GENERIC:
-        return new DatabasePlatform();
-        
-      default:
-        throw new IllegalArgumentException("Platform missing? " + platform);
-    }
-  }
-
-  /**
-   * Holds a platform and prefix. Used to generate multiple platform specific DDL
-   * for a single migration.
-   */
-  public static class Pair {
-
-    /**
-     * The platform to generate the DDL for.
-     */
-    public final DatabasePlatform platform;
-
-    /**
-     * A prefix included into the file/resource names indicating the platform.
-     */
-    public final String prefix;
-
-    public Pair(DatabasePlatform platform, String prefix) {
-      this.platform = platform;
-      this.prefix = prefix;
-    }
-  }
-
+  String generateMigration() throws IOException;
 }

src/main/java/io/ebean/dbmigration/package-info.java

@@ -1,8 +1,4 @@
 /**
- * Generation DDL migration scripts based on changes to the model.
- * <p>
- * You can use <code>DbMigration</code> to compare the entity bean model to its prior state
- * and generate DDL for the differences - adding tables, columns etc.
- * </p>
+ * Generates DDL migration scripts based on changes to the model.
  */
 package io.ebean.dbmigration;

src/main/java/io/ebean/event/changelog/BeanChange.java

@@ -1,9 +1,5 @@
 package io.ebean.event.changelog;
 
-import io.ebean.ValuePair;
-
-import java.util.Map;
-
 /**
  * A bean insert, update or delete change sent as part of a ChangeSet.
  */
@@ -12,68 +8,68 @@ public class BeanChange {
   /**
    * The underling base table name.
    */
-  String table;
+  private final String type;
 
   /**
    * The tenantId value.
    */
-  Object tenantId;
-  
+  private final Object tenantId;
+
   /**
    * The id value.
    */
-  Object id;
+  private final Object id;
 
   /**
    * The INSERT, UPDATE or DELETE change type.
    */
-  ChangeType type;
+  private final ChangeType event;
 
   /**
    * The time the bean change was created.
    */
-  long eventTime;
+  private final long eventTime;
 
   /**
-   * The values for insert or update. Note that null values are not included for insert.
+   * The change in JSON form.
    */
-  Map<String, ValuePair> values;
+  private final String data;
 
   /**
-   * Construct with all the details.
+   * The change in JSON form.
    */
-  public BeanChange(String table, Object tenantId, Object id, ChangeType type, Map<String, ValuePair> values) {
-    this.table = table;
+  private final String oldData;
+
+  /**
+   * Construct with change as JSON.
+   */
+  public BeanChange(String type, Object tenantId, Object id, ChangeType event, String data, String oldData) {
+    this.type = type;
     this.tenantId = tenantId;
     this.id = id;
-    this.type = type;
+    this.event = event;
     this.eventTime = System.currentTimeMillis();
-    this.values = values;
+    this.data = data;
+    this.oldData = oldData;
   }
 
   /**
-   * Default constructor for JSON tools.
+   * Construct with change as JSON.
    */
-  public BeanChange() {
+  public BeanChange(String table, Object tenantId, Object id, ChangeType event, String data) {
+    this(table, tenantId , id , event , data , null);
   }
 
   @Override
   public String toString() {
-    return "table:" + table + " tenantId: " + tenantId + " id:" + id + " values:" + values;
+    return "type:" + type + " tenantId: " + tenantId + " id:" + id + " data:" + data;
   }
 
   /**
    * Return the object type (typically table name).
    */
-  public String getTable() {
-    return table;
-  }
-
-  /**
-   * Set the object type (for JSON tools).
-   */
-  public void setTable(String table) {
-    this.table = table;
+  public String getType() {
+    return type;
   }
 
   /**
@@ -83,13 +79,6 @@ public class BeanChange {
     return tenantId;
   }
 
-  /**
-   * Set the bean id (for JSON tools).
-   */
-  public void setTenantId(Object tenantId) {
-    this.tenantId = tenantId;
-  }
-  
   /**
    * Return the object id.
    */
@@ -97,25 +86,11 @@ public class BeanChange {
     return id;
   }
 
-  /**
-   * Set the bean id (for JSON tools).
-   */
-  public void setId(Object id) {
-    this.id = id;
-  }
-
   /**
    * Return the change type (INSERT, UPDATE or DELETE).
    */
-  public ChangeType getType() {
-    return type;
-  }
-
-  /**
-   * Set the type (for JSON tools).
-   */
-  public void setType(ChangeType type) {
-    this.type = type;
+  public ChangeType getEvent() {
+    return event;
   }
 
   /**
@@ -126,23 +101,16 @@ public class BeanChange {
   }
 
   /**
-   * Set the event time in epoch millis.
+   * Return the change data in JSON form.
    */
-  public void setEventTime(long eventTime) {
-    this.eventTime = eventTime;
+  public String getData() {
+    return data;
   }
 
   /**
-   * Return the value pairs. For inserts the ValuePair oldValue is always null.
+   * Return the old data in JSON form.
    */
-  public Map<String, ValuePair> getValues() {
-    return values;
-  }
-
-  /**
-   * Set the value pairs (for JSON tools).
-   */
-  public void setValues(Map<String, ValuePair> values) {
-    this.values = values;
+  public String getOldData() {
+    return oldData;
   }
 }

src/main/java/io/ebean/plugin/BeanType.java

@@ -1,11 +1,11 @@
 package io.ebean.plugin;
 
+import io.ebean.Query;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanPersistController;
 import io.ebean.event.BeanPersistListener;
 import io.ebean.event.BeanQueryAdapter;
-import io.ebeaninternal.api.SpiQuery;
 import io.ebeanservice.docstore.api.mapping.DocumentMapping;
 
 import java.util.Collection;
@@ -180,7 +180,7 @@ public interface BeanType<T> {
   /**
    * Add the discriminator value to the query if needed.
    */
-  void addInheritanceWhere(SpiQuery<?> query);
+  void addInheritanceWhere(Query<?> query);
 
   /**
    * Return the root bean type for an inheritance hierarchy.

src/main/java/io/ebean/service/SpiContainer.java

@@ -1,4 +1,4 @@
-package io.ebean.common;
+package io.ebean.service;
 
 import io.ebean.EbeanServer;
 import io.ebean.config.ServerConfig;

src/main/java/io/ebean/service/SpiContainerFactory.java

@@ -0,0 +1,14 @@
+package io.ebean.service;
+
+import io.ebean.config.ContainerConfig;
+
+/**
+ * Provides shutdown of the entire container.
+ */
+public interface SpiContainerFactory {
+
+  /**
+   * Create the Container that builds EbeanServer instances.
+   */
+  SpiContainer create(ContainerConfig containerConfig);
+}

src/main/java/io/ebean/service/SpiJsonService.java

@@ -0,0 +1,125 @@
+package io.ebean.service;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * JSON service that Ebean is expected to provide.
+ *
+ * Supports converting between JSON content and simple java Maps/Lists.
+ */
+public interface SpiJsonService {
+
+  /**
+   * Write the nested Map/List as json.
+   */
+  String write(Object object) throws IOException;
+
+  /**
+   * Write the nested Map/List as json to the writer.
+   */
+  void write(Object object, Writer writer) throws IOException;
+
+  /**
+   * Write the nested Map/List as json to the jsonGenerator.
+   */
+  void write(Object object, JsonGenerator jsonGenerator) throws IOException;
+
+  /**
+   * Write the collection as json array to the jsonGenerator.
+   */
+  void writeCollection(Collection<Object> collection, JsonGenerator jsonGenerator) throws IOException;
+
+  /**
+   * Parse the json and return as a Map additionally specifying if the returned map should
+   * be modify aware meaning that it can detect when it has been modified.
+   */
+  Map<String, Object> parseObject(String json, boolean modifyAware) throws IOException;
+
+  /**
+   * Parse the json and return as a Map.
+   */
+  Map<String, Object> parseObject(String json) throws IOException;
+
+  /**
+   * Parse the json and return as a Map taking a reader.
+   */
+  Map<String, Object> parseObject(Reader reader, boolean modifyAware) throws IOException;
+
+  /**
+   * Parse the json and return as a Map taking a reader.
+   */
+  Map<String, Object> parseObject(Reader reader) throws IOException;
+
+  /**
+   * Parse the json and return as a Map taking a JsonParser.
+   */
+  Map<String, Object> parseObject(JsonParser parser) throws IOException;
+
+  /**
+   * Parse the json and return as a Map taking a JsonParser and a starting token.
+   * <p>
+   * Used when the first token is checked to see if the value is null prior to calling this.
+   * </p>
+   */
+  Map<String, Object> parseObject(JsonParser parser, JsonToken token) throws IOException;
+
+  /**
+   * Parse the json and return as a modify aware List.
+   */
+  <T> List<T> parseList(String json, boolean modifyAware) throws IOException;
+
+  /**
+   * Parse the json and return as a List.
+   */
+  List<Object> parseList(String json) throws IOException;
+
+  /**
+   * Parse the json and return as a List taking a Reader.
+   */
+  List<Object> parseList(Reader reader) throws IOException;
+
+  /**
+   * Parse the json and return as a List taking a JsonParser.
+   */
+  List<Object> parseList(JsonParser parser) throws IOException;
+
+  /**
+   * Parse the json returning as a List taking into account the current token.
+   */
+  <T> List<T> parseList(JsonParser parser, JsonToken currentToken) throws IOException;
+
+  /**
+   * Parse the json and return as a List or Map.
+   */
+  Object parse(String json) throws IOException;
+
+  /**
+   * Parse the json and return as a List or Map.
+   */
+  Object parse(Reader reader) throws IOException;
+
+  /**
+   * Parse the json and return as a List or Map.
+   */
+  Object parse(JsonParser parser) throws IOException;
+
+  /**
+   * Parse the json returning a Set that might be modify aware.
+   */
+  <T> Set<T> parseSet(String json, boolean modifyAware) throws IOException;
+
+  /**
+   * Parse the json returning as a Set taking into account the current token.
+   */
+  <T> Set<T> parseSet(JsonParser parser, JsonToken currentToken) throws IOException;
+}

src/main/java/io/ebean/service/SpiRawSqlService.java

@@ -0,0 +1,27 @@
+package io.ebean.service;
+
+import io.ebean.RawSql;
+import io.ebean.RawSqlBuilder;
+
+import java.sql.ResultSet;
+
+/**
+ * Service provided by Ebean for parsing and column mapping raw SQL queries.
+ */
+public interface SpiRawSqlService {
+
+  /**
+   * Create based on a JDBC ResultSet.
+   */
+  RawSql resultSet(ResultSet resultSet, String... propertyNames);
+
+  /**
+   * Parse the SQL determining column mapping.
+   */
+  RawSqlBuilder parsed(String sql);
+
+  /**
+   * Unparsed SQL so explicit column mapping expected.
+   */
+  RawSqlBuilder unparsed(String sql);
+}

src/main/java/io/ebean/text/PathProperties.java

@@ -2,7 +2,7 @@ package io.ebean.text;
 
 import io.ebean.FetchPath;
 import io.ebean.Query;
-import io.ebeaninternal.server.query.SplitName;
+import io.ebean.util.SplitName;
 
 import java.util.Collection;
 import java.util.Iterator;

src/main/java/io/ebean/text/json/EJson.java

@@ -1,17 +1,18 @@
 package io.ebean.text.json;
 
-import io.ebeaninternal.server.type.ModifyAwareList;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
+import io.ebean.service.SpiJsonService;
 
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
 import java.util.Collection;
-import java.util.LinkedHashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.ServiceLoader;
 import java.util.Set;
 
 /**
@@ -19,32 +20,43 @@ import java.util.Set;
  */
 public class EJson {
 
+  private static SpiJsonService plugin = init();
+
+  private static SpiJsonService init() {
+
+    Iterator<SpiJsonService> loader = ServiceLoader.load(SpiJsonService.class).iterator();
+    if (loader.hasNext()) {
+      return loader.next();
+    }
+    throw new IllegalStateException("No service implementation found for SpiJsonService?");
+  }
+
   /**
    * Write the nested Map/List as json.
    */
   public static String write(Object object) throws IOException {
-    return EJsonWriter.write(object);
+    return plugin.write(object);
   }
 
   /**
    * Write the nested Map/List as json to the writer.
    */
   public static void write(Object object, Writer writer) throws IOException {
-    EJsonWriter.write(object, writer);
+    plugin.write(object, writer);
   }
 
   /**
    * Write the nested Map/List as json to the jsonGenerator.
    */
   public static void write(Object object, JsonGenerator jsonGenerator) throws IOException {
-    EJsonWriter.write(object, jsonGenerator);
+    plugin.write(object, jsonGenerator);
   }
 
   /**
    * Write the collection as json array to the jsonGenerator.
    */
   public static void writeCollection(Collection<Object> collection, JsonGenerator jsonGenerator) throws IOException {
-    EJsonWriter.writeCollection(collection, jsonGenerator);
+    plugin.writeCollection(collection, jsonGenerator);
   }
 
   /**
@@ -52,35 +64,35 @@ public class EJson {
    * be modify aware meaning that it can detect when it has been modified.
    */
   public static Map<String, Object> parseObject(String json, boolean modifyAware) throws IOException {
-    return EJsonReader.parseObject(json, modifyAware);
+    return plugin.parseObject(json, modifyAware);
   }
 
   /**
    * Parse the json and return as a Map.
    */
   public static Map<String, Object> parseObject(String json) throws IOException {
-    return EJsonReader.parseObject(json);
+    return plugin.parseObject(json);
   }
 
   /**
    * Parse the json and return as a Map taking a reader.
    */
   public static Map<String, Object> parseObject(Reader reader, boolean modifyAware) throws IOException {
-    return EJsonReader.parseObject(reader, modifyAware);
+    return plugin.parseObject(reader, modifyAware);
   }
 
   /**
    * Parse the json and return as a Map taking a reader.
    */
   public static Map<String, Object> parseObject(Reader reader) throws IOException {
-    return EJsonReader.parseObject(reader);
+    return plugin.parseObject(reader);
   }
 
   /**
    * Parse the json and return as a Map taking a JsonParser.
    */
   public static Map<String, Object> parseObject(JsonParser parser) throws IOException {
-    return EJsonReader.parseObject(parser);
+    return plugin.parseObject(parser);
   }
 
   /**
@@ -90,86 +102,77 @@ public class EJson {
    * </p>
    */
   public static Map<String, Object> parseObject(JsonParser parser, JsonToken token) throws IOException {
-    return EJsonReader.parseObject(parser, token);
+    return plugin.parseObject(parser, token);
   }
 
   /**
    * Parse the json and return as a modify aware List.
    */
-  public static List<Object> parseList(String json, boolean modifyAware) throws IOException {
-    return EJsonReader.parseList(json, modifyAware);
+  public static <T> List<T> parseList(String json, boolean modifyAware) throws IOException {
+    return plugin.parseList(json, modifyAware);
   }
 
   /**
    * Parse the json and return as a List.
    */
   public static List<Object> parseList(String json) throws IOException {
-    return EJsonReader.parseList(json);
+    return plugin.parseList(json);
   }
 
   /**
    * Parse the json and return as a List taking a Reader.
    */
   public static List<Object> parseList(Reader reader) throws IOException {
-    return EJsonReader.parseList(reader);
+    return plugin.parseList(reader);
   }
 
   /**
    * Parse the json and return as a List taking a JsonParser.
    */
   public static List<Object> parseList(JsonParser parser) throws IOException {
-    return EJsonReader.parseList(parser, false);
+    return plugin.parseList(parser);
   }
 
   /**
    * Parse the json returning as a List taking into account the current token.
    */
   @SuppressWarnings("unchecked")
-  public static List<Object> parseList(JsonParser parser, JsonToken currentToken) throws IOException {
-    return (List<Object>) EJsonReader.parse(parser, currentToken, false);
+  public static <T> List<T> parseList(JsonParser parser, JsonToken currentToken) throws IOException {
+    return plugin.parseList(parser, currentToken);
   }
 
   /**
    * Parse the json and return as a List or Map.
    */
   public static Object parse(String json) throws IOException {
-    return EJsonReader.parse(json);
+    return plugin.parse(json);
   }
 
   /**
    * Parse the json and return as a List or Map.
    */
   public static Object parse(Reader reader) throws IOException {
-    return EJsonReader.parse(reader);
+    return plugin.parse(reader);
   }
 
   /**
    * Parse the json and return as a List or Map.
    */
   public static Object parse(JsonParser parser) throws IOException {
-    return EJsonReader.parse(parser);
+    return plugin.parse(parser);
   }
 
   /**
    * Parse the json returning a Set that might be modify aware.
    */
-  public static Set parseSet(String json, boolean modifyAware) throws IOException {
-    List<Object> list = parseList(json, modifyAware);
-    if (list == null) {
-      return null;
-    }
-
-    if (modifyAware) {
-      return ((ModifyAwareList) list).asSet();
-    } else {
-      return new LinkedHashSet<>(list);
-    }
+  public static <T> Set<T> parseSet(String json, boolean modifyAware) throws IOException {
+    return plugin.parseSet(json, modifyAware);
   }
 
   /**
    * Parse the json returning as a Set taking into account the current token.
    */
-  public static Set<Object> parseSet(JsonParser parser, JsonToken currentToken) throws IOException {
-    return new LinkedHashSet<>(parseList(parser, currentToken));
+  public static <T> Set<T> parseSet(JsonParser parser, JsonToken currentToken) throws IOException {
+    return plugin.parseSet(parser, currentToken);
   }
 }

src/main/java/io/ebean/util/AnnotationUtil.java

@@ -0,0 +1,270 @@
+package io.ebean.util;
+
+import io.ebean.annotation.Formula;
+import io.ebean.annotation.Platform;
+import io.ebean.annotation.Where;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * Annotation utility methods to find annotations recursively - taken from the spring framework.
+ */
+public class AnnotationUtil {
+
+  /**
+   * Determine if the supplied {@link Annotation} is defined in the core JDK {@code java.lang.annotation} package.
+   */
+  public static boolean isInJavaLangAnnotationPackage(Annotation annotation) {
+    return annotation.annotationType().getName().startsWith("java.lang.annotation");
+  }
+
+  /**
+   * Find a single {@link Annotation} of {@code annotationType} on the supplied {@link AnnotatedElement}.
+   * <p>
+   * Meta-annotations will be searched if the annotation is not <em>directly present</em> on the supplied element.
+   * <p>
+   * <strong>Warning</strong>: this method operates generically on annotated elements. In other words, this method
+   * does not execute specialized search algorithms for classes or methods. It only traverses through Annotations!
+   * It also does not filter out platform dependent annotations!
+   */
+  public static <A extends Annotation> A findAnnotation(AnnotatedElement annotatedElement, Class<A> annotationType) {
+    if (annotationType == null) {
+      return null;
+    }
+    // check if directly present, if not, start search for meta-annotations.
+    A ann = annotatedElement.getAnnotation(annotationType);
+    if (ann != null) {
+      return ann;
+    } else {
+      return findAnnotation(annotatedElement, annotationType, new HashSet<>());
+    }
+  }
+
+  /**
+   * Find a single {@link Annotation} of {@code annotationType} on the supplied class.
+   * <p>Meta-annotations will be searched if the annotation is not directly present on
+   * the supplied element.
+   * <p><strong>Note</strong>: this method searches for annotations at class & superClass(es)!
+   */
+  public static <A extends Annotation> A findAnnotationRecursive(Class<?> clazz, Class<A> annotationType) {
+    if (annotationType == null) {
+      return null;
+    }
+    // check if directly present, if not, start search for meta-annotations.
+    A ann = clazz.getAnnotation(annotationType);
+    if (ann != null) {
+      return ann;
+    } else {
+      while (clazz != null && clazz != Object.class) {
+        ann = findAnnotation(clazz, annotationType, new HashSet<>());
+        if (ann != null) {
+          return ann;
+        }
+        // no meta-annotation present at this class - traverse to superclass
+        clazz = clazz.getSuperclass();
+      }
+      return null;
+    }
+  }
+
+  /**
+   * Finds the first annotation of a type for this platform. (if annotation is platform specific, otherwise first
+   * found annotation is returned)
+   */
+  public static <A extends Annotation> A findAnnotation(AnnotatedElement annotatedElement, Class<A> annotationType, Platform platform) {
+    if (annotationType == null) {
+      return null;
+    }
+    Set<A> anns = findAnnotations(annotatedElement, annotationType);
+    return getPlatformMatchingAnnotation(anns, platform);
+  }
+
+  /**
+   * Finds all annotations recusively for a class and its superclasses.
+   */
+  public static <A extends Annotation> Set<A> findAnnotationsRecursive(Class<?> clazz, Class<A> annotationType) {
+    if (annotationType == null) {
+      return null;
+    }
+    Set<A> ret = new LinkedHashSet<>();
+    Set<Annotation> visited = new HashSet<>();
+    while (clazz != null && clazz != Object.class) {
+      findMetaAnnotations(clazz, annotationType, ret, visited);
+      clazz = clazz.getSuperclass();
+    }
+    return ret;
+  }
+
+  /**
+   * Perform the search algorithm avoiding endless recursion by tracking which
+   * annotations have already been visited.
+   */
+  @SuppressWarnings("unchecked")
+  private static <A extends Annotation> A findAnnotation(AnnotatedElement annotatedElement, Class<A> annotationType, Set<Annotation> visited) {
+
+    Annotation[] anns = annotatedElement.getAnnotations(); // directly annotatated or inherited
+    for (Annotation ann : anns) {
+      if (ann.annotationType() == annotationType) {
+        return (A) ann;
+      }
+    }
+    for (Annotation ann : anns) {
+      if (!isInJavaLangAnnotationPackage(ann) && visited.add(ann)) {
+        A annotation = findAnnotation(ann.annotationType(), annotationType, visited);
+        if (annotation != null) {
+          return annotation;
+        }
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Find all {@link Annotation}s of {@code annotationType} on the supplied {@link AnnotatedElement}.
+   * <p>
+   * Meta-annotations will be searched if the annotation is not <em>directly present</em> on the supplied element.
+   * <p>
+   * <strong>Warning</strong>: this method operates generically on annotated elements. In other words, this method
+   * does not execute specialized search algorithms for classes or methods. It only traverses through Annotations!
+   */
+  public static <A extends Annotation> Set<A> findAnnotations(AnnotatedElement annotatedElement, Class<A> annotationType) {
+    if (annotationType == null) {
+      return null;
+    }
+    Set<A> ret = new LinkedHashSet<>();
+    findMetaAnnotations(annotatedElement, annotationType, ret, new HashSet<>());
+    return ret;
+  }
+
+  /**
+   * Perform the search algorithm avoiding endless recursion by tracking which
+   * annotations have already been visited.
+   */
+  @SuppressWarnings("unchecked")
+  private static <A extends Annotation> void findMetaAnnotations(AnnotatedElement annotatedElement, Class<A> annotationType, Set<A> ret, Set<Annotation> visited) {
+
+    Annotation[] anns = annotatedElement.getAnnotations();
+    for (Annotation ann : anns) {
+      if (!isInJavaLangAnnotationPackage(ann) && visited.add(ann)) {
+        if (ann.annotationType() == annotationType) {
+          ret.add((A) ann);
+        } else {
+          Method repeatableValueMethod = getRepeatableValueMethod(ann, annotationType);
+          if (repeatableValueMethod != null) {
+            try {
+              A[] repeatedAnns = (A[]) repeatableValueMethod.invoke(ann);
+              for (Annotation repeatedAnn : repeatedAnns) {
+                ret.add((A) repeatedAnn);
+                findMetaAnnotations(repeatedAnn.annotationType(), annotationType, ret, visited);
+              }
+            } catch (Exception e) { // catch all exceptions (thrown by invoke)
+              throw new RuntimeException(e);
+            }
+          } else {
+            findMetaAnnotations(ann.annotationType(), annotationType, ret, visited);
+          }
+        }
+      }
+    }
+  }
+
+  // caches for getRepeatableValueMethod
+  private static Method getNullMethod() {
+    try {
+      return AnnotationUtil.class.getDeclaredMethod("getNullMethod");
+    } catch (NoSuchMethodException e) {
+      return null;
+    }
+  }
+
+  private static final ConcurrentMap<Annotation, Method> valueMethods = new ConcurrentHashMap<>();
+  // only a non-null-marker the valueMethods - Cache
+  private static final Method nullMethod = getNullMethod();
+
+
+  /**
+   * Returns the <code>value()</code> method for a possible containerAnnotation.
+   * Method is retuned only, if its signature is <code>array of containingType</code>.
+   */
+  private static <A extends Annotation> Method getRepeatableValueMethod(
+    Annotation containerAnnotation, Class<A> containingType) {
+
+    Method method = valueMethods.get(containerAnnotation);
+    if (method == null) {
+      try {
+        method = containerAnnotation.annotationType().getMethod("value");
+      } catch (NoSuchMethodException e) {
+        method = nullMethod;
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      }
+      Method prev = valueMethods.putIfAbsent(containerAnnotation, method);
+      method = prev == null ? method : prev;
+    }
+    if (method != nullMethod) {
+      Class<?> retType = method.getReturnType();
+      if (retType.isArray() && retType.getComponentType() == containingType) {
+        return method;
+      }
+    }
+    return null;
+  }
+
+
+  /**
+   * Finds a suitable annotation from <code>Set<T> anns</code> for this platform.
+   * To distinguish between platforms, annotation type <code>T</code> must define
+   * a method withthis signature:
+   * <p>
+   * <code>Class<? extends DatabasePlatform>[] platforms() default {};</code>
+   * </p>
+   * The finding rules are:
+   * <ol>
+   * <li>Check if T has method "platforms" if not, return <code>ann[0]</code></code>
+   * <li>find the annotation that is defined for <code>databasePlatform</code></li>
+   * <li>otherwise return the annotation for default platform (platforms = {})</li>
+   * <li>return null
+   * </ol>
+   * (This mechanism is currently used by {@link Where} and {@link Formula})
+   */
+  public static <T extends Annotation> T getPlatformMatchingAnnotation(Set<T> anns, Platform matchPlatform) {
+    if (anns.isEmpty()) {
+      return null;
+    }
+    Method getPlatformsMethod = null;
+    T fallback = null;
+    for (T ann : anns) {
+      try {
+        if (getPlatformsMethod == null) {
+          getPlatformsMethod = ann.getClass().getMethod("platforms");
+        }
+        if (!Platform[].class.isAssignableFrom(getPlatformsMethod.getReturnType())) {
+          return ann;
+        }
+        Platform[] platforms = (Platform[]) getPlatformsMethod.invoke(ann);
+        if (platforms.length == 0) {
+          fallback = ann;
+        } else {
+          for (Platform platform : platforms) {
+            if (matchPlatform == platform) {
+              return ann;
+            }
+          }
+        }
+      } catch (NoSuchMethodException e) {
+        return ann; // not platform specific - return first one
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      }
+    }
+    return fallback;
+  }
+
+}

src/main/java/io/ebean/util/ClassUtil.java

@@ -1,47 +0,0 @@
-package io.ebean.util;
-
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Arrays;
-
-/**
- * Helper to find classes taking into account the context class loader.
- */
-public class ClassUtil {
-
-  /**
-   * Returns the raw type for the 2nd generic parameter for a subclass.
-   */
-  public static Class<?> getSecondArgumentType(Class<?> subclass) {
-    Type[] typeArguments = getSuperclassTypeParameter(subclass);
-    if (typeArguments.length != 2) {
-      throw new IllegalArgumentException("Expected type with 2 generic argument types but got "
-        + typeArguments.length + " - " + Arrays.toString(typeArguments));
-    }
-
-    return getRawType(typeArguments[1]);
-  }
-
-  static Type[] getSuperclassTypeParameter(Class<?> subclass) {
-    Type superclass = subclass.getGenericSuperclass();
-    if (superclass instanceof Class) {
-      throw new RuntimeException("Missing generics type parameters on subclass " + subclass);
-    }
-    return ((ParameterizedType) superclass).getActualTypeArguments();
-  }
-
-  private static Class<?> getRawType(Type type) {
-
-    if (type instanceof Class<?>) {
-      return (Class<?>) type;
-
-    } else if (type instanceof ParameterizedType) {
-      ParameterizedType parameterizedType = (ParameterizedType) type;
-      Type rawType = parameterizedType.getRawType();
-      if (rawType instanceof Class<?>) {
-        return (Class<?>) rawType;
-      }
-    }
-    throw new RuntimeException("Unable to obtain raw class type from " + type);
-  }
-}

src/main/java/io/ebean/util/SplitName.java

@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.query;
+package io.ebean.util;
 
 /**
  * Helper for dot notation property paths.

src/main/java/io/ebean/util/StringHelper.java

@@ -13,9 +13,9 @@ public class StringHelper {
   private static final char SINGLE_QUOTE = '\'';
 
   private static final char DOUBLE_QUOTE = '"';
-  
+
   private static final Pattern SPLIT_NAMES = Pattern.compile("[\\s,;]+");
-  
+
   private static final String[] EMPTY_STRING_ARRAY = new String[0];
 
   /**
@@ -270,66 +270,6 @@ public class StringHelper {
     }
   }
 
-  /**
-   * This returns the FIRST string in str that is bounded on the left by
-   * leftBound, and bounded on the right by rightBound. This will return null if
-   * the leftBound is not found within str.
-   * <p>
-   * If leftBound can't be found this returns null.
-   * <p>
-   * This rightBound can't be found then this throws a
-   * StringIndexOutOfBoundsException.
-   *
-   * @param str        the base string that we will search for the bounded string.
-   * @param leftBound  the left bound of the string.
-   * @param rightBound the right bound of the string.
-   */
-  public static String getBoundedString(String str, String leftBound, String rightBound)
-    throws RuntimeException {
-
-    if (str == null) {
-      throw new RuntimeException("string to parse is null?");
-    }
-    int startPos = str.indexOf(leftBound);
-    if (startPos > -1) {
-      startPos += leftBound.length();
-      int endPos = str.indexOf(rightBound, startPos);
-      // dp(str+" start:"+startPos+" end:"+endPos);
-      if (endPos == -1) {
-        throw new RuntimeException("Can't find rightBound: " + rightBound);
-      }
-      return str.substring(startPos, endPos);
-    } else {
-      // if no leftBound can be found.. return null... could be in a
-      // search n parse type loop?
-      // this keeps "no tag"==null different from "tag not formed
-      // properly"==StringParsingException
-      return null;
-    }
-  }
-
-  /**
-   * Takes the String bounded by leftBound & rightBound, and replaces it with
-   * replaceString. Actually removes the left and right bound strings aswell.
-   */
-  public static String setBoundedString(String str, String leftBound, String rightBound,
-                                        String replaceString) {
-
-    int startPos = str.indexOf(leftBound);
-    if (startPos > -1) {
-      // startPos = startPos;
-      int endPos = str.indexOf(rightBound, startPos + leftBound.length());
-      if (endPos > -1) {
-        String toReplace = str.substring(startPos, endPos + 1);
-        return replaceString(str, toReplace, replaceString);
-      } else {
-        return str;
-      }
-    } else {
-      return str;
-    }
-  }
-
   /**
    * This method takes a String and will replace all occurrences of the match
    * String with that of the replace String.
@@ -512,51 +452,6 @@ public class StringHelper {
     return sb.toString();
   }
 
-  /**
-   * This method takes a String as an argument and removes all occurrences of
-   * the supplied Char. It returns the resulting String.
-   */
-  public static String removeChar(String s, char chr) {
-
-    StringBuilder sb = new StringBuilder(s.length());
-
-    for (int i = 0; i < s.length(); i++) {
-      char c = s.charAt(i);
-      if (c != chr) {
-        sb.append(c);
-      }
-    }
-
-    return sb.toString();
-  }
-
-  /**
-   * This method takes a String as an argument and removes all occurrences of
-   * the supplied Chars. It returns the resulting String.
-   */
-  public static String removeChars(String s, char[] chr) {
-
-    StringBuilder sb = new StringBuilder(s.length());
-
-    for (int i = 0; i < s.length(); i++) {
-      char c = s.charAt(i);
-      if (!charMatch(c, chr)) {
-        sb.append(c);
-      }
-    }
-
-    return sb.toString();
-  }
-
-  private static boolean charMatch(int iChr, char[] chr) {
-    for (char aChr : chr) {
-      if (iChr == aChr) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   /**
    * Splits at any whitespace "," or ";" and trims the result.
    * It does not return empty entries.

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

@@ -1,4 +1,4 @@
-package io.ebean.plugin;
+package io.ebeaninternal.api;
 
 import io.ebean.config.ServerConfig;
 import io.ebeaninternal.server.type.ScalarType;

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

@@ -3,7 +3,7 @@ package io.ebeaninternal.api;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.el.ElPropertyDeploy;
-import io.ebeaninternal.server.query.SplitName;
+import io.ebean.util.SplitName;
 import io.ebeaninternal.server.query.SqlJoinType;
 
 import java.io.Serializable;

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

@@ -1,7 +1,7 @@
 package io.ebeaninternal.api;
 
 import io.ebean.TxScope;
-import io.ebean.PersistBatch;
+import io.ebean.annotation.PersistBatch;
 
 import java.util.ArrayList;
 
@@ -53,6 +53,8 @@ public class ScopeTrans implements Thread.UncaughtExceptionHandler {
 
   private Boolean restoreBatchGeneratedKeys;
 
+  private boolean restoreBatchFlushOnQuery;
+
   /**
    * Flag set when a rollback has occurred.
    */
@@ -77,10 +79,14 @@ public class ScopeTrans implements Thread.UncaughtExceptionHandler {
         restoreBatchOnCascade = transaction.getBatchOnCascade();
         restoreBatchSize = transaction.getBatchSize();
         restoreBatchGeneratedKeys = transaction.getBatchGetGeneratedKeys();
+        restoreBatchFlushOnQuery = transaction.isBatchFlushOnQuery();
       }
       if (txScope.isBatchSet()) {
         transaction.setBatch(txScope.getBatch());
       }
+      if (!txScope.isFlushOnQuery()) {
+        transaction.setBatchFlushOnQuery(false);
+      }
       if (txScope.isBatchOnCascadeSet()) {
         transaction.setBatchOnCascade(txScope.getBatchOnCascade());
       }
@@ -158,6 +164,7 @@ public class ScopeTrans implements Thread.UncaughtExceptionHandler {
     if (created) {
       transaction.commit();
     } else {
+      transaction.setBatchFlushOnQuery(restoreBatchFlushOnQuery);
       if (restoreBatch != null) {
         transaction.setBatch(restoreBatch);
       }

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.api;
 
-import io.ebean.PersistBatch;
+import io.ebean.annotation.PersistBatch;
 import io.ebean.TransactionCallback;
 import io.ebean.annotation.DocStoreMode;
 import io.ebean.bean.PersistenceContext;

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

@@ -0,0 +1,18 @@
+package io.ebeaninternal.api;
+
+/**
+ * Plugin API available to invoke something prior to container bootup.
+ * <p>
+ * The initial intent is to provide a hook for 'docker-run' such that we can automatically ensure
+ * we have a test DB docker container running and setup ready to go.
+ * </p>
+ */
+public interface SpiContainerBootup {
+
+  /**
+   * Run something at bootup prior to the container starting.
+   *
+   * For example, start DB docker container(s).
+   */
+  void bootup();
+}

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;
@@ -25,6 +26,11 @@ import java.util.List;
  */
 public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionLoader {
 
+  /**
+   * Return the server extended Json context.
+   */
+  SpiJsonContext jsonExtended();
+
   /**
    * For internal use, shutdown of the server invoked by JVM Shutdown.
    */
@@ -200,4 +206,14 @@ public interface SpiEbeanServer extends EbeanServer, BeanLoader, BeanCollectionL
    * Return the DataTimeZone to use when reading/writing timestamps via JDBC.
    */
   DataTimeZone getDataTimeZone();
+
+  /**
+   * 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/api/SpiJsonContext.java

@@ -0,0 +1,24 @@
+package io.ebeaninternal.api;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import io.ebean.text.json.JsonContext;
+import io.ebean.text.json.JsonWriteOptions;
+import io.ebeaninternal.server.text.json.SpiJsonWriter;
+
+import java.io.Writer;
+
+/**
+ * Extended Json Context for internal server use.
+ */
+public interface SpiJsonContext extends JsonContext {
+
+  /**
+   * Create a Json Writer for writing beans as JSON.
+   */
+  SpiJsonWriter createJsonWriter(JsonGenerator gen, JsonWriteOptions options);
+
+  /**
+   * Create a Json Writer for writing beans as JSON supplying a writer.
+   */
+  SpiJsonWriter createJsonWriter(Writer writer);
+}

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

@@ -1,5 +1,6 @@
 package io.ebeaninternal.api;
 
+import io.ebean.CacheMode;
 import io.ebean.EbeanServer;
 import io.ebean.ExpressionList;
 import io.ebean.OrderBy;
@@ -19,6 +20,7 @@ import io.ebeaninternal.server.query.CancelableQuery;
 import io.ebeaninternal.server.querydefn.NaturalKeyBindParam;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
 import io.ebeaninternal.server.querydefn.OrmUpdateProperties;
+import io.ebeaninternal.server.rawsql.SpiRawSql;
 
 import java.sql.Timestamp;
 import java.util.List;
@@ -169,6 +171,11 @@ public interface SpiQuery<T> extends Query<T> {
    */
   BeanDescriptor<T> getBeanDescriptor();
 
+  /**
+   * Return the RawSql that was set to use for this query.
+   */
+  SpiRawSql getRawSql();
+
   /**
    * Return true if this query should be executed against the doc store.
    */
@@ -583,9 +590,9 @@ public interface SpiQuery<T> extends Query<T> {
   boolean isUseBeanCache();
 
   /**
-   * Return true if this query should use/check the query cache.
+   * Return the cache mode if this query should use/check the query cache.
    */
-  boolean isUseQueryCache();
+  CacheMode getUseQueryCache();
 
   /**
    * Return true if the beans from this query should be loaded into the bean

src/main/java/io/ebeaninternal/dbmigration/DbOffline.java

@@ -1,6 +1,6 @@
-package io.ebean.dbmigration;
+package io.ebeaninternal.dbmigration;
 
-import io.ebean.Platform;
+import io.ebean.annotation.Platform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java

@@ -1,8 +1,8 @@
-package io.ebean.dbmigration;
+package io.ebeaninternal.dbmigration;
 
 import io.ebean.Transaction;
 import io.ebean.config.ServerConfig;
-import io.ebean.dbmigration.model.CurrentModel;
+import io.ebeaninternal.dbmigration.model.CurrentModel;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
 import io.ebean.migration.ddl.DdlRunner;

src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java

@@ -0,0 +1,578 @@
+package io.ebeaninternal.dbmigration;
+
+import io.ebean.Ebean;
+import io.ebean.EbeanServer;
+import io.ebean.dbmigration.DbMigration;
+import io.ebean.config.DbConstraintNaming;
+import io.ebean.config.DbMigrationConfig;
+import io.ebean.annotation.Platform;
+import io.ebean.config.ServerConfig;
+import io.ebean.config.dbplatform.db2.DB2Platform;
+import io.ebean.config.dbplatform.DatabasePlatform;
+import io.ebean.config.dbplatform.h2.H2Platform;
+import io.ebean.config.dbplatform.hsqldb.HsqldbPlatform;
+import io.ebean.config.dbplatform.sqlserver.SqlServerPlatform;
+import io.ebean.config.dbplatform.mysql.MySqlPlatform;
+import io.ebean.config.dbplatform.oracle.OraclePlatform;
+import io.ebean.config.dbplatform.postgres.PostgresPlatform;
+import io.ebean.config.dbplatform.sqlanywhere.SqlAnywherePlatform;
+import io.ebean.config.dbplatform.sqlite.SQLitePlatform;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.migration.Migration;
+import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlWriter;
+import io.ebeaninternal.dbmigration.model.CurrentModel;
+import io.ebeaninternal.dbmigration.model.MConfiguration;
+import io.ebeaninternal.dbmigration.model.MigrationModel;
+import io.ebeaninternal.dbmigration.model.MigrationVersion;
+import io.ebeaninternal.dbmigration.model.ModelContainer;
+import io.ebeaninternal.dbmigration.model.ModelDiff;
+import io.ebeaninternal.dbmigration.model.PlatformDdlWriter;
+import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.extraddl.model.DdlScript;
+import io.ebeaninternal.extraddl.model.ExtraDdl;
+import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Generates DB Migration xml and sql scripts.
+ * <p>
+ * Reads the prior migrations and compares with the current model of the EbeanServer
+ * and generates a migration 'diff' in the form of xml document with the logical schema
+ * changes and a series of sql scripts to apply, rollback the applied changes if necessary
+ * and drop objects (drop tables, drop columns).
+ * </p>
+ * <p>
+ * This does not run the migration or ddl scripts but just generates them.
+ * </p>
+ * <pre>{@code
+ *
+ *       DefaultDbMigration migration = new DefaultDbMigration();
+ *       migration.setPathToResources("src/main/resources");
+ *       migration.setPlatform(DbPlatformName.ORACLE);
+ *
+ *       migration.generateMigration();
+ *
+ * }</pre>
+ */
+public class DefaultDbMigration implements DbMigration {
+
+  protected static final Logger logger = LoggerFactory.getLogger(DefaultDbMigration.class);
+
+  private static final String initialVersion = "1.0";
+
+  private static final String GENERATED_COMMENT = "THIS IS A GENERATED FILE - DO NOT MODIFY";
+
+  /**
+   * Set to true if DefaultDbMigration run with online EbeanServer instance.
+   */
+  protected final boolean online;
+
+  protected SpiEbeanServer server;
+
+  protected DbMigrationConfig migrationConfig;
+
+  protected String pathToResources = "src/main/resources";
+
+  protected DatabasePlatform databasePlatform;
+
+  protected List<Pair> platforms = new ArrayList<>();
+
+  protected ServerConfig serverConfig;
+
+  protected DbConstraintNaming constraintNaming;
+
+  /**
+   * Create for offline migration generation.
+   */
+  public DefaultDbMigration() {
+    this.online = false;
+  }
+
+  /**
+   * Create using online EbeanServer.
+   */
+  public DefaultDbMigration(EbeanServer server) {
+    this.online = true;
+    setServer(server);
+  }
+
+  /**
+   * Set the path from the current working directory to the application resources.
+   * <p>
+   * This defaults to maven style 'src/main/resources'.
+   */
+  @Override
+  public void setPathToResources(String pathToResources) {
+    this.pathToResources = pathToResources;
+  }
+
+  /**
+   * Set the server to use to determine the current model.
+   * Typically this is not called explicitly.
+   */
+  @Override
+  public void setServer(EbeanServer ebeanServer) {
+    this.server = (SpiEbeanServer) ebeanServer;
+    setServerConfig(server.getServerConfig());
+  }
+
+  /**
+   * Set the serverConfig to use. Typically this is not called explicitly.
+   */
+  @Override
+  public void setServerConfig(ServerConfig config) {
+    if (this.serverConfig == null) {
+      this.serverConfig = config;
+    }
+    if (migrationConfig == null) {
+      this.migrationConfig = serverConfig.getMigrationConfig();
+    }
+    if (constraintNaming == null) {
+      this.constraintNaming = serverConfig.getConstraintNaming();
+    }
+  }
+
+  /**
+   * Set the specific platform to generate DDL for.
+   * <p>
+   * If not set this defaults to the platform of the default server.
+   * </p>
+   */
+  @Override
+  public void setPlatform(Platform platform) {
+    setPlatform(getPlatform(platform));
+  }
+
+  /**
+   * Set the specific platform to generate DDL for.
+   * <p>
+   * If not set this defaults to the platform of the default server.
+   * </p>
+   */
+  @Override
+  public void setPlatform(DatabasePlatform databasePlatform) {
+    this.databasePlatform = databasePlatform;
+    if (!online) {
+      DbOffline.setPlatform(databasePlatform.getPlatform());
+    }
+  }
+
+  /**
+   * Add an additional platform to write the migration DDL.
+   * <p>
+   * Use this when you want to generate sql scripts for multiple database platforms
+   * from the migration (e.g. generate migration sql for MySql, Postgres and Oracle).
+   * </p>
+   */
+  @Override
+  public void addPlatform(Platform platform, String prefix) {
+    platforms.add(new Pair(getPlatform(platform), prefix));
+  }
+
+  /**
+   * Generate the next migration xml file and associated apply and rollback sql scripts.
+   * <p>
+   * This does not run the migration or ddl scripts but just generates them.
+   * </p>
+   * <h3>Example: Run for a single specific platform</h3>
+   * <pre>{@code
+   *
+   *       DefaultDbMigration migration = new DefaultDbMigration();
+   *       migration.setPathToResources("src/main/resources");
+   *       migration.setPlatform(DbPlatformName.ORACLE);
+   *
+   *       migration.generateMigration();
+   *
+   * }</pre>
+   * <p>
+   * <h3>Example: Run migration generating DDL for multiple platforms</h3>
+   * <pre>{@code
+   *
+   *       DefaultDbMigration migration = new DefaultDbMigration();
+   *       migration.setPathToResources("src/main/resources");
+   *
+   *       migration.addPlatform(DbPlatformName.POSTGRES, "pg");
+   *       migration.addPlatform(DbPlatformName.MYSQL, "mysql");
+   *       migration.addPlatform(DbPlatformName.ORACLE, "mysql");
+   *
+   *       migration.generateMigration();
+   *
+   * }</pre>
+   * @return the generated migration or null
+   */
+  @Override
+  public String generateMigration() throws IOException {
+
+    // use this flag to stop other plugins like full DDL generation
+    if (!online) {
+      DbOffline.setGenerateMigration();
+      if (databasePlatform == null && !platforms.isEmpty()) {
+        // for multiple platform generation set the general platform
+        // to H2 so that it runs offline without DB connection
+        setPlatform(platforms.get(0).platform);
+      }
+    }
+    setDefaults();
+    try {
+      Request request = createRequest();
+
+      if (platforms.isEmpty()) {
+        generateExtraDdl(request.migrationDir, databasePlatform);
+      }
+
+      String pendingVersion = generatePendingDrop();
+      if (pendingVersion != null) {
+        return generatePendingDrop(request, pendingVersion);
+      } else {
+        return generateDiff(request);
+      }
+
+    } finally {
+      if (!online) {
+        DbOffline.reset();
+      }
+    }
+  }
+
+  /**
+   * Generate "repeatable" migration scripts.
+   * <p>
+   * These take scrips from extra-dll.xml (typically views) and outputs "repeatable"
+   * migration scripts (starting with "R__") to be run by FlywayDb or Ebean's own
+   * migration runner.
+   * </p>
+   */
+  private void generateExtraDdl(File migrationDir, DatabasePlatform dbPlatform) throws IOException {
+
+    if (dbPlatform != null) {
+      ExtraDdl extraDdl = ExtraDdlXmlReader.read("/extra-ddl.xml");
+      if (extraDdl != null) {
+        List<DdlScript> ddlScript = extraDdl.getDdlScript();
+        for (DdlScript script : ddlScript) {
+          if (ExtraDdlXmlReader.matchPlatform(dbPlatform.getName(), script.getPlatforms())) {
+            writeExtraDdl(migrationDir, script);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Write (or override) the "repeatable" migration script.
+   */
+  private void writeExtraDdl(File migrationDir, DdlScript script) throws IOException {
+
+    String fullName = repeatableMigrationName(script.getName());
+
+    logger.info("writing repeatable script {}", fullName);
+
+    File file = new File(migrationDir, fullName);
+    try (FileWriter writer = new FileWriter(file)) {
+      writer.write(script.getValue());
+      writer.flush();
+    }
+  }
+
+  private String repeatableMigrationName(String scriptName) {
+    return "R__" + scriptName.replace(' ', '_') + migrationConfig.getApplySuffix();
+  }
+
+  /**
+   * Generate the diff migration.
+   */
+  private String generateDiff(Request request) throws IOException {
+
+    List<String> pendingDrops = request.getPendingDrops();
+    if (!pendingDrops.isEmpty()) {
+      logger.info("Pending un-applied drops in versions {}", pendingDrops);
+    }
+
+    Migration migration = request.createDiffMigration();
+    if (migration == null) {
+      logger.info("no changes detected - no migration written");
+      return null;
+    } else {
+      // there were actually changes to write
+      return generateMigration(request, migration, null);
+    }
+  }
+
+  /**
+   * Generate the migration based on the pendingDrops from a prior version.
+   */
+  private String generatePendingDrop(Request request, String pendingVersion) throws IOException {
+
+    Migration migration = request.migrationForPendingDrop(pendingVersion);
+
+    String version = generateMigration(request, migration, pendingVersion);
+
+    List<String> pendingDrops = request.getPendingDrops();
+    if (!pendingDrops.isEmpty()) {
+      logger.info("... remaining pending un-applied drops in versions {}", pendingDrops);
+    }
+    return version;
+  }
+
+  private Request createRequest() {
+    return new Request();
+  }
+
+  private class Request {
+
+    final File migrationDir;
+    final File modelDir;
+    final MigrationModel migrationModel;
+    final CurrentModel currentModel;
+    final ModelContainer migrated;
+    final ModelContainer current;
+
+    private Request() {
+      this.migrationDir = getMigrationDirectory();
+      this.modelDir = getModelDirectory(migrationDir);
+      this.migrationModel = new MigrationModel(modelDir, migrationConfig.getModelSuffix());
+      this.migrated = migrationModel.read();
+      this.currentModel = new CurrentModel(server, constraintNaming);
+      this.current = currentModel.read();
+    }
+
+    /**
+     * Return the migration for the pending drops for a given version.
+     */
+    public Migration migrationForPendingDrop(String pendingVersion) {
+
+      Migration migration = migrated.migrationForPendingDrop(pendingVersion);
+
+      // register any remaining pending drops
+      migrated.registerPendingHistoryDropColumns(current);
+      return migration;
+    }
+
+    /**
+     * Return the list of versions that have pending un-applied drops.
+     */
+    public List<String> getPendingDrops() {
+      return migrated.getPendingDrops();
+    }
+
+    /**
+     * Create and return the diff of the current model to the migration model.
+     */
+    public Migration createDiffMigration() {
+      ModelDiff diff = new ModelDiff(migrated);
+      diff.compareTo(current);
+      return diff.isEmpty() ? null : diff.getMigration();
+    }
+  }
+
+  private String generateMigration(Request request, Migration dbMigration, String dropsFor) throws IOException {
+
+    String fullVersion = getFullVersion(request.migrationModel, dropsFor);
+
+    logger.info("generating migration:{}", fullVersion);
+    if (!writeMigrationXml(dbMigration, request.modelDir, fullVersion)) {
+      logger.warn("migration already exists, not generating DDL");
+      return null;
+    } else {
+      if (!platforms.isEmpty()) {
+        writeExtraPlatformDdl(fullVersion, request.currentModel, dbMigration, request.migrationDir);
+
+      } else if (databasePlatform != null) {
+        // writer needs the current model to provide table/column details for
+        // history ddl generation (triggers, history tables etc)
+        DdlWrite write = new DdlWrite(new MConfiguration(), request.current);
+        PlatformDdlWriter writer = createDdlWriter(databasePlatform);
+        writer.processMigration(dbMigration, write, request.migrationDir, fullVersion);
+      }
+      return fullVersion;
+    }
+  }
+
+  /**
+   * Return true if the next pending drop changeSet should be generated as the next migration.
+   */
+  private String generatePendingDrop() {
+
+    String nextDrop = System.getProperty("ddl.migration.pendingDropsFor");
+    if (nextDrop != null) {
+      return nextDrop;
+    }
+    return migrationConfig.getGeneratePendingDrop();
+  }
+
+  /**
+   * Return the full version for the migration being generated.
+   * <p>
+   * The full version can contain a comment suffix after a "__" double underscore.
+   */
+  private String getFullVersion(MigrationModel migrationModel, String dropsFor) {
+
+    String version = migrationConfig.getVersion();
+    if (version == null) {
+      version = migrationModel.getNextVersion(initialVersion);
+    }
+
+    String fullVersion = migrationConfig.getApplyPrefix() + version;
+    if (migrationConfig.getName() != null) {
+      fullVersion += "__" + toUnderScore(migrationConfig.getName());
+
+    } else if (dropsFor != null) {
+      fullVersion += "__" + toUnderScore("dropsFor_" + MigrationVersion.trim(dropsFor));
+
+    } else if (version.equals(initialVersion)) {
+      fullVersion += "__initial";
+    }
+    return fullVersion;
+  }
+
+  /**
+   * Replace spaces with underscores.
+   */
+  private String toUnderScore(String name) {
+    return name.replace(' ', '_');
+  }
+
+  /**
+   * Write any extra platform ddl.
+   */
+  protected void writeExtraPlatformDdl(String fullVersion, CurrentModel currentModel, Migration dbMigration, File writePath) throws IOException {
+
+    for (Pair pair : platforms) {
+      DdlWrite platformBuffer = new DdlWrite(new MConfiguration(), currentModel.read());
+      PlatformDdlWriter platformWriter = createDdlWriter(pair.platform);
+      File subPath = platformWriter.subPath(writePath, pair.prefix);
+      platformWriter.processMigration(dbMigration, platformBuffer, subPath, fullVersion);
+
+      generateExtraDdl(subPath, pair.platform);
+    }
+  }
+
+  private PlatformDdlWriter createDdlWriter(DatabasePlatform platform) {
+    return new PlatformDdlWriter(platform, serverConfig, migrationConfig);
+  }
+
+  /**
+   * Write the migration xml.
+   */
+  protected boolean writeMigrationXml(Migration dbMigration, File resourcePath, String fullVersion) {
+
+    String modelFile = fullVersion + migrationConfig.getModelSuffix();
+    File file = new File(resourcePath, modelFile);
+    if (file.exists()) {
+      return false;
+    }
+    String comment = migrationConfig.isIncludeGeneratedFileComment() ? GENERATED_COMMENT : null;
+    MigrationXmlWriter xmlWriter = new MigrationXmlWriter(comment);
+    xmlWriter.write(dbMigration, file);
+    return true;
+  }
+
+  /**
+   * Set default server and platform if necessary.
+   */
+  protected void setDefaults() {
+    if (server == null) {
+      setServer(Ebean.getDefaultServer());
+    }
+    if (databasePlatform == null && platforms.isEmpty()) {
+      // not explicitly set not set a list of platforms so
+      // default to the platform of the default server
+      databasePlatform = server.getDatabasePlatform();
+      logger.debug("set platform to {}", databasePlatform.getName());
+    }
+  }
+
+  /**
+   * Return the file path to write the xml and sql to.
+   */
+  protected File getMigrationDirectory() {
+
+    // path to src/main/resources in typical maven project
+    File resourceRootDir = new File(pathToResources);
+    String resourcePath = migrationConfig.getMigrationPath();
+
+    // expect to be a path to something like - src/main/resources/dbmigration/model
+    File path = new File(resourceRootDir, resourcePath);
+    if (!path.exists()) {
+      if (!path.mkdirs()) {
+        logger.debug("Unable to ensure migration directory exists at {}", path.getAbsolutePath());
+      }
+    }
+    return path;
+  }
+
+  /**
+   * Return the model directory (relative to the migration directory).
+   */
+  protected File getModelDirectory(File migrationDirectory) {
+    String modelPath = migrationConfig.getModelPath();
+    if (modelPath == null || modelPath.isEmpty()) {
+      return migrationDirectory;
+    }
+    File modelDir = new File(migrationDirectory, migrationConfig.getModelPath());
+    if (!modelDir.exists() && !modelDir.mkdirs()) {
+      logger.debug("Unable to ensure migration model directory exists at {}", modelDir.getAbsolutePath());
+    }
+    return modelDir;
+  }
+
+  /**
+   * Return the DatabasePlatform given the platform key.
+   */
+  protected DatabasePlatform getPlatform(Platform platform) {
+    switch (platform) {
+      case H2:
+        return new H2Platform();
+      case HSQLDB:
+        return new HsqldbPlatform();
+      case POSTGRES:
+        return new PostgresPlatform();
+      case MYSQL:
+        return new MySqlPlatform();
+      case ORACLE:
+        return new OraclePlatform();
+      case SQLANYWHERE:
+        return new SqlAnywherePlatform();
+      case SQLSERVER:
+        return new SqlServerPlatform();
+      case DB2:
+        return new DB2Platform();
+      case SQLITE:
+        return new SQLitePlatform();
+      case GENERIC:
+        return new DatabasePlatform();
+
+      default:
+        throw new IllegalArgumentException("Platform missing? " + platform);
+    }
+  }
+
+  /**
+   * Holds a platform and prefix. Used to generate multiple platform specific DDL
+   * for a single migration.
+   */
+  public static class Pair {
+
+    /**
+     * The platform to generate the DDL for.
+     */
+    public final DatabasePlatform platform;
+
+    /**
+     * A prefix included into the file/resource names indicating the platform.
+     */
+    public final String prefix;
+
+    public Pair(DatabasePlatform platform, String prefix) {
+      this.platform = platform;
+      this.prefix = prefix;
+    }
+  }
+
+}

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java

@@ -1,19 +1,19 @@
-package io.ebean.dbmigration.ddlgeneration;
+package io.ebeaninternal.dbmigration.ddlgeneration;
 
 import io.ebean.config.ServerConfig;
-import io.ebean.dbmigration.ddlgeneration.platform.BaseTableDdl;
-import io.ebean.dbmigration.ddlgeneration.platform.PlatformDdl;
-import io.ebean.dbmigration.migration.AddColumn;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.AddTableComment;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.ChangeSet;
-import io.ebean.dbmigration.migration.CreateIndex;
-import io.ebean.dbmigration.migration.CreateTable;
-import io.ebean.dbmigration.migration.DropColumn;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.migration.DropIndex;
-import io.ebean.dbmigration.migration.DropTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.BaseTableDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.ChangeSet;
+import io.ebeaninternal.dbmigration.migration.CreateIndex;
+import io.ebeaninternal.dbmigration.migration.CreateTable;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropIndex;
+import io.ebeaninternal.dbmigration.migration.DropTable;
 
 import java.io.IOException;
 import java.util.List;

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/ColumnDdl.java

@@ -1,8 +1,8 @@
-package io.ebean.dbmigration.ddlgeneration;
+package io.ebeaninternal.dbmigration.ddlgeneration;
 
-import io.ebean.dbmigration.migration.AddColumn;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
 
 import java.io.IOException;
 

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlBuffer.java

@@ -1,6 +1,6 @@
-package io.ebean.dbmigration.ddlgeneration;
+package io.ebeaninternal.dbmigration.ddlgeneration;
 
-import io.ebean.dbmigration.model.MConfiguration;
+import io.ebeaninternal.dbmigration.model.MConfiguration;
 
 import java.io.IOException;
 

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java

@@ -1,16 +1,16 @@
-package io.ebean.dbmigration.ddlgeneration;
+package io.ebeaninternal.dbmigration.ddlgeneration;
 
-import io.ebean.dbmigration.migration.AddColumn;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.AddTableComment;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.ChangeSet;
-import io.ebean.dbmigration.migration.CreateIndex;
-import io.ebean.dbmigration.migration.CreateTable;
-import io.ebean.dbmigration.migration.DropColumn;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.migration.DropIndex;
-import io.ebean.dbmigration.migration.DropTable;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.ChangeSet;
+import io.ebeaninternal.dbmigration.migration.CreateIndex;
+import io.ebeaninternal.dbmigration.migration.CreateTable;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropIndex;
+import io.ebeaninternal.dbmigration.migration.DropTable;
 
 import java.io.IOException;
 

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java

@@ -1,9 +1,9 @@
-package io.ebean.dbmigration.ddlgeneration;
+package io.ebeaninternal.dbmigration.ddlgeneration;
 
-import io.ebean.dbmigration.ddlgeneration.platform.BaseDdlBuffer;
-import io.ebean.dbmigration.model.MConfiguration;
-import io.ebean.dbmigration.model.MTable;
-import io.ebean.dbmigration.model.ModelContainer;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.BaseDdlBuffer;
+import io.ebeaninternal.dbmigration.model.MConfiguration;
+import io.ebeaninternal.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.model.ModelContainer;
 
 /**
  * Write context holding the buffers for both apply and rollback DDL.

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java

@@ -1,15 +1,15 @@
-package io.ebean.dbmigration.ddlgeneration;
+package io.ebeaninternal.dbmigration.ddlgeneration;
 
-import io.ebean.dbmigration.migration.AddColumn;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.AddTableComment;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.CreateIndex;
-import io.ebean.dbmigration.migration.CreateTable;
-import io.ebean.dbmigration.migration.DropColumn;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.migration.DropIndex;
-import io.ebean.dbmigration.migration.DropTable;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.CreateIndex;
+import io.ebeaninternal.dbmigration.migration.CreateTable;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropIndex;
+import io.ebeaninternal.dbmigration.migration.DropTable;
 
 import java.io.IOException;
 

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java

@@ -1,7 +1,7 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.model.MConfiguration;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.model.MConfiguration;
 
 import java.io.IOException;
 import java.io.StringWriter;

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java

@@ -1,30 +1,29 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.DbConstraintNaming;
 import io.ebean.config.NamingConvention;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DbHistorySupport;
-import io.ebean.config.dbplatform.DbIdentity;
 import io.ebean.config.dbplatform.IdType;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.ddlgeneration.TableDdl;
-import io.ebean.dbmigration.ddlgeneration.platform.util.IndexSet;
-import io.ebean.dbmigration.migration.AddColumn;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.AddTableComment;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.Column;
-import io.ebean.dbmigration.migration.CreateIndex;
-import io.ebean.dbmigration.migration.CreateTable;
-import io.ebean.dbmigration.migration.DdlScript;
-import io.ebean.dbmigration.migration.DropColumn;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.migration.DropIndex;
-import io.ebean.dbmigration.migration.DropTable;
-import io.ebean.dbmigration.migration.ForeignKey;
-import io.ebean.dbmigration.migration.UniqueConstraint;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.ddlgeneration.TableDdl;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.IndexSet;
+import io.ebeaninternal.dbmigration.migration.AddColumn;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.AddTableComment;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.Column;
+import io.ebeaninternal.dbmigration.migration.CreateIndex;
+import io.ebeaninternal.dbmigration.migration.CreateTable;
+import io.ebeaninternal.dbmigration.migration.DdlScript;
+import io.ebeaninternal.dbmigration.migration.DropColumn;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropIndex;
+import io.ebeaninternal.dbmigration.migration.DropTable;
+import io.ebeaninternal.dbmigration.migration.ForeignKey;
+import io.ebeaninternal.dbmigration.migration.UniqueConstraint;
+import io.ebeaninternal.dbmigration.model.MTable;
 import io.ebean.util.StringHelper;
 
 import java.io.IOException;
@@ -59,7 +58,7 @@ public class BaseTableDdl implements TableDdl {
    * Used when unique constraints specifically for OneToOne can't be created normally (MsSqlServer).
    */
   protected List<Column> externalUnique = new ArrayList<>();
-  
+
   protected List<UniqueConstraint> externalCompoundUnique = new ArrayList<>();
 
   // counters used when constraint names are truncated due to maximum length
@@ -78,7 +77,7 @@ public class BaseTableDdl implements TableDdl {
   private boolean strict;
 
   private final boolean sql2011History;
-  
+
   /**
    * Helper class that is used to execute the migration ddl before and after the migration action.
    */
@@ -101,7 +100,7 @@ public class BaseTableDdl implements TableDdl {
       if (column.getBefore().isEmpty() && alterNotNull && defaultValue == null) {
         handleStrictError("non-null column has no default value: " + tableName + "." + columnName);
       }
-      
+
       before = getScriptsForPlatform(column.getBefore(), platformDdl.getPlatform().getName());
       after = getScriptsForPlatform(column.getAfter(), platformDdl.getPlatform().getName());
 
@@ -113,10 +112,10 @@ public class BaseTableDdl implements TableDdl {
     DdlMigrationHelp(AlterColumn alter) throws IOException {
       this.tableName = alter.getTableName();
       this.columnName = alter.getColumnName();
-      
+
       String tmp = alter.getDefaultValue() != null ? alter.getDefaultValue() : alter.getCurrentDefaultValue();
       this.defaultValue = platformDdl.convertDefaultValue(tmp);
-          
+
       boolean alterNotNull = Boolean.TRUE.equals(alter.isNotnull());
       // here we add the platform's default update script
       if (alter.getBefore().isEmpty() && alterNotNull) {
@@ -127,11 +126,11 @@ public class BaseTableDdl implements TableDdl {
       } else {
         before = getScriptsForPlatform(alter.getBefore(), platformDdl.getPlatform().getName());
       }
-      
+
       after = getScriptsForPlatform(alter.getAfter(), platformDdl.getPlatform().getName());
-      
+
     }
-    
+
     public void writeBefore(DdlBuffer buffer) throws IOException {
       if (!before.isEmpty()) {
         buffer.end();
@@ -141,7 +140,7 @@ public class BaseTableDdl implements TableDdl {
         buffer.endOfStatement();
       }
     }
-    
+
     public void writeAfter(DdlBuffer buffer) throws IOException {
       // here we run postmigration scripts
       for (String ddlScript : after) {
@@ -183,7 +182,7 @@ public class BaseTableDdl implements TableDdl {
         System.err.println("Error in DDL: " + message);
       }
     }
-    
+
     public String getDefaultValue() {
       return defaultValue;
     }
@@ -342,7 +341,7 @@ public class BaseTableDdl implements TableDdl {
         .append(platformDdl.dropIndex(uqName, tableName))
         .endOfStatement();
     }
-    
+
     for (UniqueConstraint constraint : externalCompoundUnique) {
       String uqName = constraint.getName();
       String[] columnNames = StringHelper.delimitedToArray(constraint.getColumnNames(), ",", false);
@@ -525,7 +524,7 @@ public class BaseTableDdl implements TableDdl {
 
     buffer.append(platformDdl.dropSequence(sequenceName)).endOfStatement();
   }
-  
+
   /**
    * Write all the check constraints.
    */
@@ -791,7 +790,7 @@ public class BaseTableDdl implements TableDdl {
   public void generate(DdlWrite writer, AlterColumn alterColumn) throws IOException {
     DdlMigrationHelp ddlHelp = new DdlMigrationHelp(alterColumn);
     ddlHelp.writeBefore(writer.apply());
-    
+
     if (isTrue(alterColumn.isHistoryExclude())) {
       regenerateHistoryTriggers(alterColumn.getTableName(), HistoryTableUpdate.Change.EXCLUDE, alterColumn.getColumnName());
     } else if (isFalse(alterColumn.isHistoryExclude())) {
@@ -997,13 +996,13 @@ public class BaseTableDdl implements TableDdl {
   }
 
   protected void alterTableAddColumn(DdlBuffer buffer, String tableName, Column column, boolean onHistoryTable) throws IOException {
-    DdlMigrationHelp help = new DdlMigrationHelp(tableName, column);    
+    DdlMigrationHelp help = new DdlMigrationHelp(tableName, column);
     if (!onHistoryTable) {
       help.writeBefore(buffer);
     }
-    
+
     platformDdl.alterTableAddColumn(buffer, tableName, column, onHistoryTable, help.getDefaultValue());
-    
+
     if (!onHistoryTable) {
       help.writeAfter(buffer);
     }

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java

@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.dbplatform.DatabasePlatform;
 
@@ -16,7 +16,8 @@ public class DB2Ddl extends PlatformDdl {
     this.identitySuffix = " generated by default as identity";
     this.inlineUniqueWhenNullable = false;
   }
-  
+
+  @Override
   public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns, boolean notNull) {
     if (notNull) {
       return super.alterTableAddUniqueConstraint(tableName, uqName, columns, true);

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java

@@ -1,13 +1,13 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.DbConstraintNaming;
 import io.ebean.config.ServerConfig;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.model.MColumn;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.model.MColumn;
+import io.ebeaninternal.dbmigration.model.MTable;
 
 import java.io.IOException;
 import java.util.Collection;

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java

@@ -1,7 +1,7 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
 
 import java.util.List;
 

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlHelp.java

@@ -1,22 +1,22 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 public class DdlHelp {
   public static final String DROP_DEFAULT = "DROP DEFAULT";
-  
+
   public static final String DROP_COMMENT = "DROP COMMENT";
-  
+
   /**
    * Return true if the default value is the special DROP DEFAULT value.
    */
   public static boolean isDropDefault(String defaultValue) {
     return DROP_DEFAULT.equals(defaultValue);
   }
-  
+
   /**
    * Return true if the default value is the special DROP DEFAULT value.
    */
   public static boolean isDropComment(String comment) {
     return DROP_COMMENT.equals(comment);
   }
-  
+
 }

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java

@@ -1,7 +1,7 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.DbConstraintNaming;
-import io.ebean.dbmigration.ddlgeneration.platform.util.VowelRemover;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.VowelRemover;
 
 /**
  * Default implementation used to truncate or shorten db constraint names as required.

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2Ddl.java

@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.dbplatform.DatabasePlatform;
 

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java

@@ -1,9 +1,9 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.dbplatform.h2.H2HistoryTrigger;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.model.MTable;
 
 import java.io.IOException;
 

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java

@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HsqldbDdl.java

@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.dbplatform.DatabasePlatform;
 

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java

@@ -1,10 +1,10 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.util.StringHelper;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.Column;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.Column;
 
 import java.io.IOException;
 

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java

@@ -1,8 +1,8 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.model.MTable;
 
 import java.io.IOException;
 

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/NoHistorySupportDdl.java

@@ -1,10 +1,10 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.ServerConfig;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.model.MTable;
 
 import java.io.IOException;
 

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10Ddl.java

@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.dbplatform.DatabasePlatform;
 

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java

@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.DbConstraintNaming;
 import io.ebean.config.ServerConfig;
@@ -6,17 +6,17 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbDefaultValue;
 import io.ebean.config.dbplatform.DbIdentity;
 import io.ebean.config.dbplatform.IdType;
-import io.ebean.dbmigration.ddlgeneration.BaseDdlHandler;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlHandler;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.ddlgeneration.platform.util.PlatformTypeConverter;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.AlterColumn;
-import io.ebean.dbmigration.migration.Column;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.migration.IdentityType;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.BaseDdlHandler;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.util.PlatformTypeConverter;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.migration.Column;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.migration.IdentityType;
+import io.ebeaninternal.dbmigration.model.MTable;
 import io.ebean.util.StringHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -136,9 +136,33 @@ public class PlatformDdl {
    * Return the identity type to use given the support in the underlying database
    * platform for sequences and identity/autoincrement.
    */
-  public IdType useIdentityType(IdentityType modelIdentityType) {
+  public IdType useIdentityType(IdentityType modelIdentity) {
 
-    return dbIdentity.useIdentityType(modelIdentityType);
+    if (modelIdentity == null) {
+      // use the default
+      return dbIdentity.getIdType();
+    }
+    return identityType(modelIdentity, dbIdentity.getIdType(), dbIdentity.isSupportsSequence(), dbIdentity.isSupportsIdentity());
+  }
+
+  /**
+   * Determine the id type to use based on requested identityType and
+   * the support for that in the database platform.
+   */
+  private IdType identityType(IdentityType modelIdentity, IdType platformIdType, boolean supportsSequence, boolean supportsIdentity) {
+
+    switch (modelIdentity) {
+      case GENERATOR:
+        return IdType.GENERATOR;
+      case EXTERNAL:
+        return IdType.EXTERNAL;
+      case SEQUENCE:
+        return supportsSequence ? IdType.SEQUENCE : platformIdType;
+      case IDENTITY:
+        return supportsIdentity ? IdType.IDENTITY : platformIdType;
+      default:
+        return platformIdType;
+    }
   }
 
   /**
@@ -418,7 +442,7 @@ public class PlatformDdl {
     }
 
   }
-  
+
   public void alterTableDropColumn(DdlBuffer buffer, String tableName, String columnName) throws IOException {
     buffer.append("alter table ").append(tableName).append(" drop column ").append(columnName)
     .endOfStatement();
@@ -552,7 +576,7 @@ public class PlatformDdl {
     }
     apply.append(String.format("comment on table %s is '%s'", tableName, tableComment)).endOfStatement();
   }
-  
+
   /**
    * Add column comment as a separate statement.
    */

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java

@@ -1,10 +1,10 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.ServerConfig;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.model.MTable;
 
 import java.io.IOException;
 

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java

@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.dbplatform.DatabasePlatform;
 

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java

@@ -1,8 +1,8 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.model.MTable;
 
 import java.io.IOException;
 import java.util.List;

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SQLiteDdl.java

@@ -1,7 +1,7 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
 
 import java.io.IOException;
 

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java

@@ -1,8 +1,8 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.migration.AlterColumn;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.migration.AlterColumn;
 
 import java.io.IOException;
 
@@ -39,13 +39,13 @@ public class SqlServerDdl extends PlatformDdl {
     String objectId = fkName;
     if (pos != -1) {
       objectId = tableName.substring(0, pos + 1) + fkName;
-    } 
+    }
     return "IF OBJECT_ID('" + objectId + "', 'F') IS NOT NULL " + super.alterTableDropForeignKey(tableName, fkName);
   }
-  
+
   @Override
   public String dropSequence(String sequenceName) {
-    return "IF OBJECT_ID('" + sequenceName + "', 'SO') IS NOT NULL drop sequence " + sequenceName; 
+    return "IF OBJECT_ID('" + sequenceName + "', 'SO') IS NOT NULL drop sequence " + sequenceName;
   }
 
   @Override
@@ -81,7 +81,8 @@ public class SqlServerDdl extends PlatformDdl {
     }
     return sb.toString();
   }
-  
+
+  @Override
   public String alterTableDropConstraint(String tableName, String constraintName) {
     StringBuilder sb = new StringBuilder();
     sb.append("IF (OBJECT_ID('").append(constraintName).append("', 'C') IS NOT NULL) ");
@@ -121,7 +122,7 @@ public class SqlServerDdl extends PlatformDdl {
     sb.append(";");
     return sb.toString();
   }
-  
+
   @Override
   public String alterColumnDefaultValue(String tableName, String columnName, String defaultValue) {
     // Unfortunately, the SqlServer creates default values with a random name.
@@ -190,7 +191,7 @@ public class SqlServerDdl extends PlatformDdl {
 
     // do nothing for MS SQL Server (cause it requires stored procedures etc)
   }
-  
+
   /**
    * It is rather complex to delete a column on SqlServer as there must not exist any references
    * (constraints, default values, indices and foreign keys). The list is not yet complete, as
@@ -200,7 +201,7 @@ public class SqlServerDdl extends PlatformDdl {
   @Override
   public void alterTableDropColumn(DdlBuffer buffer, String tableName, String columnName) throws IOException {
     buffer.append("-- drop column ").append(tableName).append(".").append(columnName).endOfStatement();
-    
+
     buffer.append(alterTableDropUniqueConstraint(tableName, naming.uniqueConstraintName(tableName, columnName)));
     buffer.endOfStatement();
     buffer.append(alterColumnDefaultValue(tableName, columnName, DdlHelp.DROP_DEFAULT));
@@ -213,5 +214,5 @@ public class SqlServerDdl extends PlatformDdl {
     buffer.endOfStatement();
     super.alterTableDropColumn(buffer, tableName, columnName);
   }
-  
+
 }

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java

@@ -1,12 +1,11 @@
-package io.ebean.dbmigration.ddlgeneration.platform;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
-import io.ebean.config.DbConstraintNaming;
 import io.ebean.config.ServerConfig;
-import io.ebean.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebean.dbmigration.ddlgeneration.DdlWrite;
-import io.ebean.dbmigration.migration.AddHistoryTable;
-import io.ebean.dbmigration.migration.DropHistoryTable;
-import io.ebean.dbmigration.model.MTable;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
+import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
+import io.ebeaninternal.dbmigration.migration.AddHistoryTable;
+import io.ebeaninternal.dbmigration.migration.DropHistoryTable;
+import io.ebeaninternal.dbmigration.model.MTable;
 
 import java.io.IOException;
 
@@ -45,7 +44,7 @@ public class SqlServerHistoryDdl implements PlatformHistoryDdl {
       historyTable = "dbo." +historyTable; // so add the default schema, if none was specified.
     }
     apply.append("alter table ").append(baseTable).append(" set (system_versioning = on (history_table=").append(historyTable).append("))").endOfStatement();
-    
+
     DdlBuffer drop = writer.dropAll();
     drop.append("IF OBJECT_ID('").append(baseTable).append("', 'U') IS NOT NULL alter table ").append(baseTable).append(" set (system_versioning = off)").endOfStatement();
     drop.append("IF OBJECT_ID('").append(baseTable).append("_history', 'U') IS NOT NULL drop table ").append(baseTable).append("_history").endOfStatement();
@@ -57,7 +56,7 @@ public class SqlServerHistoryDdl implements PlatformHistoryDdl {
     DdlBuffer apply = writer.applyHistory();
     apply.append("-- dropping history support for ").append(baseTable).endOfStatement();
     // drop default constraints
-    
+
     apply.append(platformDdl.alterColumnDefaultValue(baseTable, systemPeriodStart, DdlHelp.DROP_DEFAULT)).endOfStatement();
     apply.append(platformDdl.alterColumnDefaultValue(baseTable, systemPeriodEnd, DdlHelp.DROP_DEFAULT)).endOfStatement();
     // switch of versioning & period

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/IndexColumns.java

@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform.util;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform.util;
 
 import java.util.ArrayList;
 import java.util.Collections;

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/IndexSet.java

@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform.util;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform.util;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java

@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform.util;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform.util;
 
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbPlatformTypeMapping;

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/VowelRemover.java

@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.ddlgeneration.platform.util;
+package io.ebeaninternal.dbmigration.ddlgeneration.platform.util;
 
 /**
  * Utility to remove vowels (from constraint names primarily for Oracle and DB2).

src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java

@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java

@@ -1,4 +1,4 @@
-package io.ebean.dbmigration.migration;
+package io.ebeaninternal.dbmigration.migration;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;