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

#1995 - ENH: Add DatabaseConfig.isLocalOnlyL2Cache() ... to support disabling l2 cache plugins
[maven-release-plugin] prepare for next development iteration
2024-04-21 10:51:47 +00:00 · 2020-04-21 22:00:18 +12:00 · 2020-04-21 21:55:51 +12:00 · 2020-04-15 08:47:38 +12:00 · 2020-04-15 08:47:26 +12:00 · 2020-04-15 08:35:24 +12:00
741 changed files with 19821 additions and 9965 deletions
@@ -1,15 +1,14 @@
-dist: trusty
+dist: xenial
 sudo: required
 language: java
 jdk:
-  - oraclejdk8
  - openjdk11

 git:
  depth: 3

 addons:
-  postgresql: "9.6"
+  postgresql: 10
 #  apt:
 #    packages:
 #    - mysql-server-5.7
@@ -9,7 +9,7 @@

  <groupId>io.ebean</groupId>
  <artifactId>ebean</artifactId>
-  <version>12.1.2</version>
+  <version>12.2.5</version>
  <packaging>jar</packaging>

  <name>ebean</name>
@@ -18,42 +18,14 @@
  <properties>
    <jackson-core.version>2.10.0</jackson-core.version>
    <jackson-databind.version>2.10.0</jackson-databind.version>
-    <snakeyaml.version>1.21</snakeyaml.version>
  </properties>

  <scm>
    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-12.1.2</tag>
+    <tag>ebean-12.2.5</tag>
  </scm>

  <profiles>
-    <profile>
-      <!-- Note: to use this profile, you need credentials for the oracle repository in your
-        settings.xml as described here:
-        http://docs.oracle.com/middleware/1213/core/MAVEN/config_maven_repo.htm#MAVEN9010 -->
-      <id>oracle</id>
-      <dependencies>
-        <dependency>
-          <groupId>com.oracle.jdbc</groupId>
-          <artifactId>ojdbc8</artifactId>
-          <version>12.2.0.1</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-      <repositories>
-        <repository>
-          <id>maven.oracle.com</id>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-          <url>https://maven.oracle.com</url>
-          <layout>default</layout>
-        </repository>
-      </repositories>
-    </profile>
    <profile>
      <!-- Note: to use this profile, you need to download manually the db2jcc4 driver.
        After that, install it into your local maven repository:
@@ -89,13 +61,10 @@
      <scope>provided</scope>
    </dependency>

-    <!--
-    Exclude snakeyaml if you desire - it is not strictly required.
-    -->
    <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>${snakeyaml.version}</version>
+      <groupId>io.avaje</groupId>
+      <artifactId>config</artifactId>
+      <version>1.2</version>
    </dependency>

    <!--
@@ -103,46 +72,40 @@
    to assist with IDE auto-completion with Ebean API
    -->
    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-jsr305</artifactId>
-      <version>1.1</version>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-jsr305</artifactId>
+      <version>1.0</version>
      <scope>provided</scope>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>persistence-api</artifactId>
-      <version>2.2.2</version>
+      <version>2.2.4</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-annotation</artifactId>
-      <version>6.1</version>
+      <version>6.11</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-types</artifactId>
-      <version>1.3</version>
+      <version>2.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-datasource</artifactId>
-      <version>4.6.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-classpath-scanner</artifactId>
-      <version>3.1.1</version>
+      <version>4.7.3</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-migration</artifactId>
-      <version>12.1.1</version>
+      <version>12.1.4</version>
    </dependency>

    <dependency>
@@ -214,7 +177,7 @@
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.2.2</version>
+      <version>42.2.10</version>
      <scope>provided</scope>
    </dependency>

@@ -227,17 +190,17 @@
      <scope>test</scope>
    </dependency>

-    <!--<dependency>-->
-    <!--<groupId>oracle</groupId>-->
-    <!--<artifactId>oracle-jdbc</artifactId>-->
-    <!--<version>7.0</version>-->
-    <!--<scope>test</scope>-->
-    <!--</dependency>-->
+    <dependency>
+      <groupId>com.oracle.ojdbc</groupId>
+      <artifactId>ojdbc10</artifactId>
+      <version>19.3.0.0</version>
+      <scope>test</scope>
+    </dependency>

    <dependency>
      <groupId>io.ebean.test</groupId>
      <artifactId>ebean-test-docker</artifactId>
-      <version>2.10.3</version>
+      <version>3.1.3</version>
      <scope>test</scope>
    </dependency>

@@ -253,7 +216,7 @@
    <dependency>
      <groupId>com.h2database</groupId>
      <artifactId>h2</artifactId>
-      <version>1.4.197</version>
+      <version>1.4.199</version>
      <scope>provided</scope>
    </dependency>

@@ -314,9 +277,9 @@
    </dependency>

    <dependency>
-      <groupId>org.avaje.moduuid</groupId>
-      <artifactId>avaje-moduuid</artifactId>
-      <version>2.1</version>
+      <groupId>io.avaje</groupId>
+      <artifactId>mod-uuid</artifactId>
+      <version>1.1</version>
      <scope>test</scope>
    </dependency>

@@ -329,13 +292,13 @@
      <plugin>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.1.1</version>
+        <version>12.2.4</version>
        <executions>
          <execution>
            <id>test</id>
            <phase>process-test-classes</phase>
            <configuration>
-              <transformArgs>debug=1</transformArgs>
+              <transformArgs>debug=0</transformArgs>
            </configuration>
            <goals>
              <goal>testEnhance</goal>
@@ -390,23 +353,7 @@
        <configuration>
          <doctitle>Ebean 12</doctitle>
          <overview>src/main/java/io/ebean/overview.html</overview>
-          <source>1.8</source>
-          <doclet>org.avaje.doclet.PygmentsDoclet</doclet>
          <excludePackageNames>io.ebeaninternal.*:io.ebeanservice:io.ebean.common:io.ebean.bean:io.ebean.service:io.ebean.metric:io.ebean.util:io.ebean.config.properties:io.ebean.config.dbplatform</excludePackageNames>
-          <docletArtifact>
-            <groupId>org.avaje</groupId>
-            <artifactId>pygments-doclet</artifactId>
-            <version>1.0.0</version>
-          </docletArtifact>
-          <!-- for people using JDK11, our javadoc doclet isn't 11 compatible yet -->
-<!--          <javadocExecutable>${env.JAVA8_HOME}/bin/javadoc</javadocExecutable>-->
-          <additionalparam>
-            -Xdoclint:none
-            -include-basedir ${project.basedir}
-            -attributes "idseparator=-; project_name=${project.name}; \
-            project_version=${project.version}; \
-            project_desc=${project.description}"
-          </additionalparam>
          <linksource>true</linksource>
          <overview>src/main/java/com/avaje/ebean/overview.html</overview>
        </configuration>
@@ -2,7 +2,6 @@ package io.ebean;

 import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
-import io.ebean.config.DatabaseConfig;
 import io.ebean.plugin.Property;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
@@ -87,14 +86,14 @@ public class DB {

 //  /**
 //   * Register the server with this Ebean singleton. Specify if the registered
-//   * server is the primary/default server.
+//   * server is the primary/default database.
 //   */
 //  public static void register(EbeanServer server, boolean defaultServer) {
 //    serverMgr.register(server, defaultServer);
 //  }
 //
 //  /**
-//   * Backdoor for registering a mock implementation of EbeanServer as the default server.
+//   * Backdoor for registering a mock implementation of EbeanServer as the default database.
 //   */
 //  protected static EbeanServer mock(String name, EbeanServer server, boolean defaultServer) {
 //    EbeanServer originalPrimaryServer = serverMgr.defaultServer;
@@ -102,6 +101,22 @@ public class DB {
 //    return originalPrimaryServer;
 //  }

+  /**
+   * Return the ScriptRunner for the default database.
+   * <p>
+   * Useful to run SQL scripts that are resources. For example a test script
+   * for inserting seed data for a particular test.
+   *
+   * <pre>{@code
+   *
+   *   DB.script().run("/scripts/test-script.sql")
+   *
+   * }</pre>
+   */
+  public static ScriptRunner script() {
+    return getDefault().script();
+  }
+
  /**
   * Return the ExpressionFactory from the default database.
   * <p>
@@ -177,6 +192,18 @@ public class DB {
    return getDefault().beginTransaction();
  }

+  /**
+   * Create a new transaction that is not held in TransactionThreadLocal.
+   * <p>
+   * You will want to do this if you want multiple Transactions in a single
+   * thread or generally use transactions outside of the TransactionThreadLocal
+   * management.
+   * </p>
+   */
+  public static Transaction createTransaction() {
+    return getDefault().createTransaction();
+  }
+
  /**
   * Start a transaction additionally specifying the isolation level.
   *
@@ -443,6 +470,13 @@ public class DB {
    return getDefault().saveAll(beans);
  }

+  /**
+   * Save all the beans from a Collection.
+   */
+  public static int saveAll(Object... beans) throws OptimisticLockException {
+    return getDefault().saveAll(beans);
+  }
+
  /**
   * This method checks the uniqueness of a bean. I.e. if the save will work. It will return the
   * properties that violates an unique / primary key. This may be done in an UI save action to
@@ -651,7 +685,7 @@ public class DB {
   *   // find orders and their customers
   *   List<Order> list = DB.find(Order.class)
   *     .fetch("customer")
-   *     .orderBy("id")
+   *     .order("id")
   *     .findList();
   *
   *   // sort by customer name ascending, then by order shipDate
@@ -737,8 +771,11 @@ public class DB {
  }

  /**
+   * Deprecated - migrate to sqlQuery().
+   * <p>
   * This is an alias for {@link #sqlQuery(String)}.
   */
+  @Deprecated
  public static SqlQuery createSqlQuery(String sql) {
    return sqlQuery(sql);
  }
@@ -761,8 +798,11 @@ public class DB {
  }

  /**
+   * Deprecated - migrate to sqlUpdate().
+   * <p>
   * This is an alias for {@link #sqlUpdate(String)}.
   */
+  @Deprecated
  public static SqlUpdate createSqlUpdate(String sql) {
    return sqlUpdate(sql);
  }
@@ -1203,6 +1243,13 @@ public class DB {
    return getDefault().getBeanState(bean);
  }

+  /**
+   * Return the value of the Id property for a given bean.
+   */
+  public static Object getBeanId(Object bean) {
+    return getDefault().getBeanId(bean);
+  }
+
  /**
   * Return the manager of the level 2 cache ("L2" cache).
   */
@@ -3,7 +3,6 @@ package io.ebean;
 import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.config.DatabaseConfig;
-import io.ebean.config.ServerConfig;
 import io.ebean.meta.MetaInfoManager;
 import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
@@ -123,7 +122,7 @@ public interface Database {
  String getName();

  /**
-   * Return the ExpressionFactory for this server.
+   * Return the ExpressionFactory for this database.
   */
  ExpressionFactory getExpressionFactory();

@@ -376,7 +375,7 @@ public interface Database {
   *   // find orders and their customers
   *   List<Order> list = database.find(Order.class)
   *     .fetch("customer")
-   *     .orderBy("id")
+   *     .order("id")
   *     .findList();
   *
   *   // sort by customer name ascending, then by order shipDate
@@ -465,8 +464,11 @@ public interface Database {
  SqlQuery sqlQuery(String sql);

  /**
+   * Deprecated - migrate to sqlQuery().
+   * <p>
   * This is an alias for {@link #sqlQuery(String)}.
   */
+  @Deprecated
  SqlQuery createSqlQuery(String sql);

  /**
@@ -485,8 +487,11 @@ public interface Database {
  SqlUpdate sqlUpdate(String sql);

  /**
+   * Deprecated - migrate to sqlUpdate().
+   * <p>
   * This is an alias for {@link #sqlUpdate(String)}.
   */
+  @Deprecated
  SqlUpdate createSqlUpdate(String sql);

  /**
@@ -856,7 +861,7 @@ public interface Database {
   * <pre>{@code
   *   public class Order { ...
   *
-   * 	   @OneToMany(cascade=CascadeType.ALL, mappedBy="order")
+   *     @OneToMany(cascade=CascadeType.ALL, mappedBy="order")
   * 	   List<OrderDetail> details;
   * 	   ...
   *   }
@@ -876,6 +881,11 @@ public interface Database {
   */
  int saveAll(Collection<?> beans) throws OptimisticLockException;

+  /**
+   * Save all the beans.
+   */
+  int saveAll(Object... beans) throws OptimisticLockException;
+
  /**
   * Delete the bean.
   * <p>
@@ -1051,7 +1061,6 @@ public interface Database {
   *   Integer returnValue = (Integer) cs.getObject(3);
   *
   * }</pre>
-   *
   */
  int execute(CallableSql callableSql);

@@ -1299,7 +1308,7 @@ public interface Database {
   * 	   public void run() {
   * 		   User u1 = database.find(User.class, 1);
   * 		   ...
-   * 	   }
+   *     }
   *   });
   *
   * }</pre>
@@ -1348,7 +1357,7 @@ public interface Database {
   * 		   User u1 = database.find(User.class, 1);
   * 		   ...
   * 		   return u1.getEmail();
-   * 	   }
+   *     }
   *   });
   *
   * }</pre>
@@ -34,14 +34,14 @@ public class DatabaseFactory {
  }

  /**
-   * Create using ebean.properties to configure the server.
+   * Create using ebean.properties to configure the database.
   */
  public static synchronized Database create(String name) {
    return EbeanServerFactory.create(name);
  }

  /**
-   * Create using the ServerConfig object to configure the server.
+   * Create using the ServerConfig object to configure the database.
   */
  public static synchronized Database create(DatabaseConfig config) {
    return EbeanServerFactory.create(config);
@@ -61,7 +61,7 @@ public interface DocumentStore {
   * <pre>{@code
   *
   * Customer customer =
-   *   server.find(Customer.class)
+   *   database.find(Customer.class)
   *     .setUseDocStore(true)
   *     .setId(42)
   *     .findOne();
@@ -79,7 +79,7 @@ public interface DocumentStore {
   * <pre>{@code
   *
   * List<Customer> newCustomers =
-   *  server.find(Customer.class)
+   *  database.find(Customer.class)
   *    .setUseDocStore(true)
   *    .where().eq("status, Customer.Status.NEW)
   *    .findList();
@@ -99,7 +99,7 @@ public interface DocumentStore {
   * <pre>{@code
   *
   * PagedList<Customer> newCustomers =
-   *  server.find(Customer.class)
+   *  database.find(Customer.class)
   *    .setUseDocStore(true)
   *    .where().eq("status, Customer.Status.NEW)
   *    .setMaxRows(50)
@@ -120,7 +120,7 @@ public interface DocumentStore {
   * </p>
   * <pre>{@code
   *
-   *  server.find(Order.class)
+   *  database.find(Order.class)
   *    .setUseDocStore(true)
   *    .where()... // perhaps add predicates
   *    .findEach((Order order) -> {
@@ -145,7 +145,7 @@ public interface DocumentStore {
   * </p>
   * <pre>{@code
   *
-   *  server.find(Order.class)
+   *  database.find(Order.class)
   *    .setUseDocStore(true)
   *    .where()... // perhaps add predicates
   *    .findEachWhile(new Predicate<Order>() {
@@ -190,7 +190,7 @@ public interface DocumentStore {
   * Drop the index from the document store (similar to DDL drop table).
   * <pre>{@code
   *
-   *   DocumentStore documentStore = server.docStore();
+   *   DocumentStore documentStore = database.docStore();
   *
   *   documentStore.dropIndex("product_copy");
   *
@@ -202,7 +202,7 @@ public interface DocumentStore {
   * Create an index given a mapping file as a resource in the classPath (similar to DDL create table).
   * <pre>{@code
   *
-   *   DocumentStore documentStore = server.docStore();
+   *   DocumentStore documentStore = database.docStore();
   *
   *   // uses product_copy.mapping.json resource
   *   // ... to define mappings for the index
@@ -289,7 +289,7 @@ public interface DocumentStore {
   * <pre>{@code
   *
   *  // predicates to select the source documents to copy
-   *  Query<Product> query = server.find(Product.class)
+   *  Query<Product> query = database.find(Product.class)
   *    .where()
   *      .ge("whenModified", new Timestamp(since))
   *      .ge("name", "A")
@@ -77,12 +77,29 @@ public interface DtoQuery<T> {
  Optional<T> findOneOrEmpty();

  /**
-   * The same as bind for named parameters.
+   * Bind all the parameters using index positions.
+   * <p>
+   * Binds each parameter moving the index position each time.
+   * <p>
+   * A convenience for multiple calls to {@link #setParameter(Object)}
+   */
+  DtoQuery<T> setParameters(Object... value);
+
+  /**
+   * Bind the next parameter using index position.
+   * <p>
+   * Bind the parameter using index position starting at 1 and incrementing.
+   * <p>
+   */
+  DtoQuery<T> setParameter(Object value);
+
+  /**
+   * Bind the named parameter.
   */
  DtoQuery<T> setParameter(String name, Object value);

  /**
-   * The same as bind for positioned parameters.
+   * Bind the parameter by its index position (1 based like JDBC).
   */
  DtoQuery<T> setParameter(int position, Object value);

@@ -136,4 +153,8 @@ public interface DtoQuery<T> {
   */
  DtoQuery<T> setBufferFetchSizeHint(int bufferFetchSizeHint);

+  /**
+   * Use the explicit transaction to execute the query.
+   */
+  DtoQuery<T> usingTransaction(Transaction transaction);
 }
@@ -24,6 +24,8 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;

 /**
+ * Ebean will be Deprecated - please migrate to use DB.
+ * <p>
 * Ebean is a registry of {@link Database} by name. Ebean has now been renamed to {@link DB}.
 * <p>
 * Ebean is effectively this is an alias for {@link DB} which is the new and improved name for Ebean.
@@ -80,7 +82,7 @@ public final class Ebean {

      } catch (DataSourceConfigurationException e) {
        String msg = "Configuration error creating DataSource for the default Database." +
-          " This typically means a missing application-test.yaml or missing ebean-test-config dependency." +
+          " This typically means a missing application-test.yaml or missing ebean-test dependency." +
          " See https://ebean.io/docs/trouble-shooting#datasource";
        throw new DataSourceConfigurationException(msg, e);

@@ -185,7 +187,7 @@ public final class Ebean {
  }

  /**
-   * Return the ExpressionFactory from the default server.
+   * Return the ExpressionFactory from the default database.
   * <p>
   * The ExpressionFactory is used internally by the query and ExpressionList to
   * build the WHERE and HAVING clauses. Alternatively you can use the
@@ -207,14 +209,14 @@ public final class Ebean {

  /**
   * Register the server with this Ebean singleton. Specify if the registered
-   * server is the primary/default server.
+   * server is the primary/default database.
   */
  public static void register(EbeanServer server, boolean defaultServer) {
    serverMgr.register(server, defaultServer);
  }

  /**
-   * Backdoor for registering a mock implementation of EbeanServer as the default server.
+   * Backdoor for registering a mock implementation of EbeanServer as the default database.
   */
  protected static EbeanServer mock(String name, EbeanServer server, boolean defaultServer) {
    EbeanServer originalPrimaryServer = serverMgr.defaultServer;
@@ -462,7 +464,7 @@ public final class Ebean {
   * <pre>{@code
   *   public class Order { ...
   *
-   * 	   @OneToMany(cascade=CascadeType.ALL, mappedBy="order")
+   *     @OneToMany(cascade=CascadeType.ALL, mappedBy="order")
   * 	   List<OrderDetail> details;
   * 	   ...
   *   }
@@ -794,7 +796,7 @@ public final class Ebean {
   *   // find orders and their customers
   *   List<Order> list = Ebean.find(Order.class)
   *     .fetch("customer")
-   *     .orderBy("id")
+   *     .order("id")
   *     .findList();
   *
   *   // sort by customer name ascending, then by order shipDate
@@ -865,6 +867,8 @@ public final class Ebean {
  }

  /**
+   * Deprecated - migrate to DB.sqlQuery().
+   * <p>
   * Create a SqlQuery for executing native sql
   * query statements.
   * <p>
@@ -872,22 +876,24 @@ public final class Ebean {
   * annotation for examples.
   * </p>
   */
+  @Deprecated
  public static SqlQuery createSqlQuery(String sql) {
-    return serverMgr.getDefaultServer().createSqlQuery(sql);
+    return serverMgr.getDefaultServer().sqlQuery(sql);
  }

  /**
+   * Deprecated - migrate to DB.sqlUpdate().
+   * <p>
   * Create a sql update for executing native dml statements.
   * <p>
   * Use this to execute a Insert Update or Delete statement. The statement will
   * be native to the database and contain database table and column names.
-   * </p>
   * <p>
   * See {@link SqlUpdate} for example usage.
-   * </p>
   */
+  @Deprecated
  public static SqlUpdate createSqlUpdate(String sql) {
-    return serverMgr.getDefaultServer().createSqlUpdate(sql);
+    return serverMgr.getDefaultServer().sqlUpdate(sql);
  }

  /**
@@ -1193,7 +1199,7 @@ public final class Ebean {
   * 	   public void run() {
   * 		   User u1 = Ebean.find(User.class, 1);
   * 		   ...
-   * 	   }
+   *     }
   *   });
   *
   * }</pre>
@@ -1245,7 +1251,7 @@ public final class Ebean {
   * 		   User u1 = Ebean.find(User.class, 1);
   * 		   ...
   * 		   return u1.getEmail();
-   * 	   }
+   *     }
   *   });
   *
   * }</pre>
@@ -48,7 +48,7 @@ public class EbeanServerFactory {
  }

  /**
-   * Create using ebean.properties to configure the server.
+   * Create using ebean.properties to configure the database.
   */
  public static synchronized EbeanServer create(String name) {

@@ -59,7 +59,7 @@ public class EbeanServerFactory {
  }

  /**
-   * Create using the ServerConfig object to configure the server.
+   * Create using the ServerConfig object to configure the database.
   */
  public static synchronized EbeanServer create(ServerConfig config) {

@@ -21,7 +21,7 @@ public class EbeanVersion {
  static {
    try {
      Properties prop = new Properties();
-      try (InputStream in = Ebean.class.getResourceAsStream("/META-INF/maven/io.ebean/ebean/pom.properties")) {
+      try (InputStream in = DB.class.getResourceAsStream("/META-INF/maven/io.ebean/ebean/pom.properties")) {
        if (in != null) {
          prop.load(in);
          in.close();
@@ -0,0 +1,74 @@
+package io.ebean;
+
+import javax.annotation.Nonnull;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Future;
+
+/**
+ * An empty PagedList.
+ * <p>
+ * For use in application code when we need to return a PagedList but don't want to
+ * execute a query.
+ * </p>
+ *
+ * <pre>{@code
+ *
+ *   PagedList<Customer> empty = PagedList.emptyList();
+ *
+ * }</pre>
+ */
+public class EmptyPagedList<T> implements PagedList<T> {
+
+  @Override
+  public void loadCount() {
+    // do nothing
+  }
+
+  @Nonnull
+  @Override
+  public Future<Integer> getFutureCount() {
+    return null;
+  }
+
+  @Nonnull
+  @Override
+  public List<T> getList() {
+    return Collections.emptyList();
+  }
+
+  @Override
+  public int getTotalCount() {
+    return 0;
+  }
+
+  @Override
+  public int getTotalPageCount() {
+    return 0;
+  }
+
+  @Override
+  public int getPageSize() {
+    return 0;
+  }
+
+  @Override
+  public int getPageIndex() {
+    return 0;
+  }
+
+  @Override
+  public boolean hasNext() {
+    return false;
+  }
+
+  @Override
+  public boolean hasPrev() {
+    return false;
+  }
+
+  @Override
+  public String getDisplayXtoYofZ(String to, String of) {
+    return "";
+  }
+}
@@ -34,14 +34,14 @@ public class Expr {
   * Equal To - property equal to the given value.
   */
  public static Expression eq(String propertyName, Object value) {
-    return Ebean.getExpressionFactory().eq(propertyName, value);
+    return DB.getExpressionFactory().eq(propertyName, value);
  }

  /**
   * Not Equal To - property not equal to the given value.
   */
  public static Expression ne(String propertyName, Object value) {
-    return Ebean.getExpressionFactory().ne(propertyName, value);
+    return DB.getExpressionFactory().ne(propertyName, value);
  }

  /**
@@ -49,7 +49,7 @@ public class Expr {
   * using a lower() function to make it case insensitive).
   */
  public static Expression ieq(String propertyName, String value) {
-    return Ebean.getExpressionFactory().ieq(propertyName, value);
+    return DB.getExpressionFactory().ieq(propertyName, value);
  }

  /**
@@ -59,28 +59,28 @@ public class Expr {
   * </p>
   */
  public static Expression inRange(String propertyName, Object value1, Object value2) {
-    return Ebean.getExpressionFactory().inRange(propertyName, value1, value2);
+    return DB.getExpressionFactory().inRange(propertyName, value1, value2);
  }

  /**
   * Between - property between the two given values.
   */
  public static Expression between(String propertyName, Object value1, Object value2) {
-    return Ebean.getExpressionFactory().between(propertyName, value1, value2);
+    return DB.getExpressionFactory().between(propertyName, value1, value2);
  }

  /**
   * Between - value between two given properties.
   */
  public static Expression between(String lowProperty, String highProperty, Object value) {
-    return Ebean.getExpressionFactory().betweenProperties(lowProperty, highProperty, value);
+    return DB.getExpressionFactory().betweenProperties(lowProperty, highProperty, value);
  }

  /**
   * Greater Than - property greater than the given value.
   */
  public static Expression gt(String propertyName, Object value) {
-    return Ebean.getExpressionFactory().gt(propertyName, value);
+    return DB.getExpressionFactory().gt(propertyName, value);
  }

  /**
@@ -88,42 +88,42 @@ public class Expr {
   * value.
   */
  public static Expression ge(String propertyName, Object value) {
-    return Ebean.getExpressionFactory().ge(propertyName, value);
+    return DB.getExpressionFactory().ge(propertyName, value);
  }

  /**
   * Less Than - property less than the given value.
   */
  public static Expression lt(String propertyName, Object value) {
-    return Ebean.getExpressionFactory().lt(propertyName, value);
+    return DB.getExpressionFactory().lt(propertyName, value);
  }

  /**
   * Less Than or Equal to - property less than or equal to the given value.
   */
  public static Expression le(String propertyName, Object value) {
-    return Ebean.getExpressionFactory().le(propertyName, value);
+    return DB.getExpressionFactory().le(propertyName, value);
  }

  /**
   * Is Null - property is null.
   */
  public static Expression isNull(String propertyName) {
-    return Ebean.getExpressionFactory().isNull(propertyName);
+    return DB.getExpressionFactory().isNull(propertyName);
  }

  /**
   * Is Not Null - property is not null.
   */
  public static Expression isNotNull(String propertyName) {
-    return Ebean.getExpressionFactory().isNotNull(propertyName);
+    return DB.getExpressionFactory().isNotNull(propertyName);
  }

  /**
   * Case insensitive {@link #exampleLike(Object)}
   */
  public static ExampleExpression iexampleLike(Object example) {
-    return Ebean.getExpressionFactory().iexampleLike(example);
+    return DB.getExpressionFactory().iexampleLike(example);
  }

  /**
@@ -131,14 +131,14 @@ public class Expr {
   * LikeType.RAW (you need to add you own wildcards % and _).
   */
  public static ExampleExpression exampleLike(Object example) {
-    return Ebean.getExpressionFactory().exampleLike(example);
+    return DB.getExpressionFactory().exampleLike(example);
  }

  /**
   * Create the query by Example expression specifying more options.
   */
  public static ExampleExpression exampleLike(Object example, boolean caseInsensitive, LikeType likeType) {
-    return Ebean.getExpressionFactory().exampleLike(example, caseInsensitive, likeType);
+    return DB.getExpressionFactory().exampleLike(example, caseInsensitive, likeType);
  }

  /**
@@ -146,7 +146,7 @@ public class Expr {
   * characters % (percentage) and _ (underscore).
   */
  public static Expression like(String propertyName, String value) {
-    return Ebean.getExpressionFactory().like(propertyName, value);
+    return DB.getExpressionFactory().like(propertyName, value);
  }

  /**
@@ -155,14 +155,14 @@ public class Expr {
   * a lower() function to make the expression case insensitive.
   */
  public static Expression ilike(String propertyName, String value) {
-    return Ebean.getExpressionFactory().ilike(propertyName, value);
+    return DB.getExpressionFactory().ilike(propertyName, value);
  }

  /**
   * Starts With - property like value%.
   */
  public static Expression startsWith(String propertyName, String value) {
-    return Ebean.getExpressionFactory().startsWith(propertyName, value);
+    return DB.getExpressionFactory().startsWith(propertyName, value);
  }

  /**
@@ -170,14 +170,14 @@ public class Expr {
   * lower() function to make the expression case insensitive.
   */
  public static Expression istartsWith(String propertyName, String value) {
-    return Ebean.getExpressionFactory().istartsWith(propertyName, value);
+    return DB.getExpressionFactory().istartsWith(propertyName, value);
  }

  /**
   * Ends With - property like %value.
   */
  public static Expression endsWith(String propertyName, String value) {
-    return Ebean.getExpressionFactory().endsWith(propertyName, value);
+    return DB.getExpressionFactory().endsWith(propertyName, value);
  }

  /**
@@ -185,14 +185,14 @@ public class Expr {
   * function to make the expression case insensitive.
   */
  public static Expression iendsWith(String propertyName, String value) {
-    return Ebean.getExpressionFactory().iendsWith(propertyName, value);
+    return DB.getExpressionFactory().iendsWith(propertyName, value);
  }

  /**
   * Contains - property like %value%.
   */
  public static Expression contains(String propertyName, String value) {
-    return Ebean.getExpressionFactory().contains(propertyName, value);
+    return DB.getExpressionFactory().contains(propertyName, value);
  }

  /**
@@ -200,42 +200,42 @@ public class Expr {
   * function to make the expression case insensitive.
   */
  public static Expression icontains(String propertyName, String value) {
-    return Ebean.getExpressionFactory().icontains(propertyName, value);
+    return DB.getExpressionFactory().icontains(propertyName, value);
  }

  /**
   * For collection properties that are empty (have not existing elements).
   */
  public static Expression isEmpty(String propertyName) {
-    return Ebean.getExpressionFactory().isEmpty(propertyName);
+    return DB.getExpressionFactory().isEmpty(propertyName);
  }

  /**
   * For collection properties that are not empty (have existing elements).
   */
  public static Expression isNotEmpty(String propertyName) {
-    return Ebean.getExpressionFactory().isNotEmpty(propertyName);
+    return DB.getExpressionFactory().isNotEmpty(propertyName);
  }

  /**
   * In - property has a value in the array of values.
   */
  public static Expression in(String propertyName, Object[] values) {
-    return Ebean.getExpressionFactory().in(propertyName, values);
+    return DB.getExpressionFactory().in(propertyName, values);
  }

  /**
   * In - using a subQuery.
   */
  public static Expression in(String propertyName, Query<?> subQuery) {
-    return Ebean.getExpressionFactory().in(propertyName, subQuery);
+    return DB.getExpressionFactory().in(propertyName, subQuery);
  }

  /**
   * In - property has a value in the collection of values.
   */
  public static Expression in(String propertyName, Collection<?> values) {
-    return Ebean.getExpressionFactory().in(propertyName, values);
+    return DB.getExpressionFactory().in(propertyName, values);
  }

  /**
@@ -272,14 +272,14 @@ public class Expr {
   * }</pre>
   */
  public static Expression inOrEmpty(String propertyName, Collection<?> values) {
-    return Ebean.getExpressionFactory().inOrEmpty(propertyName, values);
+    return DB.getExpressionFactory().inOrEmpty(propertyName, values);
  }

  /**
   * Id Equal to - ID property is equal to the value.
   */
  public static Expression idEq(Object value) {
-    return Ebean.getExpressionFactory().idEq(value);
+    return DB.getExpressionFactory().idEq(value);
  }

  /**
@@ -292,7 +292,7 @@ public class Expr {
   * @param propertyMap a map keyed by property names.
   */
  public static Expression allEq(Map<String, Object> propertyMap) {
-    return Ebean.getExpressionFactory().allEq(propertyMap);
+    return DB.getExpressionFactory().allEq(propertyMap);
  }

  /**
@@ -303,7 +303,7 @@ public class Expr {
   * </p>
   */
  public static Expression raw(String raw, Object value) {
-    return Ebean.getExpressionFactory().raw(raw, value);
+    return DB.getExpressionFactory().raw(raw, value);
  }

  /**
@@ -314,14 +314,14 @@ public class Expr {
   * </p>
   */
  public static Expression raw(String raw, Object[] values) {
-    return Ebean.getExpressionFactory().raw(raw, values);
+    return DB.getExpressionFactory().raw(raw, values);
  }

  /**
   * Add raw expression with no parameters.
   */
  public static Expression raw(String raw) {
-    return Ebean.getExpressionFactory().raw(raw);
+    return DB.getExpressionFactory().raw(raw);
  }

  /**
@@ -329,7 +329,7 @@ public class Expr {
   */
  public static Expression and(Expression expOne, Expression expTwo) {

-    return Ebean.getExpressionFactory().and(expOne, expTwo);
+    return DB.getExpressionFactory().and(expOne, expTwo);
  }

  /**
@@ -337,7 +337,7 @@ public class Expr {
   */
  public static Expression or(Expression expOne, Expression expTwo) {

-    return Ebean.getExpressionFactory().or(expOne, expTwo);
+    return DB.getExpressionFactory().or(expOne, expTwo);
  }

  /**
@@ -345,7 +345,7 @@ public class Expr {
   */
  public static Expression not(Expression exp) {

-    return Ebean.getExpressionFactory().not(exp);
+    return DB.getExpressionFactory().not(exp);
  }

  /**
@@ -353,7 +353,7 @@ public class Expr {
   */
  public static <T> Junction<T> conjunction(Query<T> query) {

-    return Ebean.getExpressionFactory().conjunction(query);
+    return DB.getExpressionFactory().conjunction(query);
  }

  /**
@@ -361,6 +361,6 @@ public class Expr {
   */
  public static <T> Junction<T> disjunction(Query<T> query) {

-    return Ebean.getExpressionFactory().disjunction(query);
+    return DB.getExpressionFactory().disjunction(query);
  }
 }
@@ -30,7 +30,7 @@ import java.util.function.Predicate;
 * </p>
 * <p>
 * The ExpressionList also duplicates methods that are found on the Query such
- * as findList() and orderBy(). The purpose of these methods is provide a fluid
+ * as findList() and order(). The purpose of these methods is provide a fluid
 * API. The upside of this approach is that you can build and execute a query
 * via chained methods. The down side is that this ExpressionList object has
 * more methods than you would initially expect (the ones duplicated from
@@ -52,6 +52,14 @@ public interface ExpressionList<T> {
   */
  Query<T> query();

+  /**
+   * Controls, if paginated queries should always append an 'order by id' statement at the end to
+   * guarantee a deterministic sort result. This may affect performance.
+   * If this is not enabled, and an orderBy is set on the query, it's up to the programmer that
+   * this query provides a deterministic result.
+   */
+  Query<T> orderById(boolean orderById);
+
  /**
   * Set the order by clause replacing the existing order by clause if there is
   * one.
@@ -59,12 +67,8 @@ public interface ExpressionList<T> {
   * This follows SQL syntax using commas between each property with the
   * optional asc and desc keywords representing ascending and descending order
   * respectively.
-   * </p>
-   * <p>
-   * This is EXACTLY the same as {@link #orderBy(String)}.
-   * </p>
   */
-  Query<T> order(String orderByClause);
+  ExpressionList<T> order(String orderByClause);

  /**
   * Return the OrderBy so that you can append an ascending or descending
@@ -77,27 +81,21 @@ public interface ExpressionList<T> {
  OrderBy<T> order();

  /**
-   * Return the OrderBy so that you can append an ascending or descending
-   * property to the order by clause.
-   * <p>
-   * This will never return a null. If no order by clause exists then an 'empty'
-   * OrderBy object is returned.
-   * </p>
+   * Deprecated migrate to order().
   */
+  @Deprecated
  OrderBy<T> orderBy();

  /**
-   * Add an orderBy clause to the query.
-   *
-   * @see Query#orderBy(String)
+   * Deprecated migrate to {@link #order(String)}
   */
+  @Deprecated
  Query<T> orderBy(String orderBy);

  /**
-   * Add an orderBy clause to the query.
-   *
-   * @see Query#orderBy(String)
+   * Deprecated migrate to {@link #order(String)}
   */
+  @Deprecated
  Query<T> setOrderBy(String orderBy);

  /**
@@ -334,7 +332,7 @@ public interface ExpressionList<T> {
   *  List<String> names =
   *    DB.find(Customer.class)
   *      .select("name")
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .findSingleAttributeList();
   *
   * }</pre>
@@ -347,7 +345,7 @@ public interface ExpressionList<T> {
   *      .setDistinct(true)
   *      .select("name")
   *      .where().eq("status", Customer.Status.NEW)
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .setMaxRows(100)
   *      .findSingleAttributeList();
   *
@@ -508,7 +506,7 @@ public interface ExpressionList<T> {
   * @param expressions  Filter expressions with and, or and ? or ?1 type bind parameters
   * @param params       Bind parameters used in the expressions
   */
-  Query<T> filterMany(String manyProperty, String expressions, Object... params);
+  ExpressionList<T> filterMany(String manyProperty, String expressions, Object... params);

  /**
   * Specify specific properties to fetch on the main/root bean (aka partial
@@ -559,14 +557,14 @@ public interface ExpressionList<T> {
   *
   * @see Query#setFirstRow(int)
   */
-  Query<T> setFirstRow(int firstRow);
+  ExpressionList<T> setFirstRow(int firstRow);

  /**
   * Set the maximum number of rows to fetch.
   *
   * @see Query#setMaxRows(int)
   */
-  Query<T> setMaxRows(int maxRows);
+  ExpressionList<T> setMaxRows(int maxRows);

  /**
   * Set the name of the property which values become the key of a map.
@@ -1451,7 +1449,7 @@ public interface ExpressionList<T> {
   *        .eq("status", Customer.Status.ACTIVE)
   *        .gt("id", 0)
   *        .endAnd()
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .findList();
   * }</pre>
   */
@@ -1472,7 +1470,7 @@ public interface ExpressionList<T> {
   *    .or()
   *      .eq("status", Customer.Status.ACTIVE)
   *      .isNull("anniversary")
-   *    .orderBy().asc("name")
+   *    .order().asc("name")
   *    .findList();
   *
   * }</pre>
@@ -1492,7 +1490,7 @@ public interface ExpressionList<T> {
   *        .eq("status", Customer.Status.ACTIVE)
   *        .gt("id", 0)
   *        .endAnd()
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .findList();
   *
   * }</pre>
@@ -1526,7 +1524,7 @@ public interface ExpressionList<T> {
   *       .gt("id", 1)
   *       .eq("anniversary", onAfter)
   *       .endNot()
-   *     .orderBy()
+   *     .order()
   *       .asc("name")
   *     .findList();
   *
@@ -1,8 +1,5 @@
 package io.ebean;

-import io.ebeaninternal.api.SpiQuery;
-import io.ebeaninternal.api.SpiTransaction;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.persistence.NonUniqueResultException;
@@ -70,7 +67,7 @@ public interface ExtendedServer {
   *
   * @return True if the query finds a matching row in the database
   */
-  <T> boolean exists(SpiQuery<?> ormQuery, SpiTransaction transaction);
+  <T> boolean exists(Query<?> ormQuery, Transaction transaction);

  /**
   * Return the number of 'top level' or 'root' entities this query should return.
@@ -360,7 +357,7 @@ public interface ExtendedServer {
   *  List<String> names =
   *    DB.find(Customer.class)
   *      .select("name")
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .findSingleAttributeList();
   *
   * }</pre>
@@ -372,7 +369,7 @@ public interface ExtendedServer {
   *      .setDistinct(true)
   *      .select("name")
   *      .where().eq("status", Customer.Status.NEW)
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .setMaxRows(100)
   *      .findSingleAttributeList();
   *
@@ -86,7 +86,7 @@ public interface Filter<T> {
   * expressions.
   * </p>
   * <p>
-   * Refer to {@link Ebean#sort(List, String)} for more detail.
+   * Refer to {@link DB#sort(List, String)} for more detail.
   * </p>
   */
  Filter<T> sort(String sortByClause);
@@ -32,7 +32,7 @@ import java.util.List;
 *   public List<Customer> findNew() {
 *     return query().where()
 *       .eq("status", Customer.Status.NEW)
- *       .orderBy("name")
+ *       .order("name")
 *       .findList()
 *   }
 * }
@@ -192,6 +192,13 @@ public abstract class Model {
    db().save(this);
  }

+  /**
+   * Save this entity with an explicit transaction.
+   */
+  public void save(Transaction transaction) {
+    db().save(this, transaction);
+  }
+
  /**
   * Flush any batched changes to the database.
   * <p>
@@ -212,6 +219,13 @@ public abstract class Model {
    db().update(this);
  }

+  /**
+   * Update this entity with an explicit transaction.
+   */
+  public void update(Transaction transaction) {
+    db().update(this, transaction);
+  }
+
  /**
   * Insert this entity.
   *
@@ -221,6 +235,13 @@ public abstract class Model {
    db().insert(this);
  }

+  /**
+   * Insert with an explicit transaction.
+   */
+  public void insert(Transaction transaction) {
+    db().insert(this, transaction);
+  }
+
  /**
   * Delete this bean.
   * <p>
@@ -242,6 +263,13 @@ public abstract class Model {
    return db().delete(this);
  }

+  /**
+   * Delete this entity with an explicit transaction.
+   */
+  public boolean delete(Transaction transaction) {
+    return db().delete(this, transaction);
+  }
+
  /**
   * Delete a bean permanently without soft delete.
   * <p>
@@ -255,6 +283,13 @@ public abstract class Model {
    return db().deletePermanent(this);
  }

+  /**
+   * Delete a bean permanently without soft delete using an explicit transaction.
+   */
+  public boolean deletePermanent(Transaction transaction) {
+    return db().deletePermanent(this, transaction);
+  }
+
  /**
   * Refreshes this entity from the database.
   *
@@ -60,6 +60,13 @@ import java.util.concurrent.Future;
 */
 public interface PagedList<T> {

+  /**
+   * Return an empty PagedList.
+   */
+  static <B> PagedList<B> emptyList() {
+    return new EmptyPagedList<>();
+  }
+
  /**
   * Initiate the loading of the total row count in the background.
   * <pre>{@code
@@ -30,7 +30,7 @@ import java.util.List;
 *   .where()
 *   .eq("store", "def")
 *   .inPairs(pairs)       // IN clause with 'pairs' of values
- *   .orderBy("sku desc")
+ *   .order("sku desc")
 *
 *   // query expressions cover the natural key properties
 *   // so we can choose to hit the L2 bean cache if we want
@@ -1,38 +1,36 @@
 package io.ebean;

-import io.ebean.config.properties.PropertiesLoader;
+import io.avaje.config.Config;

 import java.util.Properties;

 /**
- * Provides singleton state for the default server.
+ * Provides singleton state for the default database.
 * <p/>
- * Intended for internal use as part of bootup, construction, registration of the default server.
+ * Intended for internal use as part of bootup, construction, registration of the default database.
 */
 class PrimaryServer {

-  private static Properties globalProperties;
-
  private static String defaultServerName;

  private static boolean skip;

  /**
-   * Set whether to skip automatically creating the primary server.
+   * Set whether to skip automatically creating the primary database.
   */
  static synchronized void setSkip(boolean skip) {
    PrimaryServer.skip = skip;
  }

  /**
-   * Return true to skip automatically creating the primary server.
+   * Return true to skip automatically creating the primary database.
   */
  static synchronized boolean isSkip() {
    return skip;
  }

  /**
-   * Return the default server name.
+   * Return the default database name.
   */
  static synchronized String getDefaultServerName() {
    getProperties();
@@ -43,14 +41,10 @@ class PrimaryServer {
   * Return the default configuration Properties.
   */
  static synchronized Properties getProperties() {
-    if (globalProperties == null) {
-      globalProperties = PropertiesLoader.load();
-    }
    if (defaultServerName == null) {
      defaultServerName = determineDefaultServerName();
    }
-    return globalProperties;
-
+    return Config.asProperties();
  }

  /**
@@ -62,15 +56,9 @@ class PrimaryServer {
    defaultServerName = System.getProperty("db", defaultServerName);
    defaultServerName = System.getProperty("ebean_db", defaultServerName);
    if (isEmpty(defaultServerName)) {
-      defaultServerName = System.getProperty("datasource.default");
+      defaultServerName = Config.get("datasource.default", null);
      if (isEmpty(defaultServerName)) {
-        defaultServerName = System.getProperty("ebean.default.datasource");
-        if (isEmpty(defaultServerName)) {
-          defaultServerName = globalProperties.getProperty("datasource.default");
-          if (isEmpty(defaultServerName)) {
-            defaultServerName = globalProperties.getProperty("ebean.default.datasource");
-          }
-        }
+        defaultServerName = Config.get("ebean.default.datasource", null);
      }
    }
    if (defaultServerName == null) {
@@ -31,22 +31,37 @@ public interface ProfileLocation {
  }

  /**
-   * Obtain the location description.
+   * Obtain the description returning true if this is the initial call.
   */
-  String obtain();
+  boolean obtain();

  /**
   * Return a short version of the location description.
   */
-  String shortDescription();
+  String location();

  /**
   * Return the short label.
   */
  String label();

+  /**
+   * Return the full location.
+   */
+  String fullLocation();
+
  /**
   * Add execution time.
   */
  void add(long executionTime);
+
+  /**
+   * Return true if this request should be traced.
+   */
+  boolean trace();
+
+  /**
+   * Set the number of times to trace the transactions for this profile location.
+   */
+  void setTraceCount(int traceCount);
 }
@@ -25,7 +25,7 @@ import java.util.stream.Stream;
 *     .where()
 *       .like("customer.name","rob%")
 *       .gt("orderDate",lastWeek)
- *     .orderBy("customer.id, id desc")
+ *     .order("customer.id, id desc")
 *     .setMaxRows(50)
 *     .findList();
 *
@@ -656,6 +656,11 @@ public interface Query<T> {
   */
  Query<T> usingConnection(Connection connection);

+  /**
+   * Execute the query using the given database.
+   */
+  Query<T> usingDatabase(Database database);
+
  /**
   * Execute the query returning the list of Id's.
   * <p>
@@ -885,7 +890,7 @@ public interface Query<T> {
   *  List<String> names =
   *    DB.find(Customer.class)
   *      .select("name")
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .findSingleAttributeList();
   *
   * }</pre>
@@ -898,7 +903,7 @@ public interface Query<T> {
   *      .setDistinct(true)
   *      .select("name")
   *      .where().eq("status", Customer.Status.NEW)
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .setMaxRows(100)
   *      .findSingleAttributeList();
   *
@@ -1183,6 +1188,30 @@ public interface Query<T> {
   */
  Query<T> setParameter(int position, Object value);

+  /**
+   * Bind the next positioned parameter.
+   *
+   * <pre>{@code
+   *
+   * // a query with a positioned parameters
+   * String oql = "where status = ? and name = ?";
+   *
+   * List<Order> list = DB.createQuery(Order.class, oql)
+   *   .setParameter(OrderStatus.NEW)
+   *   .setParameter("Rob")
+   *   .findList();
+   *
+   * }</pre>
+   */
+  Query<T> setParameter(Object value);
+
+  /**
+   * Bind all the positioned parameters.
+   * <p>
+   * A convenience for multiple calls to {@link #setParameter(Object)}
+   */
+  Query<T> setParameters(Object... values);
+
  /**
   * Set the Id value to query. This is used with findOne().
   * <p>
@@ -1323,17 +1352,9 @@ public interface Query<T> {
  Query<T> having(Expression addExpressionToHaving);

  /**
-   * Set the order by clause replacing the existing order by clause if there is
-   * one.
-   * <p>
-   * This follows SQL syntax using commas between each property with the
-   * optional asc and desc keywords representing ascending and descending order
-   * respectively.
-   * </p>
-   * <p>
-   * This is EXACTLY the same as {@link #order(String)}.
-   * </p>
+   * Deprecated migrate to {@link #order(String)}
   */
+  @Deprecated
  Query<T> orderBy(String orderByClause);

  /**
@@ -1343,10 +1364,6 @@ public interface Query<T> {
   * This follows SQL syntax using commas between each property with the
   * optional asc and desc keywords representing ascending and descending order
   * respectively.
-   * </p>
-   * <p>
-   * This is EXACTLY the same as {@link #orderBy(String)}.
-   * </p>
   */
  Query<T> order(String orderByClause);

@@ -1356,40 +1373,24 @@ public interface Query<T> {
   * <p>
   * This will never return a null. If no order by clause exists then an 'empty'
   * OrderBy object is returned.
-   * </p>
-   * <p>
-   * This is EXACTLY the same as {@link #orderBy()}.
-   * </p>
   */
  OrderBy<T> order();

  /**
-   * Return the OrderBy so that you can append an ascending or descending
-   * property to the order by clause.
-   * <p>
-   * This will never return a null. If no order by clause exists then an 'empty'
-   * OrderBy object is returned.
-   * </p>
-   * <p>
-   * This is EXACTLY the same as {@link #order()}.
-   * </p>
+   * Deprecated migrate to order().
   */
+  @Deprecated
  OrderBy<T> orderBy();

  /**
   * Set an OrderBy object to replace any existing OrderBy clause.
-   * <p>
-   * This is EXACTLY the same as {@link #setOrderBy(OrderBy)}.
-   * </p>
   */
  Query<T> setOrder(OrderBy<T> orderBy);

  /**
-   * Set an OrderBy object to replace any existing OrderBy clause.
-   * <p>
-   * This is EXACTLY the same as {@link #setOrder(OrderBy)}.
-   * </p>
+   * Deprecated migrate to {@link #setOrder(OrderBy)}
   */
+  @Deprecated
  Query<T> setOrderBy(OrderBy<T> orderBy);

  /**
@@ -1524,17 +1525,6 @@ public interface Query<T> {
    return setUseQueryCache(enabled ? CacheMode.ON : CacheMode.OFF);
  }

-  /**
-   * Set an id to identify this query for profiling purposes.
-   * <p>
-   * The profileId is expected to be unique for a given bean type.
-   * </p>
-   * <p>
-   * Note that the profileId is treated as a short internally and has a MAX value of 32,767.
-   * </p>
-   */
-  Query<T> setProfileId(int profileId);
-
  /**
   * Set the profile location of this query. This is used to relate query execution metrics
   * back to a location like a specific line of code.
@@ -23,9 +23,9 @@ import java.util.Iterator;
 * <h3>Try finally style</h3>
 * <pre>{@code
 *
- *  Query<Customer> query = server.find(Customer.class)
+ *  Query<Customer> query = database.find(Customer.class)
 *     .where().gt("id", 0)
- *     .orderBy("id")
+ *     .order("id")
 *     .setMaxRows(2);
 *
 *  QueryIterator<Customer> it = query.findIterate();
@@ -18,7 +18,7 @@ import java.sql.SQLException;
 * <pre>{@code
 *
 *    //
- *    // A mapper from ResultSet into our CustomerDto bean
+ *    // Map from ResultSet to CustomerDto bean
 *    //
 *    class CustomerMapper implements RowMapper<CustomerDto> {
 *
@@ -42,7 +42,8 @@ import java.sql.SQLException;
 *
 *  CustomerDto rob = DB.sqlQuery(sql)
 *    .setParameter(1, "Rob")
- *    .findOne(CUSTOMER_MAPPER);
+ *    .mapTo(CUSTOMER_MAPPER)
+ *    .findOne();
 *
 *
 * }</pre>
@@ -50,4 +50,13 @@ public interface ScriptRunner {
   */
  void run(URL resource, Map<String, String> placeholderMap);

+  /**
+   * Run the raw provided DDL or SQL script.
+   *
+   * @param name          The name of the script for logging purposes
+   * @param content       The SQL content
+   * @param useAutoCommit Set to true to use auto commit true and continue when any errors occur
+   */
+  void runScript(String name, String content, boolean useAutoCommit);
+
 }
@@ -75,17 +75,15 @@ public interface SqlQuery extends Serializable {
  SqlRow findOne();

  /**
-   * Execute the query returning a single result using the mapper.
-   *
-   * @param mapper Used to map each ResultSet row into the result object.
+   * Deprecated migrate to use {@link #mapTo(RowMapper)}
   */
+  @Deprecated
  <T> T findOne(RowMapper<T> mapper);

  /**
-   * Execute the query returning a list using the mapper.
-   *
-   * @param mapper Used to map each ResultSet row into the result object.
+   * Deprecated migrate to use {@link #mapTo(RowMapper)}
   */
+  @Deprecated
  <T> List<T> findList(RowMapper<T> mapper);

  /**
@@ -125,77 +123,53 @@ public interface SqlQuery extends Serializable {
  Optional<SqlRow> findOneOrEmpty();

  /**
-   * Execute the query returning a single scalar attribute.
-   * <pre>@{code
+   * Deprecated - migrate to <code>.mapToScalar(attributeType).findOne()</code>.
+   * <pre>{@code
   *
-   *   String sql = "select max(unit_price) from o_order_detail where order_qty > ?";
-   *
-   *   BigDecimal maxPrice = DB.sqlQuery(sql)
-   *     .setParameter(1, 2)
-   *     .findSingleAttribute(BigDecimal.class);
-   *
-   * }</pre>
-   *
-   * <p>
-   * The attributeType can be any scalar type that Ebean supports (includes javax time types, Joda types etc).
-   * </p>
-   *
-   * @param attributeType The type of the returned value
+   *    .mapToScalar(BigDecimal.class)
+   *    .findOne();
+   * }
   */
+  @Deprecated
  <T> T findSingleAttribute(Class<T> attributeType);

  /**
-   * Execute the query returning a single BigDecimal value.
-   * <p>
-   * This is an alias for <code>findSingleAttribute(BigDecimal.class)</code>
-   * </p>
+   * Deprecated - migrate to <code>.mapToScalar(BigDecimal.class).findOne()</code>.
+   * <pre>{@code
+   *
+   *    .mapToScalar(BigDecimal.class)
+   *    .findOne();
+   * }
   */
+  @Deprecated
  BigDecimal findSingleDecimal();

  /**
-   * Execute the query returning a single Long value.
-   * <p>
-   * This is an alias for <code>findSingleAttribute(Long.class)</code>
-   * </p>
+   * Deprecated - migrate to <code>.mapToScalar(Long.class).findOne()</code>.
+   * <pre>{@code
+   *
+   *    .mapToScalar(Long.class)
+   *    .findOne();
+   * }
   */
+  @Deprecated
  Long findSingleLong();

  /**
-   * Execute the query returning a list of scalar attribute values.
-   *
+   * Deprecated - migrate to <code>.mapToScalar(Long.class).findList()</code>.
   * <pre>{@code
   *
-   *   String sql =
-   *   " select (unit_price * order_qty) " +
-   *   " from o_order_detail " +
-   *   " where unit_price > ? " +
-   *   " order by (unit_price * order_qty) desc";
-   *
-   *   //
-   *   List<BigDecimal> lineAmounts =
-   *     DB.sqlQuery(sql)
-   *       .setParameter(1, 3)
-   *       .findSingleAttributeList(BigDecimal.class);
-   *
-   * }</pre>
-   *
-   * <p>
-   * The attributeType can be any scalar type that Ebean supports (includes javax time types, Joda types etc).
-   * </p>
-   *
-   * @param attributeType The type of the returned value
+   *    .mapToScalar(Long.class)
+   *    .findList();
+   * }
   */
+  @Deprecated
  <T> List<T> findSingleAttributeList(Class<T> attributeType);

-  /**
-   * The same as bind for named parameters.
-   */
-  SqlQuery setParameter(String name, Object value);
-
  /**
   * Set one of more positioned parameters.
   * <p>
-   * This is a convenient alternative to multiple calls setParameter().
+   * This is a convenient alternative to multiple calls to {@link #setParameter(Object)}.
   *
   * <pre>{@code
   *
@@ -203,27 +177,67 @@ public interface SqlQuery extends Serializable {
   *
   *   List<SqlRow> list =
   *     DB.sqlQuery(sql)
-   *       .setParams("Rob", Status.NEW)
+   *       .setParameters("Rob", Status.NEW)
   *       .findList();
   *
   *
-   *   // is the same as ...
+   *   // effectively the same as ...
+   *
+   *       .setParameter("Rob")
+   *       .setParameter("Status.NEW)
+   *
+   *   // and ...
   *
-   *   List<SqlRow> list =
-   *     DB.sqlQuery(sql)
   *       .setParameter(1, "Rob")
   *       .setParameter(2, "Status.NEW)
-   *       .findList();
   *
   * }</pre>
   */
+  SqlQuery setParameters(Object... values);
+
+  /**
+   * Deprecated migrate to setParameters(Object... values)
+   */
+  @Deprecated
  SqlQuery setParams(Object... values);

  /**
-   * The same as bind for positioned parameters.
+   * Set the next bind parameter by position.
+   * <pre>{@code
+   *
+   *   String sql = "select id, name from customer where name like ? and status = ?";
+   *
+   *   List<SqlRow> list =
+   *     DB.sqlQuery(sql)
+   *       .setParameter("Rob")
+   *       .setParameter("Status.NEW)
+   *       .findList();
+   *
+   *   // the same as ...
+   *
+   *       .setParameters("Rob", Status.NEW)
+   *
+   *   // and ...
+   *
+   *       .setParameter(1, "Rob")
+   *       .setParameter(2, "Status.NEW)
+   *
+   * }</pre>
+   *
+   * @param value The value to bind
+   */
+  SqlQuery setParameter(Object value);
+
+  /**
+   * Bind the parameter by its index position (1 based like JDBC).
   */
  SqlQuery setParameter(int position, Object value);

+  /**
+   * Bind the named parameter value.
+   */
+  SqlQuery setParameter(String name, Object value);
+
  /**
   * Set the index of the first row of the results to return.
   */
@@ -260,4 +274,59 @@ public interface SqlQuery extends Serializable {
   */
  SqlQuery setBufferFetchSizeHint(int bufferFetchSizeHint);

+  /**
+   * The query result maps to a single scalar value like Long, BigDecimal,
+   * String, UUID, OffsetDateTime etc.
+   * <p>
+   * Any scalar type Ebean is aware of can be used including java time
+   * types like Instant, LocalDate, OffsetDateTime, UUID, Inet, Cdir etc.
+   *
+   * <pre>{@code
+   *
+   *   String sql = " select min(updtime) from o_order_detail " +
+   *                " where unit_price > ? and updtime is not null ";
+   *
+   *   OffsetDateTime minCreated = DB.sqlQuery(sql)
+   *     .setParameter(42)
+   *     .mapToScalar(OffsetDateTime.class)
+   *     .findOne();
+   *
+   * }</pre>
+   *
+   * @param attributeType The type the result is returned as
+   * @return The query to execute via findOne() findList() etc
+   */
+  <T> TypeQuery<T> mapToScalar(Class<T> attributeType);
+
+  /**
+   * Use a RowMapper to map the result to beans.
+   *
+   * @param mapper Maps rows to beans
+   * @param <T>    The type of beans mapped to
+   * @return The query to execute by findOne() findList() etc
+   */
+  <T> TypeQuery<T> mapTo(RowMapper<T> mapper);
+
+  /**
+   * Query mapping to single scalar values.
+   *
+   * @param <T> The type of the scalar values
+   */
+  interface TypeQuery<T> {
+
+    /**
+     * Return the single value.
+     */
+    T findOne();
+
+    /**
+     * Return the single value that is optional.
+     */
+    Optional<T> findOneOrEmpty();
+
+    /**
+     * Return the list of values.
+     */
+    List<T> findList();
+  }
 }
@@ -126,8 +126,6 @@ public interface SqlUpdate {
   * {@link Transaction#setBatchMode(boolean)} and
   * {@link Transaction#setBatchSize(int)}.
   * </p>
-   *
-   * @see Ebean#execute(SqlUpdate)
   */
  int execute();

@@ -241,28 +239,47 @@ public interface SqlUpdate {
   *   String sql = "insert into audit_log (id, name, version) values (?,?,?)";
   *
   *   DB.sqlUpdate(sql)
-   *       .setParams(UUID.randomUUID(), "Hello", 1)
+   *       .setParameters(UUID.randomUUID(), "Hello", 1)
   *       .executeNow();
   *
   *
   *   // is the same as ...
   *
   *   DB.sqlUpdate(sql)
+   *       .setParameter(UUID.randomUUID())
+   *       .setParameter("Hello")
+   *       .setParameter(1)
+   *       .executeNow();
+   *
+   *   // which is the same as ...
+   *
+   *   DB.sqlUpdate(sql)
   *       .setParameter(1, UUID.randomUUID())
   *       .setParameter(2, "Hello")
   *       .setParameter(3, 1)
   *       .executeNow();
   *
   * }</pre>
-   *
   */
+  SqlUpdate setParameters(Object... values);
+
+  /**
+   * Deprecated migrate to setParameters(Object... values).
+   */
+  @Deprecated
  SqlUpdate setParams(Object... values);

  /**
-   * Set the next positioned parameter.
+   * Set the next bind parameter by position.
   *
   * @param value The value to bind
   */
+  SqlUpdate setParameter(Object value);
+
+  /**
+   * Deprecated migrate to setParameter(value).
+   */
+  @Deprecated
  SqlUpdate setNextParameter(Object value);

  /**
@@ -27,7 +27,7 @@ public interface Transaction extends AutoCloseable {
   * @see Database#currentTransaction()
   */
  static Transaction current() {
-    return Ebean.currentTransaction();
+    return DB.currentTransaction();
  }

  /**
@@ -295,7 +295,7 @@ public interface Transaction extends AutoCloseable {
   *
   * <pre>{@code
   *
-   * try (Transaction transaction = server.beginTransaction()) {
+   * try (Transaction transaction = database.beginTransaction()) {
   *
   *   // turn on JDBC batch
   *   transaction.setBatchMode(true);
@@ -313,12 +313,12 @@ public interface Transaction extends AutoCloseable {
   * <h3>getGeneratedKeys</h3>
   * <p>
   * Often with large batch inserts we want to turn off getGeneratedKeys. We do
-   * this via {@link #setBatchGetGeneratedKeys(boolean)}.
+   * this via {@link #setGetGeneratedKeys(boolean)}.
   * Also note that some JDBC drivers do not support getGeneratedKeys in JDBC batch mode.
   * </p>
   * <pre>{@code
   *
-   * try (Transaction transaction = server.beginTransaction()) {
+   * try (Transaction transaction = database.beginTransaction()) {
   *
   *   transaction.setBatchMode(true);
   *   transaction.setBatchSize(100);
@@ -342,7 +342,7 @@ public interface Transaction extends AutoCloseable {
   * </p>
   * <p>
   * We use {@link #flush()} to explicitly flush the batch and we can use
-   * {@link #setBatchFlushOnQuery(boolean)} and {@link #setBatchFlushOnMixed(boolean)}
+   * {@link #setFlushOnQuery(boolean)} and {@link #setFlushOnMixed(boolean)}
   * to control the automatic flushing behaviour.
   * </p>
   * <p>
@@ -432,7 +432,15 @@ public interface Transaction extends AutoCloseable {
   * number of objects and you don't care about getting back the ids.
   * </p>
   */
-  void setBatchGetGeneratedKeys(boolean getGeneratedKeys);
+  void setGetGeneratedKeys(boolean getGeneratedKeys);
+
+  /**
+   * Deprecated renamed to setGetGeneratedKeys().
+   */
+  @Deprecated
+  default void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
+    setGetGeneratedKeys(getGeneratedKeys);
+  }

  /**
   * By default when mixing UpdateSql (or CallableSql) with Beans the batch is
@@ -449,7 +457,15 @@ public interface Transaction extends AutoCloseable {
   * have a 2 step process (delayed binding).
   * </p>
   */
-  void setBatchFlushOnMixed(boolean batchFlushOnMixed);
+  void setFlushOnMixed(boolean batchFlushOnMixed);
+
+  /**
+   * Deprecated renamed to setFlushOnMixed().
+   */
+  @Deprecated
+  default void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
+    setFlushOnMixed(batchFlushOnMixed);
+  }

  /**
   * By default executing a query will automatically flush any batched
@@ -459,7 +475,15 @@ public interface Transaction extends AutoCloseable {
   * execute a query and the batch will not be automatically flushed.
   * </p>
   */
-  void setBatchFlushOnQuery(boolean batchFlushOnQuery);
+  void setFlushOnQuery(boolean batchFlushOnQuery);
+
+  /**
+   * Deprecated renamed to setFlushOnQuery().
+   */
+  @Deprecated
+  default void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
+    setFlushOnQuery(batchFlushOnQuery);
+  }

  /**
   * Return true if the batch (of persisted beans or executed UpdateSql etc)
@@ -468,7 +492,15 @@ public interface Transaction extends AutoCloseable {
   * The default is for this to be true.
   * </p>
   */
-  boolean isBatchFlushOnQuery();
+  boolean isFlushOnQuery();
+
+  /**
+   * Deprecated renamed to isFlushOnQuery().
+   */
+  @Deprecated
+  default boolean isBatchFlushOnQuery() {
+    return isFlushOnQuery();
+  }

  /**
   * The batch will be flushing automatically but you can use this to explicitly
@@ -12,16 +12,16 @@ import java.util.concurrent.Callable;
 * <p>
 * This information matches the features of the Transactional annotation. You
 * can use it directly with Runnable or Callable via
- * {@link Ebean#execute(TxScope, Runnable)} or
- * {@link Ebean#executeCall(TxScope, Callable)}.
+ * {@link DB#execute(TxScope, Runnable)} or
+ * {@link DB#executeCall(TxScope, Callable)}.
 * </p>
 * <p>
 * This object is used internally with the enhancement of a method with
 * Transactional annotation.
 * </p>
 *
- * @see Ebean#execute(TxScope, Runnable)
- * @see Ebean#executeCall(TxScope, Callable)
+ * @see DB#execute(TxScope, Runnable)
+ * @see DB#executeCall(TxScope, Callable)
 */
 public final class TxScope {

@@ -20,29 +20,23 @@ class XServiceProvider {
  private static SpiFetchGroupService fetchGroupService = initSpiFetchGroupService();

  private static SpiFetchGroupService initSpiFetchGroupService() {
-    Iterator<SpiFetchGroupService> loader = ServiceLoader.load(SpiFetchGroupService.class).iterator();
-    if (loader.hasNext()) {
-      return loader.next();
-    }
-    throw new IllegalStateException("No service implementation found for SpiFetchGroupService?");
+    return loadFirstService(SpiFetchGroupService.class);
  }

  private static SpiRawSqlService initRawSql() {
-
-    Iterator<SpiRawSqlService> loader = ServiceLoader.load(SpiRawSqlService.class).iterator();
-    if (loader.hasNext()) {
-      return loader.next();
-    }
-    throw new IllegalStateException("No service implementation found for SpiRawSqlService?");
+    return loadFirstService(SpiRawSqlService.class);
  }

  private static SpiProfileLocationFactory initProfileLocation() {
+    return loadFirstService(SpiProfileLocationFactory.class);
+  }

-    Iterator<SpiProfileLocationFactory> loader = ServiceLoader.load(SpiProfileLocationFactory.class).iterator();
+  private static <T> T loadFirstService(Class<T> cls) {
+    Iterator<T> loader = ServiceLoader.load(cls).iterator();
    if (loader.hasNext()) {
      return loader.next();
    }
-    throw new IllegalStateException("No service implementation found for SpiProfileLocationFactory?");
+    throw new IllegalStateException("No service implementation found for " + cls);
  }

  /**
@@ -1,6 +1,7 @@
 package io.ebean.bean;

-import io.ebean.Ebean;
+import io.ebean.DB;
+import io.ebean.Database;
 import io.ebean.ValuePair;

 import javax.persistence.EntityNotFoundException;
@@ -39,6 +40,8 @@ public final class EntityBeanIntercept implements Serializable {

  private String ebeanServerName;

+  private boolean deletedFromCollection;
+
  /**
   * The actual entity bean that 'owns' this intercept.
   */
@@ -104,9 +107,6 @@ public final class EntityBeanIntercept implements Serializable {

  /**
   * Create a intercept with a given entity.
-   * <p>
-   * Refer to agent ProxyConstructor.
-   * </p>
   */
  public EntityBeanIntercept(Object ownerBean) {
    this.owner = (EntityBean) ownerBean;
@@ -821,14 +821,14 @@ public final class EntityBeanIntercept implements Serializable {

    synchronized (this) {
      if (beanLoader == null) {
-        BeanLoader serverLoader = (BeanLoader) Ebean.getServer(ebeanServerName);
-        if (serverLoader == null) {
-          throw new PersistenceException("Server [" + ebeanServerName + "] was not found?");
+        final Database database = DB.byName(ebeanServerName);
+        if (database == null) {
+          throw new PersistenceException("Database [" + ebeanServerName + "] was not found?");
        }

        // For stand alone reference bean or after deserialisation lazy load
        // using the ebeanServer. Synchronise only on the bean.
-        loadBeanInternal(loadProperty, serverLoader);
+        loadBeanInternal(loadProperty, database.getPluginApi());
        return;
      }
    }
@@ -915,6 +915,7 @@ public final class EntityBeanIntercept implements Serializable {
  }

  private void preGetterCallback(int propertyIndex) {
+    PreGetterCallback preGetterCallback = this.preGetterCallback;
    if (preGetterCallback != null) {
      preGetterCallback.preGetterTrigger(propertyIndex);
    }
@@ -1139,6 +1140,17 @@ public final class EntityBeanIntercept implements Serializable {
    this.sortOrder = sortOrder;
  }

+  /**
+   * Set if the entity was deleted from a BeanCollection.
+   */
+  public void setDeletedFromCollection(final boolean deletedFromCollection) {
+    this.deletedFromCollection = deletedFromCollection;
+  }
+
+  public boolean isOrphanDelete() {
+    return deletedFromCollection && !isNew();
+  }
+
  /**
   * Set the load error that happened on this property.
   */
@@ -0,0 +1,48 @@
+package io.ebean.bean;
+
+import io.ebean.Database;
+
+/**
+ * BeanLoader used when single beans are loaded (which is usually not ideal / N+1).
+ */
+public abstract class SingleBeanLoader implements BeanLoader {
+
+  protected final Database database;
+
+  SingleBeanLoader(Database database) {
+    this.database = database;
+  }
+
+  @Override
+  public String getName() {
+    return database.getName();
+  }
+
+  /**
+   * Single bean lazy loaded when bean from L2 cache.
+   */
+  public static class L2 extends SingleBeanLoader {
+    public L2(Database database) {
+      super(database);
+    }
+
+    @Override
+    public void loadBean(EntityBeanIntercept ebi) {
+      database.getPluginApi().loadBeanL2(ebi);
+    }
+  }
+
+  /**
+   * Single bean lazy loaded when a reference bean.
+   */
+  public static class Ref extends SingleBeanLoader {
+    public Ref(Database database) {
+      super(database);
+    }
+
+    @Override
+    public void loadBean(EntityBeanIntercept ebi) {
+      database.getPluginApi().loadBeanRef(ebi);
+    }
+  }
+}
@@ -1,6 +1,6 @@
 package io.ebean.common;

-import io.ebean.Ebean;
+import io.ebean.DB;
 import io.ebean.ExpressionList;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollectionLoader;
@@ -93,7 +93,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {

  void lazyLoadCollection(boolean onlyIds) {
    if (loader == null) {
-      loader = (BeanCollectionLoader) Ebean.getServer(ebeanServerName);
+      loader = (BeanCollectionLoader) DB.byName(ebeanServerName);
    }
    loader.loadMany(this, onlyIds);
    checkEmptyLazyLoad();
@@ -1,5 +1,7 @@
 package io.ebean.common;

+import io.ebean.bean.EntityBean;
+
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.LinkedHashSet;
@@ -54,6 +56,11 @@ class ModifyHolder<E> implements Serializable {
  void modifyAddition(E bean) {
    if (bean != null) {
      touched = true;
+
+      if (bean instanceof EntityBean) {
+        ((EntityBean) bean)._ebean_getIntercept().setDeletedFromCollection(false);
+      }
+
      // If it is to delete then just remove the deletion
      if (!undoDeletion(bean)) {
        // Insert
@@ -70,6 +77,11 @@ class ModifyHolder<E> implements Serializable {
  void modifyRemoval(Object bean) {
    if (bean != null) {
      touched = true;
+
+      if (bean instanceof EntityBean) {
+        ((EntityBean) bean)._ebean_getIntercept().setDeletedFromCollection(true);
+      }
+
      // If it is to be added then just remove the addition
      if (!undoAddition(bean)) {
        modifyDeletions.add((E) bean);
@@ -222,8 +222,8 @@ public abstract class AbstractNamingConvention implements NamingConvention {
   * Return true if this class is part of entity inheritance.
   */
  protected boolean hasInheritance(Class<?> supCls) {
-    return AnnotationUtil.findAnnotationRecursive(supCls, Inheritance.class) != null
-        || AnnotationUtil.findAnnotation(supCls, DiscriminatorValue.class) != null;
+    return AnnotationUtil.typeHas(supCls, Inheritance.class)
+        || AnnotationUtil.has(supCls, DiscriminatorValue.class);
  }


@@ -255,16 +255,12 @@ public abstract class AbstractNamingConvention implements NamingConvention {
   * Gets the table name from annotation.
   */
  protected TableName getTableNameFromAnnotation(Class<?> beanClass) {
-
-    final Table t = AnnotationUtil.findAnnotationRecursive(beanClass, Table.class);
-
-    // Take the annotation if defined
-    if (t != null && !isEmpty(t.name())) {
+    final Table table = AnnotationUtil.typeGet(beanClass, Table.class);
+    if (table != null && !isEmpty(table.name())) {
      // Note: empty catalog and schema are converted to null
      // Only need to convert quoted identifiers from annotations
-      return new TableName(quoteIdentifiers(t.catalog()), quoteIdentifiers(t.schema()), quoteIdentifiers(t.name()));
+      return new TableName(quoteIdentifiers(table.catalog()), quoteIdentifiers(table.schema()), quoteIdentifiers(table.name()));
    }
-
    // No annotation
    return null;
  }
@@ -88,7 +88,6 @@ public class DbConstraintNaming {
   * Return the primary key constraint name.
   */
  public String primaryKeyName(String tableName) {
-
    return pkPrefix + normaliseTable(tableName) + pkSuffix;
  }

@@ -103,7 +102,6 @@ public class DbConstraintNaming {
   * Return the index name associated with a foreign key constraint given multiple columns.
   */
  public String foreignKeyIndexName(String tableName, String[] columns) {
-
    String colPart = joinColumnNames(columns);
    return fkIndexPrefix + normaliseTable(tableName) + fkIndexMiddle + colPart + fkIndexSuffix;
  }
@@ -112,7 +110,6 @@ public class DbConstraintNaming {
   * Return the index name associated with a foreign key constraint given a single column foreign key.
   */
  public String foreignKeyIndexName(String tableName, String column) {
-
    String colPart = normaliseTable(column);
    return fkIndexPrefix + normaliseTable(tableName) + fkIndexMiddle + colPart + fkIndexSuffix;
  }
@@ -121,7 +118,6 @@ public class DbConstraintNaming {
   * Return the index name for a general index (not associated with a foreign key).
   */
  public String indexName(String tableName, String column) {
-
    String colPart = normaliseTable(column);
    return indexPrefix + normaliseTable(tableName) + indexMiddle + colPart + indexSuffix;
  }
@@ -130,7 +126,6 @@ public class DbConstraintNaming {
   * Return the index name for a general index (not associated with a foreign key).
   */
  public String indexName(String tableName, String[] columns) {
-
    String colPart = joinColumnNames(columns);
    return indexPrefix + normaliseTable(tableName) + indexMiddle + colPart + indexSuffix;
  }
@@ -139,7 +134,6 @@ public class DbConstraintNaming {
   * Join the column names together with underscores.
   */
  protected String joinColumnNames(String[] columns) {
-
    if (columns.length == 1) {
      return normaliseColumn(columns[0]);
    }
@@ -157,7 +151,6 @@ public class DbConstraintNaming {
   * Return the unique constraint name.
   */
  public String uniqueConstraintName(String tableName, String columnName) {
-
    return uqPrefix + normaliseTable(tableName) + "_" + normaliseColumn(columnName) + uqSuffix;
  }

@@ -165,7 +158,6 @@ public class DbConstraintNaming {
   * Return the unique constraint name.
   */
  public String uniqueConstraintName(String tableName, String[] columns) {
-
    String colPart = joinColumnNames(columns);
    return uqPrefix + normaliseTable(tableName) + "_" + colPart + uqSuffix;
  }
@@ -174,7 +166,6 @@ public class DbConstraintNaming {
   * Return the check constraint name.
   */
  public String checkConstraintName(String tableName, String columnName) {
-
    return ckPrefix + normaliseTable(tableName) + "_" + normaliseColumn(columnName) + ckSuffix;
  }

@@ -41,17 +41,20 @@ public class DbConstraintNormalise {
  }

  /**
-   * Normalise the column name by removing any quoted identifier characters.
+   * Normalise the column name by removing any quoted identifier characters and formula brackets.
   */
  public String normaliseColumn(String columnName) {
-
-    columnName = trimQuotes(columnName);
+    columnName = trimBrackets(trimQuotes(columnName));
    if (lowerCaseColumns) {
      columnName = columnName.toLowerCase();
    }
    return columnName;
  }

+  private String trimBrackets(String value) {
+    return value.replace("(","").replace(")","");
+  }
+
  /**
   * Lower case the table name checking for quoted identifiers.
   */
@@ -29,7 +29,7 @@ public class DocStoreConfig {
  protected boolean create;

  /**
-   * The URL of the Document store server. For example: http://localhost:9200.
+   * The URL of the Document store. For example: http://localhost:9200.
   */
  protected String url;

@@ -131,7 +131,7 @@ public class DocStoreConfig {
  }

  /**
-   * Set the URL to the Document store server.
+   * Set the URL to the Document store.
   * <p>
   * For a local ElasticSearch server this would be: http://localhost:9200
   */
@@ -0,0 +1,21 @@
+package io.ebean.config;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Used by generated code to hold entity classes to register with Ebean.
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ModuleInfo {
+
+  /**
+   * Returns the entity classes with db name prefix.
+   * <p>
+   * The db name prefix is added to entity classes for non default databases.
+   */
+  String[] entities() default {};
+}
@@ -0,0 +1,19 @@
+package io.ebean.config;
+
+import java.util.List;
+
+/**
+ * Loads and returns entity classes to register with Ebean databases.
+ */
+public interface ModuleInfoLoader {
+
+  /**
+   * Return the entity classes to register with the default DB.
+   */
+  List<Class<?>> entityClasses();
+
+  /**
+   * Return entity classes to register for a named DB (not default DB).
+   */
+  List<Class<?>> entityClassesFor(String dbName);
+}
@@ -17,6 +17,13 @@ public class PlatformConfig {

  private boolean allQuotedIdentifiers;

+  private DbConstraintNaming constraintNaming;
+
+  /**
+   * Flag set when a supplied constraintNaming is used.
+   */
+  private boolean customConstraintNaming;
+
  /**
   * The database boolean true value (typically either 1, T, or Y).
   */
@@ -63,7 +70,7 @@ public class PlatformConfig {
   * Construct with defaults.
   */
  public PlatformConfig() {
-
+    this.constraintNaming = new DbConstraintNaming();
  }

  /**
@@ -80,6 +87,19 @@ public class PlatformConfig {
    this.allQuotedIdentifiers = platformConfig.allQuotedIdentifiers;
    this.databaseInetAddressVarchar = platformConfig.databaseInetAddressVarchar;
    this.customDbTypeMappings = platformConfig.customDbTypeMappings;
+    this.constraintNaming = new DbConstraintNaming(!allQuotedIdentifiers);
+  }
+
+  public DbConstraintNaming getConstraintNaming() {
+    return constraintNaming;
+  }
+
+  /**
+   * Set a custom database constraint naming convention.
+   */
+  public void setConstraintNaming(DbConstraintNaming constraintNaming) {
+    this.customConstraintNaming = true;
+    this.constraintNaming = constraintNaming;
  }

  /**
@@ -94,6 +114,9 @@ public class PlatformConfig {
   */
  public void setAllQuotedIdentifiers(boolean allQuotedIdentifiers) {
    this.allQuotedIdentifiers = allQuotedIdentifiers;
+    if (!customConstraintNaming) {
+      this.constraintNaming = new DbConstraintNaming(!allQuotedIdentifiers);
+    }
  }

  /**
@@ -1,6 +1,7 @@
 package io.ebean.config;

 import com.fasterxml.jackson.core.JsonFactory;
+import io.avaje.config.Config;
 import io.ebean.DatabaseFactory;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Query;
@@ -13,7 +14,6 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
-import io.ebean.config.properties.PropertiesLoader;
 import io.ebean.datasource.DataSourceConfig;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanPersistController;
@@ -28,7 +28,6 @@ import io.ebean.event.changelog.ChangeLogPrepare;
 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;

@@ -133,6 +132,15 @@ public class ServerConfig {

  private TenantCatalogProvider tenantCatalogProvider;

+  /**
+   * When true will load entity classes via ModuleInfoLoader.
+   * <p>
+   * NB: ModuleInfoLoader implementations are generated by querybean generator.
+   * Having this on and registering entity classes means we don't need to manually
+   * write that code or use classpath scanning to find entity classes.
+   */
+  private boolean loadModuleInfo = true;
+
  /**
   * List of interesting classes such as entities, embedded, ScalarTypes,
   * Listeners, Finders, Controllers etc.
@@ -345,11 +353,6 @@ public class ServerConfig {
   */
  private NamingConvention namingConvention = new UnderscoreNamingConvention();

-  /**
-   * Naming convention used in DDL generation for primary keys, foreign keys etc.
-   */
-  private DbConstraintNaming constraintNaming = new DbConstraintNaming();
-
  /**
   * Behaviour of updates in JDBC batch to by default include all properties.
   */
@@ -415,10 +418,6 @@ public class ServerConfig {

  private ServerCachePlugin serverCachePlugin;

-  private boolean collectQueryStatsByNode = true;
-
-  private boolean collectQueryOrigins = true;
-
  /**
   * The default PersistenceContextScope used if one is not explicitly set on a query.
   */
@@ -476,6 +475,11 @@ public class ServerConfig {

  private String enabledL2Regions;

+  /**
+   * Set to true to effectively disable L2 cache plugins.
+   */
+  private boolean localOnlyL2Cache;
+
  /**
   * Should the javax.validation.constraints.NotNull enforce a notNull column in DB.
   * If set to false, use io.ebean.annotation.NotNull or Column(nullable=true).
@@ -493,6 +497,11 @@ public class ServerConfig {
   */
  private boolean collectQueryPlans;

+  /**
+   * The default threshold in micros for collecting query plans.
+   */
+  private long collectQueryPlanThresholdMicros = Long.MAX_VALUE;
+
  /**
   * The time in millis used to determine when a query is alerted for being slow.
   */
@@ -1605,14 +1614,14 @@ public class ServerConfig {
   * Return the constraint naming convention used in DDL generation.
   */
  public DbConstraintNaming getConstraintNaming() {
-    return constraintNaming;
+    return platformConfig.getConstraintNaming();
  }

  /**
   * Set the constraint naming convention used in DDL generation.
   */
  public void setConstraintNaming(DbConstraintNaming constraintNaming) {
-    this.constraintNaming = constraintNaming;
+    platformConfig.setConstraintNaming(constraintNaming);
  }

  /**
@@ -1882,7 +1891,7 @@ public class ServerConfig {
  }

  /**
-   * Return the database platform to use for this server.
+   * Return the database platform to use for this database.
   */
  public DatabasePlatform getDatabasePlatform() {
    return databasePlatform;
@@ -2278,15 +2287,21 @@ public class ServerConfig {
   * </p>
   *
   * @param cls the entity type (or other type) that should be registered by this
-   *            server.
+   *            database.
   */
  public void addClass(Class<?> cls) {
-    if (classes == null) {
-      classes = new ArrayList<>();
-    }
    classes.add(cls);
  }

+  /**
+   * Register all the classes (typically entity classes).
+   */
+  public void addAll(List<Class<?>> classList) {
+    if (classList != null && !classList.isEmpty()) {
+      classes.addAll(classList);
+    }
+  }
+
  /**
   * Add a package to search for entities via class path search.
   * <p>
@@ -2294,9 +2309,6 @@ public class ServerConfig {
   * </p>
   */
  public void addPackage(String packageName) {
-    if (packages == null) {
-      packages = new ArrayList<>();
-    }
    packages.add(packageName);
  }

@@ -2322,7 +2334,7 @@ public class ServerConfig {

  /**
   * Set the list of classes (entities, listeners, scalarTypes etc) that should
-   * be used for this server.
+   * be used for this database.
   * <p>
   * If no classes are specified then the classes are found automatically via
   * searching the class path.
@@ -2336,7 +2348,7 @@ public class ServerConfig {
  }

  /**
-   * Return the classes registered for this server. Typically this includes
+   * Return the classes registered for this database. Typically this includes
   * entities and perhaps listeners.
   */
  public List<Class<?>> getClasses() {
@@ -2418,52 +2430,6 @@ public class ServerConfig {
    this.updateAllPropertiesInBatch = updateAllPropertiesInBatch;
  }

-  /**
-   * Return true if query statistics should be collected by ObjectGraphNode.
-   */
-  public boolean isCollectQueryStatsByNode() {
-    return collectQueryStatsByNode;
-  }
-
-  /**
-   * Set to true to collection query execution statistics by ObjectGraphNode.
-   * <p>
-   * These statistics can be used to highlight code/query 'origin points' that result in lots of lazy loading.
-   * </p>
-   * <p>
-   * It is considered safe/fine to have this set to true for production.
-   * </p>
-   * <p>
-   * This information can be later retrieved via {@link MetaInfoManager}.
-   * </p>
-   *
-   * @see MetaInfoManager
-   */
-  public void setCollectQueryStatsByNode(boolean collectQueryStatsByNode) {
-    this.collectQueryStatsByNode = collectQueryStatsByNode;
-  }
-
-  /**
-   * Return true if query plans should also collect their 'origins'. This means for a given query plan you
-   * can identify the code/origin points where this query resulted from including lazy loading origins.
-   */
-  public boolean isCollectQueryOrigins() {
-    return collectQueryOrigins;
-  }
-
-  /**
-   * Set to true if query plans should collect their 'origin' points. This means for a given query plan you
-   * can identify the code/origin points where this query resulted from including lazy loading origins.
-   * <p>
-   * This information can be later retrieved via {@link MetaInfoManager}.
-   * </p>
-   *
-   * @see MetaInfoManager
-   */
-  public void setCollectQueryOrigins(boolean collectQueryOrigins) {
-    this.collectQueryOrigins = collectQueryOrigins;
-  }
-
  /**
   * Returns the resource directory.
   */
@@ -2785,7 +2751,7 @@ public class ServerConfig {
   * Load settings from ebean.properties.
   */
  public void loadFromProperties() {
-    this.properties = PropertiesLoader.load();
+    this.properties = Config.asProperties();
    configureFromProperties();
  }

@@ -2794,7 +2760,7 @@ public class ServerConfig {
   */
  public void loadFromProperties(Properties properties) {
    // keep the properties used for configuration so that these are available for plugins
-    this.properties = PropertiesLoader.eval(properties);
+    this.properties = Config.asConfiguration().eval(properties);
    configureFromProperties();
  }

@@ -2889,14 +2855,17 @@ public class ServerConfig {
    }
    loadDocStoreSettings(p);

+    loadModuleInfo = p.getBoolean("loadModuleInfo", loadModuleInfo);
    maxCallStack = p.getInt("maxCallStack", maxCallStack);
    dumpMetricsOnShutdown = p.getBoolean("dumpMetricsOnShutdown", dumpMetricsOnShutdown);
    dumpMetricsOptions = p.get("dumpMetricsOptions", dumpMetricsOptions);
    queryPlanTTLSeconds = p.getInt("queryPlanTTLSeconds", queryPlanTTLSeconds);
    slowQueryMillis = p.getLong("slowQueryMillis", slowQueryMillis);
    collectQueryPlans = p.getBoolean("collectQueryPlans", collectQueryPlans);
+    collectQueryPlanThresholdMicros = p.getLong("collectQueryPlanThresholdMicros", collectQueryPlanThresholdMicros);
    docStoreOnly = p.getBoolean("docStoreOnly", docStoreOnly);
    disableL2Cache = p.getBoolean("disableL2Cache", disableL2Cache);
+    localOnlyL2Cache = p.getBoolean("localOnlyL2Cache", localOnlyL2Cache);
    enabledL2Regions = p.get("enabledL2Regions", enabledL2Regions);
    notifyL2CacheInForeground = p.getBoolean("notifyL2CacheInForeground", notifyL2CacheInForeground);
    explicitTransactionBeginMode = p.getBoolean("explicitTransactionBeginMode", explicitTransactionBeginMode);
@@ -2921,9 +2890,6 @@ public class ServerConfig {
    String packagesProp = p.get("search.packages", p.get("packages", null));
    packages = getSearchList(packagesProp, packages);

-    collectQueryStatsByNode = p.getBoolean("collectQueryStatsByNode", collectQueryStatsByNode);
-    collectQueryOrigins = p.getBoolean("collectQueryOrigins", collectQueryOrigins);
-
    skipCacheAfterWrite = p.getBoolean("skipCacheAfterWrite", skipCacheAfterWrite);
    updateAllPropertiesInBatch = p.getBoolean("updateAllPropertiesInBatch", updateAllPropertiesInBatch);

@@ -3016,20 +2982,20 @@ public class ServerConfig {
      return classes;
    }

-    List<Class<?>> classes = new ArrayList<>();
+    List<Class<?>> classList = new ArrayList<>();

    String[] split = StringHelper.splitNames(classNames);
    for (String cn : split) {
      if (!"class".equalsIgnoreCase(cn)) {
        try {
-          classes.add(Class.forName(cn));
+          classList.add(Class.forName(cn));
        } catch (ClassNotFoundException e) {
          String msg = "Error registering class [" + cn + "] from [" + classNames + "]";
          throw new RuntimeException(msg, e);
        }
      }
    }
-    return classes;
+    return classList;
  }

  private List<String> getSearchList(String searchNames, List<String> defaultValue) {
@@ -3140,6 +3106,20 @@ public class ServerConfig {
    this.disableL2Cache = disableL2Cache;
  }

+  /**
+   * Return true to use local only L2 cache. Effectively ignore l2 cache plugin like ebean-redis etc.
+   */
+  public boolean isLocalOnlyL2Cache() {
+    return localOnlyL2Cache;
+  }
+
+  /**
+   * Force the use of local only L2 cache. Effectively ignore l2 cache plugin like ebean-redis etc.
+   */
+  public void setLocalOnlyL2Cache(boolean localOnlyL2Cache) {
+    this.localOnlyL2Cache = localOnlyL2Cache;
+  }
+
  /**
   * Returns if we use javax.validation.constraints.NotNull
   */
@@ -3283,6 +3263,20 @@ public class ServerConfig {
    this.collectQueryPlans = collectQueryPlans;
  }

+  /**
+   * Return the query plan collection threshold in microseconds.
+   */
+  public long getCollectQueryPlanThresholdMicros() {
+    return collectQueryPlanThresholdMicros;
+  }
+
+  /**
+   * Set the query plan collection threshold in microseconds.
+   */
+  public void setCollectQueryPlanThresholdMicros(long collectQueryPlanThresholdMicros) {
+    this.collectQueryPlanThresholdMicros = collectQueryPlanThresholdMicros;
+  }
+
  /**
   * Return true if metrics should be dumped when the server is shutdown.
   */
@@ -3313,6 +3307,28 @@ public class ServerConfig {
    this.dumpMetricsOptions = dumpMetricsOptions;
  }

+  /**
+   * Return true if entity classes should be loaded and registered via ModuleInfoLoader.
+   * <p>
+   * When false we either register entity classes via application code or use classpath
+   * scanning to find and register entity classes.
+   * </p>
+   */
+  public boolean isAutoLoadModuleInfo() {
+    return loadModuleInfo && classes.isEmpty();
+  }
+
+  /**
+   * Set false to turn off automatic registration of entity beans.
+   * <p>
+   * When using query beans that also generates a module info class that
+   * can register the entity bean classes (to avoid classpath scanning).
+   * This is on by default and setting this to false turns it off.
+   */
+  public void setLoadModuleInfo(boolean loadModuleInfo) {
+    this.loadModuleInfo = loadModuleInfo;
+  }
+
  public enum UuidVersion {
    VERSION4,
    VERSION1,
@@ -146,7 +146,7 @@ public class DatabasePlatform {

  protected String truncateTable = "truncate table %s";

-  protected String columnAliasPrefix = "c";
+  protected String columnAliasPrefix;

  /**
   * Use a BackTick ` at the beginning and end of table or column names that you
@@ -278,7 +278,7 @@ public class DatabasePlatform {
   * Return true if this matches the given platform.
   */
  public boolean isPlatform(Platform platform) {
-    return this.platform == platform;
+    return this.platform.base() == platform;
  }

  /**
@@ -29,6 +29,8 @@ public class DbPlatformTypeMapping {

  private static final DbPlatformType INET_NATIVE = new DbPlatformType("inet", false);
  private static final DbPlatformType INET_VARCHAR = new DbPlatformType("varchar", 50);
+  private static final DbPlatformType CIDR_NATIVE = new DbPlatformType("cidr", false);
+  private static final DbPlatformType CIDR_VARCHAR = new DbPlatformType("varchar", 50);

  private static final DbPlatformType UUID_NATIVE = new DbPlatformType("uuid", false);
  @SuppressWarnings("unused")
@@ -110,10 +112,11 @@ public class DbPlatformTypeMapping {
      put(DbType.JSONVARCHAR, new DbPlatformType("jsonvarchar", 1000));
      put(DbType.UUID, UUID_NATIVE);
      put(DbType.INET, INET_NATIVE);
+      put(DbType.CIDR, CIDR_NATIVE);

    } else {
      put(DbType.VARCHAR, new DbPlatformType("varchar", 255));
-      put(DbType.DECIMAL, new DbPlatformType("decimal", 38));
+      put(DbType.DECIMAL, new DbPlatformType("decimal", 16, 3));
      put(DbType.VARBINARY, new DbPlatformType("varbinary", 255));
      put(DbType.BINARY, new DbPlatformType("binary", 255));
      put(DbType.CHAR, new DbPlatformType("char", 1));
@@ -126,6 +129,7 @@ public class DbPlatformTypeMapping {
      // default to native UUID and override on platform configure()
      put(DbType.UUID, UUID_NATIVE);
      put(DbType.INET, INET_VARCHAR);
+      put(DbType.CIDR, CIDR_VARCHAR);
    }
  }

@@ -36,7 +36,7 @@ public enum DbType {

  UUID(ExtraDbTypes.UUID),
  INET(ExtraDbTypes.INET),
-  CDIR(ExtraDbTypes.CDIR),
+  CIDR(ExtraDbTypes.CIDR),

  POINT(ExtraDbTypes.POINT),
  POLYGON(ExtraDbTypes.POLYGON),
@@ -41,7 +41,7 @@ public interface ExtraDbTypes {
  int JSONBlob = 5005;

  int INET = 5020;
-  int CDIR = 5021;
+  int CIDR = 5021;

  /**
   * Geo Point
@@ -35,6 +35,11 @@ public enum IdType {
   * Used when the key is a compound key or lookup table code.
   * </p>
   */
-  EXTERNAL
+  EXTERNAL,
+
+  /**
+   * Auto mapping to platform preferred identity strategy.
+   */
+  AUTO

 }
@@ -40,8 +40,7 @@ public class LimitOffsetSqlLimiter implements SqlLimiter {
    }

    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-
-    return new SqlLimitResponse(sql, false);
+    return new SqlLimitResponse(sql);
  }

 }
@@ -1,75 +0,0 @@
-package io.ebean.config.dbplatform;
-
-/**
- * Adds the ROW_NUMBER() OVER function to a query.
- */
-public class RowNumberSqlLimiter implements SqlLimiter {
-
-  /**
-   * ROW_NUMBER() OVER (ORDER BY
-   */
-  private static final String ROW_NUMBER_OVER = "row_number() over (order by ";
-
-  /**
-   * ) as rn,
-   */
-  private static final String ROW_NUMBER_AS = ") as rn, ";
-
-  private final String rowNumberWindowAlias;
-
-  /**
-   * Specify the name of the rowNumberWindowAlias.
-   */
-  public RowNumberSqlLimiter(String rowNumberWindowAlias) {
-    this.rowNumberWindowAlias = rowNumberWindowAlias;
-  }
-
-  public RowNumberSqlLimiter() {
-    this("as limitresult");
-  }
-
-  @Override
-  public SqlLimitResponse limit(SqlLimitRequest request) {
-
-    String dbSql = request.getDbSql();
-
-    StringBuilder sb = new StringBuilder(60 + dbSql.length());
-
-    int firstRow = request.getFirstRow();
-
-    int lastRow = request.getMaxRows();
-    if (lastRow > 0) {
-      lastRow += firstRow;
-    }
-
-    sb.append("select * from ( ");
-
-    sb.append("select ");
-    if (request.isDistinct()) {
-      sb.append("distinct ");
-    }
-
-    sb.append(ROW_NUMBER_OVER);
-    sb.append(request.getDbOrderBy());
-    sb.append(ROW_NUMBER_AS);
-
-    sb.append(dbSql);
-
-    sb.append(" ) ");
-    sb.append(rowNumberWindowAlias);
-    sb.append(" where ");
-    if (firstRow > 0) {
-      sb.append(" rn > ").append(firstRow);
-      if (lastRow > 0) {
-        sb.append(" and ");
-      }
-    }
-    if (lastRow > 0) {
-      sb.append(" rn <= ").append(lastRow);
-    }
-
-    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-
-    return new SqlLimitResponse(sql, true);
-  }
-}
@@ -1,81 +0,0 @@
-package io.ebean.config.dbplatform;
-
-/**
- * Add ROWNUM column etc around SQL query to limit results.
- */
-public class RownumSqlLimiter implements SqlLimiter {
-
-  private final String rnum;
-
-  private final boolean useFirstRowsHint;
-
-  /**
-   * Create with default inner rownum column alias and used FIRST_ROWS hint.
-   */
-  public RownumSqlLimiter() {
-    this("rn_", true);
-  }
-
-  /**
-   * Specify the inner rownum column alias and whether to include the FIRST_ROWS
-   * hint.
-   */
-  public RownumSqlLimiter(String rnum, boolean useFirstRowsHint) {
-    this.rnum = rnum;
-    this.useFirstRowsHint = useFirstRowsHint;
-  }
-
-  @Override
-  public SqlLimitResponse limit(SqlLimitRequest request) {
-
-    // select *
-    // from ( select /*+ FIRST_ROWS(n) */ ROWNUM rnum, a.*
-    // from ( your_query_goes_here,
-    // with order by ) a
-    // where ROWNUM <=
-    // :MAX_ROW_TO_FETCH )
-    // where rnum >= :MIN_ROW_TO_FETCH;
-
-    String dbSql = request.getDbSql();
-
-    StringBuilder sb = new StringBuilder(60 + dbSql.length());
-
-    int firstRow = request.getFirstRow();
-
-    int lastRow = request.getMaxRows();
-    if (lastRow > 0) {
-      lastRow += firstRow;
-    }
-
-    sb.append("select * from ( ");
-
-    sb.append("select ");
-    if (useFirstRowsHint && request.getMaxRows() > 0) {
-      sb.append("/*+ FIRST_ROWS(").append(request.getMaxRows()).append(") */ ");
-    }
-
-    sb.append("rownum ").append(rnum).append(", a.* ");
-    sb.append(" from (");
-
-    sb.append(" select ");
-    if (request.isDistinct()) {
-      sb.append("distinct ");
-    }
-    sb.append(dbSql);
-
-    sb.append(NEW_LINE).append("  ) a ");
-    if (lastRow > 0) {
-      sb.append(" where rownum <= ").append(lastRow);
-    }
-    sb.append(" ) ");
-    if (firstRow > 0) {
-      sb.append(" where ");
-      sb.append(rnum).append(" > ").append(firstRow);
-    }
-
-    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-
-    return new SqlLimitResponse(sql, true);
-  }
-
-}
@@ -12,9 +12,10 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.NavigableSet;
+import java.util.TreeSet;

 /**
 * Database sequence based IdGenerator.
@@ -42,7 +43,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {

  protected final BackgroundExecutor backgroundExecutor;

-  protected final ArrayList<Long> idList = new ArrayList<>(50);
+  protected final NavigableSet<Long> idList = new TreeSet<>();

  protected final int allocationSize;

@@ -97,15 +98,13 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
  @Override
  public Object nextId(Transaction t) {
    synchronized (monitor) {
-
      int size = idList.size();
      if (size > 0) {
        maybeLoadMoreInBackground(size);
      } else {
        loadMore(allocationSize);
      }
-
-      return idList.remove(0);
+      return idList.pollFirst();
    }
  }

@@ -7,14 +7,11 @@ public class SqlLimitResponse {

  final String sql;

-  final boolean includesRowNumberColumn;
-
  /**
   * Create the response.
   */
-  public SqlLimitResponse(String sql, boolean includesRowNumberColumn) {
+  public SqlLimitResponse(String sql) {
    this.sql = sql;
-    this.includesRowNumberColumn = includesRowNumberColumn;
  }

  /**
@@ -24,11 +21,4 @@ public class SqlLimitResponse {
    return sql;
  }

-  /**
-   * Returns true if a ROW_NUMBER column is used in the query.
-   */
-  public boolean isIncludesRowNumberColumn() {
-    return includesRowNumberColumn;
-  }
-
 }
@@ -16,10 +16,8 @@ public class ClickHousePlatform extends DatabasePlatform {
    //this.dbEncrypt =
    //this.historySupport =
    //this.exceptionTranslator =
-
    this.nativeUuidType = true;
    this.dbDefaultValue.setNow("now()");
-    this.columnAliasPrefix = null;

    this.dbIdentity.setIdType(IdType.IDENTITY);
    this.dbIdentity.setSupportsGetGeneratedKeys(false);
@@ -34,7 +32,7 @@ public class ClickHousePlatform extends DatabasePlatform {
    dbTypeMap.put(DbType.SMALLINT, new DbPlatformType("UInt16", false));
    dbTypeMap.put(DbType.INTEGER, new DbPlatformType("UInt32", false));
    dbTypeMap.put(DbType.BIGINT, new DbPlatformType("UInt64", false));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("Decimal", 16,4));
+    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("Decimal", 16, 3));
    dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("Float64", false));

    dbTypeMap.put(DbType.DATE, new DbPlatformType("Date", false));
@@ -47,7 +45,7 @@ public class ClickHousePlatform extends DatabasePlatform {

    dbTypeMap.put(DbType.UUID, new DbPlatformType("UUID", false));
    dbTypeMap.put(DbType.INET, new DbPlatformType("String", false));
-    dbTypeMap.put(DbType.CDIR, new DbPlatformType("String", false));
+    dbTypeMap.put(DbType.CIDR, new DbPlatformType("String", false));
  }

  @Override
@@ -42,8 +42,7 @@ public class DB2Platform extends DatabasePlatform {
    dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false));
    dbTypeMap.put(DbType.BIGINT, new DbPlatformType("bigint", false));
    dbTypeMap.put(DbType.REAL, new DbPlatformType("real"));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("decimal", 15));
-
+    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("decimal", 16, 3));
    persistBatchOnCascade = PersistBatch.NONE;
  }

@@ -22,6 +22,6 @@ public class Db2SqlLimiter implements SqlLimiter {
    }

    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-    return new SqlLimitResponse(sql, false);
+    return new SqlLimitResponse(sql);
  }
 }
@@ -26,7 +26,6 @@ public class H2Platform extends DatabasePlatform {
    this.supportsDeleteTableAlias = true;
    this.inlineSqlUpdateLimit = true;
    this.dbDefaultValue.setNow("now()");
-    this.columnAliasPrefix = null;
    this.exceptionTranslator =
      new SqlErrorCodes()
        .addAcquireLock("50200","HYT00")
@@ -17,7 +17,6 @@ public class HanaPlatform extends DatabasePlatform {
    this.sqlLimiter = new HanaSqlLimiter();
    this.persistBatchOnCascade = PersistBatch.NONE;
    this.supportsResultSetConcurrencyModeUpdatable = false;
-    this.columnAliasPrefix = null;
    this.historySupport = new HanaHistorySupport();
    this.basicSqlLimiter = new HanaBasicSqlLimiter();

@@ -29,7 +29,6 @@ public class HanaSqlLimiter implements SqlLimiter {
    }

    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-
-    return new SqlLimitResponse(sql, false);
+    return new SqlLimitResponse(sql);
  }
-}
+}
@@ -31,7 +31,6 @@ public class MySqlPlatform extends DatabasePlatform {
    this.inlineSqlUpdateLimit = true;
    this.dbEncrypt = new MySqlDbEncrypt();
    this.historySupport = new MySqlHistorySupport();
-    this.columnAliasPrefix = null;
    this.dbIdentity.setIdType(IdType.IDENTITY);
    this.dbIdentity.setSupportsGetGeneratedKeys(true);
    this.dbIdentity.setSupportsIdentity(true);
@@ -65,6 +64,8 @@ public class MySqlPlatform extends DatabasePlatform {
    dbTypeMap.put(DbType.BLOB, new MySqlBlob());
    dbTypeMap.put(DbType.BINARY, new DbPlatformType("binary", 255));
    dbTypeMap.put(DbType.VARBINARY, new DbPlatformType("varbinary", 255));
+    dbTypeMap.put(DbType.JSON, new DbPlatformType("json", false));
+    dbTypeMap.put(DbType.JSONB, new DbPlatformType("json", false));
  }

  @Override
@@ -23,7 +23,6 @@ public class NuoDbPlatform extends DatabasePlatform {
    this.idInExpandedForm = true;
    this.supportsResultSetConcurrencyModeUpdatable = false;
    this.supportsDeleteTableAlias = true;
-    this.columnAliasPrefix = null;
    this.likeClauseRaw = "like ?";
    this.historySupport = new NuoDbHistorySupport();
    //this.dbEncrypt = ...
@@ -0,0 +1,16 @@
+package io.ebean.config.dbplatform.oracle;
+
+import io.ebean.annotation.Platform;
+
+/**
+ * Oracle 11 platform using rownum sql limiting.
+ */
+public class Oracle11Platform extends OraclePlatform {
+
+  public Oracle11Platform() {
+    super();
+    this.platform = Platform.ORACLE11;
+    this.columnAliasPrefix = "c";
+    this.sqlLimiter = new OracleRownumSqlLimiter();
+  }
+}
@@ -0,0 +1,34 @@
+package io.ebean.config.dbplatform.oracle;
+
+import io.ebean.config.dbplatform.SqlLimitRequest;
+import io.ebean.config.dbplatform.SqlLimitResponse;
+import io.ebean.config.dbplatform.SqlLimiter;
+
+/**
+ * Use ANSI offset rows syntax.
+ */
+class OracleAnsiSqlRowsLimiter implements SqlLimiter {
+
+  @Override
+  public SqlLimitResponse limit(SqlLimitRequest request) {
+
+    String dbSql = request.getDbSql();
+    StringBuilder sb = new StringBuilder(50 + dbSql.length());
+    int firstRow = request.getFirstRow();
+    int maxRows = request.getMaxRows();
+
+    sb.append("select ");
+    if (request.isDistinct()) {
+      sb.append("distinct ");
+    }
+    sb.append(dbSql);
+    if (firstRow > 0) {
+      sb.append(" offset ").append(firstRow).append(" rows");
+    }
+    if (maxRows > 0) {
+      sb.append(" fetch next ").append(maxRows).append(" rows only");
+    }
+    return new SqlLimitResponse(sb.toString());
+  }
+
+}
@@ -9,7 +9,6 @@ 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.RownumSqlLimiter;
 import io.ebean.config.dbplatform.SqlErrorCodes;

 import javax.sql.DataSource;
@@ -27,7 +26,7 @@ public class OraclePlatform extends DatabasePlatform {
    this.maxTableNameLength = 30;
    this.maxConstraintNameLength = 30;
    this.dbEncrypt = new OracleDbEncrypt();
-    this.sqlLimiter = new RownumSqlLimiter();
+    this.sqlLimiter = new OracleAnsiSqlRowsLimiter();
    this.basicSqlLimiter = new BasicSqlAnsiLimiter();
    this.historySupport = new OracleDbHistorySupport();
    this.truncateTable = "truncate table %s cascade";
@@ -63,8 +62,7 @@ public class OraclePlatform extends DatabasePlatform {
    dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("number", 19, 4));
    dbTypeMap.put(DbType.SMALLINT, new DbPlatformType("number", 5));
    dbTypeMap.put(DbType.TINYINT, new DbPlatformType("number", 3));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("number", 38));
-
+    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("number", 16, 3));
    dbTypeMap.put(DbType.VARCHAR, new DbPlatformType("varchar2", 255));

    dbTypeMap.put(DbType.LONGVARBINARY, new DbPlatformType("blob"));
@@ -0,0 +1,54 @@
+package io.ebean.config.dbplatform.oracle;
+
+import io.ebean.config.dbplatform.SqlLimitRequest;
+import io.ebean.config.dbplatform.SqlLimitResponse;
+import io.ebean.config.dbplatform.SqlLimiter;
+
+/**
+ * Add ROWNUM column etc around SQL query to limit results.
+ */
+class OracleRownumSqlLimiter implements SqlLimiter {
+
+  @Override
+  public SqlLimitResponse limit(SqlLimitRequest request) {
+
+    // select *
+    // from ( select /*+ FIRST_ROWS(n) */ a.*, ROWNUM rnum
+    // from ( your_query_goes_here,
+    // with order by ) a
+    // where ROWNUM <=
+    // :MAX_ROW_TO_FETCH )
+    // where rnum >= :MIN_ROW_TO_FETCH;
+
+    String dbSql = request.getDbSql();
+
+    StringBuilder sb = new StringBuilder(60 + dbSql.length());
+    int firstRow = request.getFirstRow();
+    int lastRow = request.getMaxRows();
+    if (lastRow > 0) {
+      lastRow += firstRow;
+    }
+
+    sb.append("select * from (select ");
+    if (request.getMaxRows() > 0) {
+      sb.append("/*+ FIRST_ROWS(").append(request.getMaxRows()).append(") */ ");
+    }
+
+    sb.append("a.*, rownum rn_ from (select ");
+    if (request.isDistinct()) {
+      sb.append("distinct ");
+    }
+    sb.append(dbSql).append(") a ");
+    if (lastRow > 0) {
+      sb.append(" where rownum <= ").append(lastRow);
+    }
+    sb.append(") ");
+    if (firstRow > 0) {
+      sb.append(" where rn_ > ").append(firstRow);
+    }
+
+    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
+    return new SqlLimitResponse(sql);
+  }
+
+}
@@ -1,22 +0,0 @@
-package io.ebean.config.dbplatform.postgres;
-
-import io.ebean.config.dbplatform.IdType;
-
-/**
- * Postgres v8.3 specific platform.
- * <p>
- * No support for getGeneratedKeys.
- * </p>
- */
-public class Postgres8Platform extends PostgresPlatform {
-
-  public Postgres8Platform() {
-    super();
-    this.dbIdentity.setSupportsGetGeneratedKeys(false);
-    this.dbIdentity.setIdType(IdType.SEQUENCE);
-    this.dbIdentity.setSupportsSequence(true);
-    this.dbIdentity.setSupportsIdentity(true);
-    this.columnAliasPrefix = "as c";
-  }
-
-}
@@ -0,0 +1,14 @@
+package io.ebean.config.dbplatform.postgres;
+
+import io.ebean.annotation.Platform;
+
+/**
+ * Postgres9 platform - uses serial type for identity columns.
+ */
+public class Postgres9Platform extends PostgresPlatform {
+
+  public Postgres9Platform() {
+    super();
+    this.platform = Platform.POSTGRES9;
+  }
+}
@@ -19,10 +19,9 @@ import java.sql.SQLException;
 import java.sql.Types;

 /**
- * Postgres v9 specific platform.
+ * Postgres 10+ platform.
 * <p>
- * Uses serial types and getGeneratedKeys.
- * </p>
+ * Defaults to use "generated by default as identity".
 */
 public class PostgresPlatform extends DatabasePlatform {

@@ -35,7 +34,6 @@ public class PostgresPlatform extends DatabasePlatform {
    this.blobDbType = Types.LONGVARBINARY;
    this.clobDbType = Types.VARCHAR;
    this.nativeUuidType = true;
-    this.columnAliasPrefix = null;
    this.truncateTable = "truncate table %s cascade";
    this.dbEncrypt = new PostgresDbEncrypt();
    this.historySupport = new PostgresHistorySupport();
@@ -44,6 +42,7 @@ public class PostgresPlatform extends DatabasePlatform {
    this.dbIdentity.setIdType(IdType.IDENTITY);
    this.dbIdentity.setSupportsGetGeneratedKeys(true);
    this.dbIdentity.setSupportsSequence(true);
+    this.dbIdentity.setSupportsIdentity(true);

    this.dbDefaultValue.setNow("current_timestamp");

@@ -51,7 +50,7 @@ public class PostgresPlatform extends DatabasePlatform {
      new SqlErrorCodes()
        .addAcquireLock("55P03")
        .addDuplicateKey("23505")
-        .addDataIntegrity("23000","23502","23503","23514")
+        .addDataIntegrity("23000", "23502", "23503", "23514")
        .addSerializableConflict("40001")
        .build();

@@ -63,6 +62,7 @@ public class PostgresPlatform extends DatabasePlatform {

    dbTypeMap.put(DbType.UUID, new DbPlatformType("uuid", false));
    dbTypeMap.put(DbType.INET, new DbPlatformType("inet", false));
+    dbTypeMap.put(DbType.CIDR, new DbPlatformType("cidr", false));
    dbTypeMap.put(DbType.HSTORE, new DbPlatformType("hstore", false));
    dbTypeMap.put(DbType.JSON, new DbPlatformType("json", false));
    dbTypeMap.put(DbType.JSONB, new DbPlatformType("jsonb", false));
@@ -70,7 +70,6 @@ public class PostgresPlatform extends DatabasePlatform {
    dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false));
    dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("float"));
    dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint"));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("decimal", 38));
    dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("timestamptz"));

    dbTypeMap.put(DbType.BINARY, dbBytea);
@@ -127,7 +126,6 @@ public class PostgresPlatform extends DatabasePlatform {

  @Override
  public boolean tablePartitionsExist(Connection connection, String table) throws SQLException {
-
    try (PreparedStatement statement = connection.prepareStatement("select count(*) from pg_inherits i WHERE  i.inhparent = ?::regclass")) {
      statement.setString(1, table);
      try (ResultSet resultSet = statement.executeQuery()) {
@@ -138,18 +136,15 @@ public class PostgresPlatform extends DatabasePlatform {

  /**
   * Return SQL using built in partition helper functions to create some initial partitions.
-   *
+   * <p>
   * Only use this if extra-ddl doesn't have some initial partitions defined (which it should).
   */
  @Override
  public String tablePartitionInit(String tableName, PartitionMode mode, String property, String pkey) {
-    if (property == null) {
-      property = "";
-    }
-    if (pkey == null) {
-      pkey = "";
-    }
-    return "select partition('" + mode.name().toLowerCase() + "','" + tableName + "','" + pkey + "','" + property + "',1);";
+    // default partition required pg11 but this is only used for testing but bumped test docker container to pg11 by default
+    return
+      "create table " + tableName + "_default" + " partition of " + tableName + " default;\n" +
+        "select partition('" + mode.name().toLowerCase() + "','" + tableName + "',1);";
  }

 }
@@ -35,8 +35,7 @@ public class SqlAnywhereLimiter implements SqlLimiter {
    sb.append(dbSql);

    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-
-    return new SqlLimitResponse(sql, false);
+    return new SqlLimitResponse(sql);
  }

 }
@@ -32,8 +32,7 @@ public class SqlAnywherePlatform extends DatabasePlatform {
    dbTypeMap.put(DbType.REAL, new DbPlatformType("float(16)"));
    dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("float(32)"));
    dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint"));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("numeric", 28));
-
+    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("numeric", 16, 3));
    dbTypeMap.put(DbType.BLOB, new DbPlatformType("binary(4500)"));
    dbTypeMap.put(DbType.CLOB, new DbPlatformType("long varchar"));
    dbTypeMap.put(DbType.LONGVARBINARY, new DbPlatformType("long binary"));
@@ -12,7 +12,6 @@ public class SqlServer17Platform extends SqlServerBasePlatform {
  public SqlServer17Platform() {
    super();
    this.platform = Platform.SQLSERVER17;
-    this.columnAliasPrefix = null;
    this.nativeUuidType = true;
    this.dbTypeMap.put(DbType.UUID, new DbPlatformType("uniqueidentifier", false));
  }
@@ -1,11 +0,0 @@
-package io.ebean.config.dbplatform.sqlserver;
-
-/**
- * SQL Server platform using the older ROW_NUMBER() mechanism.
- */
-public class SqlServer2005Platform extends SqlServer16Platform {
-
-  public SqlServer2005Platform() {
-    this.sqlLimiter = new SqlServer2005SqlLimiter();
-  }
-}
@@ -1,79 +0,0 @@
-package io.ebean.config.dbplatform.sqlserver;
-
-import io.ebean.config.dbplatform.SqlLimitRequest;
-import io.ebean.config.dbplatform.SqlLimitResponse;
-import io.ebean.config.dbplatform.SqlLimiter;
-
-/**
- * Use top and row_number() function to limit sql results.
- */
-public class SqlServer2005SqlLimiter implements SqlLimiter {
-
-  final String rowNumberWindowAlias;
-
-  /**
-   * Specify the name of the rowNumberWindowAlias.
-   */
-  public SqlServer2005SqlLimiter(String rowNumberWindowAlias) {
-    this.rowNumberWindowAlias = rowNumberWindowAlias;
-  }
-
-  public SqlServer2005SqlLimiter() {
-    this("as limitresult");
-  }
-
-  @Override
-  public SqlLimitResponse limit(SqlLimitRequest request) {
-
-    StringBuilder sb = new StringBuilder(500);
-
-    int firstRow = request.getFirstRow();
-
-    int lastRow = request.getMaxRows();
-    if (lastRow > 0) {
-      lastRow += firstRow;
-    }
-
-    if (firstRow < 1) {
-      // just use top n
-      sb.append("select ");
-      if (request.isDistinct()) {
-        sb.append("distinct ");
-      }
-      sb.append("top ").append(lastRow).append(" ");
-      sb.append(request.getDbSql());
-      return new SqlLimitResponse(sb.toString(), false);
-    }
-
-    /*
-     * SELECT * FROM (SELECT TOP 20 ROW_NUMBER() OVER (ORDER BY ...) AS rn, ...)
-     * AS limitresult WHERE rn >= 11 AND rn <= 20
-     */
-
-    sb.append("select * ").append(NEW_LINE).append("from ( ");
-
-    sb.append("select ");
-    if (request.isDistinct()) {
-      sb.append("distinct ");
-    }
-    sb.append("top ").append(lastRow);
-    sb.append(" row_number() over (order by ");
-    sb.append(request.getDbOrderBy());
-    sb.append(") as rn, ");
-    sb.append(request.getDbSql());
-
-    sb.append(NEW_LINE).append(") ");
-    sb.append(rowNumberWindowAlias);
-    sb.append(" where ");
-    sb.append(" rn > ").append(firstRow);
-    if (lastRow > 0) {
-      sb.append(" and ");
-      sb.append(" rn <= ").append(lastRow);
-    }
-
-    String sql = request.getDbPlatform().completeSql(sb.toString(), request.getOrmQuery());
-
-    return new SqlLimitResponse(sql, true);
-  }
-
-}
@@ -62,9 +62,7 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
    dbTypeMap.put(DbType.REAL, new DbPlatformType("float(16)"));
    dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("float(32)"));
    dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint"));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("numeric", 28));
-
-
+    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("numeric", 16, 3));
    dbTypeMap.put(DbType.DATE, new DbPlatformType("date"));
    dbTypeMap.put(DbType.TIME, new DbPlatformType("time"));
    dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("datetime2"));
@@ -29,7 +29,7 @@ public class SqlServerSqlLimiter implements SqlLimiter {
      }
      sb.append("top ").append(maxRows).append(" ");
      sb.append(dbSql);
-      return new SqlLimitResponse(sb.toString(), false);
+      return new SqlLimitResponse(sb.toString());
    }

    sb.append("select ");
@@ -43,8 +43,7 @@ public class SqlServerSqlLimiter implements SqlLimiter {
    if (maxRows > 0) {
      sb.append(" fetch next ").append(maxRows).append(" rows only");
    }
-    String sql = sb.toString();
-    return new SqlLimitResponse(sql, false);
+    return new SqlLimitResponse(sb.toString());
  }

 }
@@ -1,106 +0,0 @@
-package io.ebean.config.properties;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-/**
- * Manages the underlying map of properties we are gathering.
- */
-class LoadContext {
-
-  private static final Logger log = LoggerFactory.getLogger(LoadContext.class);
-
-  /**
-   * Map we are loading the properties into.
-   */
-  private final Map<String, String> map = new LinkedHashMap<>();
-
-  /**
-   * Names of resources/files that were loaded.
-   */
-  private final Set<String> loadedResources = new LinkedHashSet<>();
-
-  /**
-   * Return the input stream (maybe null) for the given source.
-   */
-  InputStream resource(String resourcePath, Loader.Source source) {
-
-    InputStream is = null;
-    if (source == Loader.Source.RESOURCE) {
-      is = resourceStream(resourcePath);
-      if (is != null) {
-        loadedResources.add(resourcePath);
-      }
-    } else {
-      File file = new File(resourcePath);
-      if (file.exists()) {
-        try {
-          is = new FileInputStream(file);
-          loadedResources.add("file:" + resourcePath);
-        } catch (FileNotFoundException e) {
-          throw new IllegalStateException(e);
-        }
-      }
-    }
-
-    return is;
-  }
-
-  private InputStream resourceStream(String resourcePath) {
-    InputStream is = getClass().getResourceAsStream("/" + resourcePath);
-    if (is == null) {
-      // search the module path for top level resource
-      is = ClassLoader.getSystemResourceAsStream(resourcePath);
-    }
-    return is;
-  }
-
-  /**
-   * Add a property entry.
-   */
-  void put(String key, String val) {
-    if (val != null) {
-      val = val.trim();
-    }
-    map.put(key, val);
-  }
-
-  /**
-   * Evaluate all the expressions and return as a Properties object.
-   */
-  Properties eval() {
-
-    log.info("loaded properties from {}", loadedResources);
-
-    Properties properties = new Properties();
-
-    for (Map.Entry<String, String> entry : map.entrySet()) {
-      String key = entry.getKey();
-      String value = PropertyEval.eval(entry.getValue());
-      properties.setProperty(key, value);
-    }
-
-    return properties;
-  }
-
-  /**
-   * Read the special properties that can point to an external properties source.
-   */
-  String indirectLocation() {
-    String indirectLocation = map.get("load.properties");
-    if (indirectLocation == null) {
-      indirectLocation = map.get("load.properties.override");
-    }
-    return indirectLocation;
-  }
-}
@@ -1,181 +0,0 @@
-package io.ebean.config.properties;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.Properties;
-
-/**
- * Loads the configuration from known/expected locations.
- * <p>
- * Defines the loading order of resources and files.
- * </p>
- */
-class Loader {
-
-  private static final Logger log = LoggerFactory.getLogger(Loader.class);
-
-  enum Source {
-    RESOURCE,
-    FILE
-  }
-
-  private final LoadContext loadContext = new LoadContext();
-
-  private YamlLoader yamlLoader;
-
-  Loader() {
-    String skipYaml = System.getProperty("ebeanSkipYaml");
-    if (!"true".equals(skipYaml)) {
-      try {
-        Class<?> exists = Class.forName("org.yaml.snakeyaml.Yaml");
-        if (exists != null) {
-          yamlLoader = new YamlLoader(loadContext);
-        }
-      } catch (Exception e) {
-        // ignored
-      }
-    }
-  }
-
-  /**
-   * Load the configuration with the expected ordering.
-   */
-  void load() {
-
-    loadMain(Source.RESOURCE);
-    // external file configuration overrides the resources configuration
-    loadMain(Source.FILE);
-
-    loadViaSystemProperty();
-    loadViaIndirection();
-
-    // test configuration (if found) overrides main configuration
-    // we should only find these resources when running tests
-    loadTest();
-  }
-
-  /**
-   * Load test configuration.
-   */
-  private void loadTest() {
-    loadProperties("application-test.properties", Source.RESOURCE);
-    loadYaml("application-test.yaml", Source.RESOURCE);
-    loadYaml("application-test.yml", Source.RESOURCE);
-    loadProperties("test-ebean.properties", Source.RESOURCE);
-  }
-
-  /**
-   * Load configuration defined by a <em>load.properties</em> entry in properties file.
-   */
-  private void loadViaIndirection() {
-
-    String location = loadContext.indirectLocation();
-    if (location != null) {
-      location = PropertyEval.eval(location);
-      loadWithExtensionCheck(location);
-    }
-  }
-
-  /**
-   * Load the main configuration for the given source.
-   */
-  private void loadMain(Source source) {
-    loadYaml("application.yaml", source);
-    loadYaml("application.yml", source);
-    loadProperties("application.properties", source);
-    loadProperties("ebean.properties", source);
-  }
-
-  private void loadViaSystemProperty() {
-    String fileName = System.getenv("EBEAN_PROPS_FILE");
-    if (fileName == null) {
-      fileName = System.getProperty("ebean.props.file");
-      if (fileName != null) {
-        loadWithExtensionCheck(fileName);
-      }
-    } else {
-        loadWithExtensionCheck(fileName);
-    }
-  }
-
-  void loadWithExtensionCheck(String fileName) {
-    if (fileName.endsWith("yaml") || fileName.endsWith("yml")) {
-      loadYaml(fileName, Source.FILE);
-    } else if (fileName.endsWith("properties")) {
-      loadProperties(fileName, Source.FILE);
-    } else {
-      throw new IllegalArgumentException("Expecting only yml or properties file but got [" + fileName + "]");
-    }
-  }
-
-  /**
-   * Evaluate all the configuration entries and return as properties.
-   */
-  Properties eval() {
-    return loadContext.eval();
-  }
-
-  void loadYaml(String resourcePath, Source source) {
-    if (yamlLoader != null) {
-      try {
-        try (InputStream is = resource(resourcePath, source)) {
-          yamlLoader.load(is);
-        }
-      } catch (Exception e) {
-        log.warn("Failed to read yml from:" + resourcePath, e);
-      }
-    }
-  }
-
-  void loadProperties(String resourcePath, Source source) {
-    try {
-      try (InputStream is = resource(resourcePath, source)) {
-        if (is != null) {
-          loadProperties(is);
-        }
-      }
-    } catch (Exception e) {
-      log.warn("Failed to read properties from:" + resourcePath, e);
-    }
-  }
-
-  private InputStream resource(String resourcePath, Source source) {
-    return loadContext.resource(resourcePath, source);
-  }
-
-  private void loadProperties(InputStream is) {
-
-    if (is != null) {
-      try {
-        Properties properties = new Properties();
-        properties.load(is);
-        put(properties);
-      } catch (IOException e) {
-        throw new RuntimeException("Failed to load properties?", e);
-      } finally {
-        close(is);
-      }
-    }
-  }
-
-  private void put(Properties properties) {
-    Enumeration<?> enumeration = properties.propertyNames();
-    while (enumeration.hasMoreElements()) {
-      String key = (String) enumeration.nextElement();
-      String property = properties.getProperty(key);
-      loadContext.put(key, property);
-    }
-  }
-
-  private void close(InputStream is) {
-    try {
-      is.close();
-    } catch (IOException e) {
-      log.warn("Error closing input stream for properties", e);
-    }
-  }
-}
@@ -1,74 +0,0 @@
-package io.ebean.config.properties;
-
-import java.util.Enumeration;
-import java.util.Properties;
-
-/**
- * Loads and evaluates properties and yml configuration.
- */
-public class PropertiesLoader {
-
-  private static Properties properties;
-
-  /**
-   * Provides properties by reading known locations.
-   * <p>
-   * <h3>Main configuration</h3>
-   * <p>
-   * <p>Firstly loads from main resources</p>
-   * <pre>
-   *   - application.properties
-   *   - application.yaml
-   *   - ebean.properties
-   * </pre>
-   * <p>
-   * <p>Then loads from local files</p>
-   * <pre>
-   *   - application.properties
-   *   - application.yaml
-   *   - ebean.properties
-   * </pre>
-   * <p>
-   * <p>Then loads from environment variable <em>EBEAN_PROPS_FILE</em></p>
-   * <p>Then loads from system property <em>ebean.props.file</em></p>
-   * <p>Then loads from <em>load.properties</em></p>
-   * <p>
-   * <h3>Test configuration</h3>
-   * <p>
-   * Once the main configuration is read it will try to read common test configuration.
-   * This will only be successful if the test resources are available (i.e. running tests).
-   * </p>
-   * <p>Loads from test resources</p>
-   * <pre>
-   *   - application-test.properties
-   *   - application-test.yaml
-   *   - test-ebean.properties
-   * </pre>
-   */
-  public static synchronized Properties load() {
-
-    if (properties == null) {
-      Loader loader = new Loader();
-      loader.load();
-      properties = loader.eval();
-    }
-
-    return properties;
-  }
-
-  /**
-   * Return a copy of the properties with 'eval' run on all the values.
-   * This resolves expressions like ${HOME} etc.
-   */
-  public static Properties eval(Properties properties) {
-    Properties evalCopy = new Properties();
-
-    Enumeration<?> names = properties.propertyNames();
-    while (names.hasMoreElements()) {
-      String name = (String)names.nextElement();
-      String value = PropertyEval.eval(properties.getProperty(name));
-      evalCopy.setProperty(name, value);
-    }
-    return evalCopy;
-  }
-}
@@ -1,205 +0,0 @@
-package io.ebean.config.properties;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * Helper used to evaluate expressions such as ${CATALINA_HOME}.
- * <p>
- * The expressions can contain environment variables, system properties or JNDI
- * properties. JNDI expressions take the form ${jndi:propertyName} where you
- * substitute propertyName with the name of the jndi property you wish to
- * evaluate.
- * </p>
- */
-final class PropertyEval {
-
-  /**
-   * Prefix for looking up JNDI Environment variable.
-   */
-  private static final String JAVA_COMP_ENV = "java:comp/env/";
-
-  /**
-   * Used to detect the start of an expression.
-   */
-  private static final String START = "${";
-
-  /**
-   * Used to detect the end of an expression.
-   */
-  private static final String END = "}";
-
-  /**
-   * Specify the PropertyHolder.
-   */
-  private PropertyEval() {
-  }
-
-  /**
-   * Return the property value evaluating and replacing any expressions such as
-   * ${CATALINA_HOME}.
-   */
-  static String eval(String val) {
-    if (val == null) {
-      return null;
-    }
-    int sp = val.indexOf(START);
-    if (sp > -1) {
-      int ep = val.indexOf(END, sp + 1);
-      if (ep > -1) {
-        return eval(val, sp, ep);
-      }
-    }
-    return val;
-  }
-
-  /**
-   * Convert the expression using JNDI, Environment variables, System Properties
-   * or existing an property in SystemProperties itself.
-   */
-  private static String evaluateExpression(String exp) {
-
-    if (exp.isEmpty()) {
-      return null;
-    }
-    if (isJndiExpression(exp)) {
-      // JNDI property lookup...
-      String val = getJndiProperty(exp);
-      if (val != null) {
-        return val;
-      }
-    }
-    String val = System.getProperty(exp);
-    if (val == null) {
-      val = System.getenv(exp);
-    }
-    return val;
-  }
-
-  private static String eval(String val, int sp, int ep) {
-
-    return new EvalBuffer(val, sp, ep).process();
-  }
-
-
-  private static boolean isJndiExpression(String exp) {
-    return exp.startsWith("JNDI:") || exp.startsWith("jndi:");
-  }
-
-  /**
-   * Returns null if JNDI is not setup or if the property is not found.
-   *
-   * @param key the key of the JNDI Environment property including a JNDI: prefix.
-   */
-  private static String getJndiProperty(String key) {
-
-    try {
-      // remove the JNDI: prefix
-      key = key.substring(5);
-      return (String) getJndiObject(key);
-    } catch (NamingException ex) {
-      return null;
-    }
-  }
-
-  /**
-   * Similar to getProperty but throws NamingException if JNDI is not setup or
-   * if the property is not found.
-   */
-  private static Object getJndiObject(String key) throws NamingException {
-
-    InitialContext ctx = new InitialContext();
-    return ctx.lookup(JAVA_COMP_ENV + key);
-  }
-
-
-  private static class EvalBuffer {
-
-    private final StringBuilder buf = new StringBuilder();
-    private final String original;
-    private int position;
-    private int start;
-    private int end;
-
-    private String expression;
-    private String defaultValue;
-
-    EvalBuffer(String val, int start, int ep) {
-      this.original = val;
-      this.start = start;
-      this.end = ep;
-      this.position = 0;
-      moveToStart();
-    }
-
-    void moveToStart() {
-      if (start > position) {
-        buf.append(original.substring(position, start));
-        position = start;
-      }
-    }
-
-    void parseForDefault() {
-      int colonPos = original.lastIndexOf(':', end);
-      if (colonPos > start) {
-        expression = original.substring(start + START.length(), colonPos);
-        defaultValue = original.substring(colonPos + 1, end);
-      } else {
-        expression = original.substring(start + START.length(), end);
-      }
-    }
-
-    void evaluate() {
-      String eval = evaluateExpression(expression);
-      if (eval != null) {
-        buf.append(eval);
-      } else {
-        if (defaultValue != null) {
-          buf.append(defaultValue);
-        } else {
-          buf.append(START).append(expression).append(END);
-        }
-      }
-    }
-
-    String end() {
-      if (end < original.length() - 1) {
-        buf.append(original.substring(end + 1));
-      }
-      return buf.toString();
-    }
-
-    boolean next() {
-      if (end < original.length()) {
-        int startPos = original.indexOf(START, end + 1);
-        if (startPos > -1) {
-          int endPos = original.indexOf(END, startPos + 1);
-          if (endPos > -1) {
-            if (startPos > end + 1) {
-              buf.append(original.substring(end + 1, startPos));
-            }
-            this.start = startPos;
-            this.end = endPos;
-            return true;
-          }
-        }
-      }
-      return false;
-    }
-
-    private void evalNext() {
-      parseForDefault();
-      evaluate();
-    }
-
-    String process() {
-      evalNext();
-      while (next()) {
-        evalNext();
-      }
-      return end();
-    }
-
-  }
-
-}
@@ -1,58 +0,0 @@
-package io.ebean.config.properties;
-
-import org.yaml.snakeyaml.Yaml;
-
-import java.io.InputStream;
-import java.util.Map;
-
-/**
- * Loads configuration from Yml into the load context.
- * <p>
- * Note that this ignores 'lists' so just reads 'maps' and scalar values.
- * </p>
- */
-class YamlLoader {
-
-  private final Yaml yaml = new Yaml();
-
-  private final LoadContext loadContext;
-
-  YamlLoader(LoadContext loadContext) {
-    this.loadContext = loadContext;
-  }
-
-  @SuppressWarnings("unchecked")
-  void load(InputStream is) {
-    if (is != null) {
-      for (Object map : yaml.loadAll(is)) {
-        loadMap((Map<String, Object>)map, null);
-      }
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  void loadMap(Map<String, Object> map, String path) {
-
-    for (Map.Entry<String, Object> entry : map.entrySet()) {
-      String key = entry.getKey();
-      if (path != null) {
-        key = path + "." + key;
-      }
-      Object val = entry.getValue();
-      if (val instanceof Map) {
-        loadMap((Map<String, Object>) val, key);
-      } else  {
-        addScalar(key, val);
-      }
-    }
-  }
-
-  private void addScalar(String key, Object val) {
-    if (val instanceof String) {
-      loadContext.put(key, (String) val);
-    } else if (val instanceof Number || val instanceof Boolean) {
-      loadContext.put(key, val.toString());
-    }
-  }
-
-}
@@ -1,6 +1,6 @@
 package io.ebean.dbmigration;

-import io.ebean.EbeanServer;
+import io.ebean.Database;
 import io.ebean.annotation.Platform;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
@@ -62,11 +62,28 @@ public interface DbMigration {
   */
  void setPathToResources(String pathToResources);

+  /**
+   * Set the path where migrations are generated to (which defaults to "dbmigration").
+   * <p>
+   * Normally we only use this when we use Ebean to generate the database migrations
+   * and then use some other tool like FlywayDB to run the migrations.
+   * <p>
+   * Example: with <code>setMigrationPath("db/migration")</code> ... the migrations
+   * are generated into <code>src/resources/db/migration</code>.
+   * <p>
+   * Note that if Ebean migration runner is used we should not use this method but
+   * instead set the migrationPath via a property such that both the migration generator
+   * and migration runner both use the same path.
+   *
+   * @param migrationPath The path that migrations are generated into.
+   */
+  void setMigrationPath(String migrationPath);
+
  /**
   * Set the server to use to determine the current model.
   * Typically this is not called explicitly.
   */
-  void setServer(EbeanServer ebeanServer);
+  void setServer(Database database);

  /**
   * Set the serverConfig to use. Typically this is not called explicitly.
@@ -76,7 +93,7 @@ public interface DbMigration {
  /**
   * Set the specific platform to generate DDL for.
   * <p>
-   * If not set this defaults to the platform of the default server.
+   * If not set this defaults to the platform of the default database.
   * </p>
   */
  void setPlatform(Platform platform);
@@ -84,7 +101,7 @@ public interface DbMigration {
  /**
   * Set the specific platform to generate DDL for.
   * <p>
-   * If not set this defaults to the platform of the default server.
+   * If not set this defaults to the platform of the default database.
   * </p>
   */
  void setPlatform(DatabasePlatform databasePlatform);
@@ -15,8 +15,8 @@ package io.ebean.event;
 *
 *   Object extaBeanToSave = ...;
 *   Transaction t = request.getTransaction();
- *   EbeanServer server = request.getEbeanServer();
- *   server.save(extraBeanToSave, t);
+ *   Database server = request.getEbeanServer();
+ *   database.save(extraBeanToSave, t);
 *
 * }</pre>
 * <p>
@@ -1,6 +1,6 @@
 package io.ebean.event;

-import io.ebean.Ebean;
+import io.ebean.DB;

 import java.util.Set;

@@ -8,7 +8,7 @@ import java.util.Set;
 * Listen for bulk table events that occur.
 * <p>
 * These events can be triggered via
- * {@link Ebean#externalModification(String, boolean, boolean, boolean)} or
+ * {@link DB#externalModification(String, boolean, boolean, boolean)} or
 * automatically determined from Ebean bulk update statements.
 */
 public interface BulkTableEventListener {
@@ -9,9 +9,8 @@ import java.util.List;
 public class BasicMetricVisitor extends AbstractMetricVisitor implements ServerMetrics {

  private final List<MetaTimedMetric> timed = new ArrayList<>();
-  private final List<MetaQueryMetric> dtoQuery = new ArrayList<>();
-  private final List<MetaOrmQueryMetric> ormQuery = new ArrayList<>();
-  private final List<MetaCountMetric> countMetrics = new ArrayList<>();
+  private final List<MetaQueryMetric> query = new ArrayList<>();
+  private final List<MetaCountMetric> count = new ArrayList<>();

  /**
   * Construct to reset and collect everything.
@@ -27,33 +26,19 @@ public class BasicMetricVisitor extends AbstractMetricVisitor implements ServerM
    super(reset, collectTransactionMetrics, collectQueryMetrics, collectL2Metrics);
  }

-  /**
-   * Return timed metrics for Transactions, labelled SqlQuery, labelled SqlUpdate.
-   */
  @Override
  public List<MetaTimedMetric> getTimedMetrics() {
    return timed;
  }

-  /**
-   * Return the DTO query metrics.
-   */
  @Override
-  public List<MetaQueryMetric> getDtoQueryMetrics() {
-    return dtoQuery;
-  }
-
-  /**
-   * Return the ORM query metrics.
-   */
-  @Override
-  public List<MetaOrmQueryMetric> getOrmQueryMetrics() {
-    return ormQuery;
+  public List<MetaQueryMetric> getQueryMetrics() {
+    return query;
  }

  @Override
  public List<MetaCountMetric> getCountMetrics() {
-    return countMetrics;
+    return count;
  }

  @Override
@@ -63,16 +48,11 @@ public class BasicMetricVisitor extends AbstractMetricVisitor implements ServerM

  @Override
  public void visitQuery(MetaQueryMetric metric) {
-    dtoQuery.add(metric);
-  }
-
-  @Override
-  public void visitOrmQuery(MetaOrmQueryMetric metric) {
-    ormQuery.add(metric);
+    query.add(metric);
  }

  @Override
  public void visitCount(MetaCountMetric metric) {
-    countMetrics.add(metric);
+    count.add(metric);
  }
 }
@@ -1,19 +1,9 @@
 package io.ebean.meta;

 /**
- * Count metrics.
+ * Count metrics. For example L2 cache hits.
 */
-public interface MetaCountMetric {
-
-  /**
-   * Return the metric type.
-   */
-  MetricType getMetricType();
-
-  /**
-   * Return the metric name.
-   */
-  String getName();
+public interface MetaCountMetric extends MetaMetric {

  /**
   * Return the total count.
@@ -17,9 +17,21 @@ public interface MetaInfoManager {
  ServerMetrics collectMetrics();

  /**
-   * Collect query plans.
+   * Collect the metrics in raw JSON form.
+   * <pre>{@code
+   *
+   *   String metricsJson = database.getMetaInfoManager()
+   *       .collectMetricsAsJson()
+   *       .json();
+   *
+   * }</pre>
   */
-  List<MetaQueryPlan> collectQueryPlans(QueryPlanRequest request);
+  ServerMetricsAsJson collectMetricsAsJson();
+
+  /**
+   * Return the metrics as a list of MetricData.
+   */
+  List<MetricData> collectMetricsAsData();

  /**
   * Visit the metrics resetting and collecting/reporting as desired.
@@ -38,15 +50,20 @@ public interface MetaInfoManager {
  void resetAllMetrics();

  /**
-   * Collect and return the ObjectGraphNode statistics.
+   * Initiate query plan collection by turning on "bind capture" on matching query plans.
   * <p>
-   * These show query executions based on an origin point and relative path.
-   * This is used to look at the amount of lazy loading occurring for a given
-   * query origin point and highlight potential for tuning a query.
-   * </p>
+   * Also refer to ServerConfig collectQueryPlans that needs to be set to true
+   * and collectQueryPlanThresholdMicros which is a global defaults that can also
+   * initiate query plan capture.
   *
-   * @param reset Set to true to reset the underlying statistics after collection.
+   * @return The query plans that have had bind capture turned on by this request.
   */
-  List<MetaOrmQueryNode> collectNodeStatistics(boolean reset);
+  List<MetaQueryPlan> queryPlanInit(QueryPlanInit initRequest);
+
+  /**
+   * Collect query plans in the foreground.
+   */
+  List<MetaQueryPlan> queryPlanCollectNow(QueryPlanRequest request);
+

 }
@@ -0,0 +1,13 @@
+package io.ebean.meta;
+
+/**
+ * Metrics collected by Ebean including timed metrics and counters.
+ */
+public interface MetaMetric {
+
+  /**
+   * Return the metric name.
+   */
+  String getName();
+
+}
@@ -1,35 +0,0 @@
-package io.ebean.meta;
-
-import java.util.List;
-
-/**
- * Query execution statistics for Orm queries.
- */
-public interface MetaOrmQueryMetric extends MetaQueryMetric {
-
-  /**
-   * Return true if this query plan was tuned by AutoTune.
-   */
-  boolean isAutoTuned();
-
-  /**
-   * Return the hash of the sql.
-   */
-  String getSqlHash();
-
-  /**
-   * Return the time of the last query executed using this plan.
-   */
-  long getLastQueryTime();
-
-  /**
-   * Return the 'origin' points and paths that resulted in the query being
-   * executed and the associated number of times the query was executed via that
-   * path.
-   * <p>
-   * This includes direct and lazy loading paths.
-   * </p>
-   */
-  List<MetaOrmQueryOrigin> getOrigins();
-
-}
@@ -1,39 +0,0 @@
-package io.ebean.meta;
-
-import io.ebean.bean.ObjectGraphNode;
-
-/**
- * Statistics for query execution based on object graph origin and paths.
- * <p>
- * These statistics can be used to identify origin queries that result in lots
- * of lazy loading.
- * </p>
- */
-public interface MetaOrmQueryNode {
-
-  /**
-   * Return the ObjectGraphNode which has the origin point and relative path.
-   */
-  ObjectGraphNode getNode();
-
-  /**
-   * Return the startTime of statistics collection.
-   */
-  long getStartTime();
-
-  /**
-   * Return the total count of queries executed for this node.
-   */
-  long getCount();
-
-  /**
-   * Return the total time of queries executed for this node.
-   */
-  long getTotalTime();
-
-  /**
-   * Return the total beans loaded by queries for this node.
-   */
-  long getTotalBeans();
-
-}
@@ -1,30 +0,0 @@
-package io.ebean.meta;
-
-import io.ebean.bean.ObjectGraphNode;
-
-/**
- * Holds a query 'origin' point and count for the number of queries executed for
- * this 'origin'.
- * <p>
- * This basically points to the bit of original code and query that results in
- * this query directly or via lazy loading.
- * </p>
- */
-public interface MetaOrmQueryOrigin {
-
-  /**
-   * The 'origin' and path which this query belongs to.
-   * <p>
-   * For lazy loading queries this points to the original query and associated
-   * navigation path that resulted in this query being executed.
-   * </p>
-   */
-  ObjectGraphNode getObjectGraphNode();
-
-  /**
-   * The number of times a query was fired for this node since the counter was
-   * last reset.
-   */
-  long getCount();
-
-}
@@ -1,7 +1,5 @@
 package io.ebean.meta;

-import io.ebean.ProfileLocation;
-
 /**
 * Query execution metrics.
 */
@@ -17,14 +15,14 @@ public interface MetaQueryMetric extends MetaTimedMetric {
   */
  String getLabel();

-  /**
-   * Return the profile location.
-   */
-  ProfileLocation getProfileLocation();
-
  /**
   * The actual SQL of the query.
   */
  String getSql();

+  /**
+   * Return the hash of the plan.
+   */
+  String getHash();
+
 }
@@ -28,9 +28,9 @@ public interface MetaQueryPlan {
  String getSql();

  /**
-   * Return the hash of the sql.
+   * Return the hash of the plan.
   */
-  String getSqlHash();
+  String getHash();

  /**
   * Return a description of the bind values.
@@ -4,28 +4,13 @@ package io.ebean.meta;
 /**
 * Timed execution statistics.
 */
-public interface MetaTimedMetric {
-
-  /**
-   * Return the metric type.
-   */
-  MetricType getMetricType();
-
-  /**
-   * Return the metric name.
-   */
-  String getName();
+public interface MetaTimedMetric extends MetaMetric {

  /**
   * Return the metric location if defined.
   */
  String getLocation();

-  /**
-   * Return the time the counters started from.
-   */
-  long getStartTime();
-
  /**
   * Return the total count.
   */
@@ -47,9 +32,11 @@ public interface MetaTimedMetric {
  long getMean();

  /**
-   * Return the total beans or rows processed or loaded.
-   *
-   * This will be 0 if the metric isn't a query plan (like transaction execution statistics).
+   * Return true if this is the first metrics collection for this query.
+   * <p>
+   * This can be used to suppress including the SQL and location from metrics
+   * content.
+   * </p>
   */
-  long getBeanCount();
+  boolean initialCollection();
 }
@@ -0,0 +1,88 @@
+package io.ebean.meta;
+
+/**
+ * An individual metric.
+ */
+public class MetricData {
+
+  private String name;
+  private String hash;
+  private String loc;
+  private String sql;
+
+  private Long count;
+  private Long mean;
+  private Long max;
+  private Long total;
+
+  public MetricData(String name) {
+    this.name = name;
+  }
+
+  public MetricData() {
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getHash() {
+    return hash;
+  }
+
+  public void setHash(String hash) {
+    this.hash = hash;
+  }
+
+  public String getLoc() {
+    return loc;
+  }
+
+  public void setLoc(String loc) {
+    this.loc = loc;
+  }
+
+  public String getSql() {
+    return sql;
+  }
+
+  public void setSql(String sql) {
+    this.sql = sql;
+  }
+
+  public Long getCount() {
+    return count;
+  }
+
+  public void setCount(Long count) {
+    this.count = count;
+  }
+
+  public Long getMean() {
+    return mean;
+  }
+
+  public void setMean(Long mean) {
+    this.mean = mean;
+  }
+
+  public Long getMax() {
+    return max;
+  }
+
+  public void setMax(Long max) {
+    this.max = max;
+  }
+
+  public Long getTotal() {
+    return total;
+  }
+
+  public void setTotal(Long total) {
+    this.total = total;
+  }
+}
@@ -1,35 +0,0 @@
-package io.ebean.meta;
-
-/**
- * The type of Metric.
- */
-public enum MetricType {
-
-  /**
-   * Transactions.
-   */
-  TXN,
-
-  /**
-   * ORM queries.
-   */
-  ORM,
-
-  /**
-   * DTO queries.
-   */
-  DTO,
-
-  /**
-   * SQL queries with a label will have metrics collected.
-   * <p>
-   * SqlQuery and SqlUpdate without a label have no metrics collected.
-   */
-  SQL,
-
-  /**
-   * L2 cache metrics.
-   */
-  L2
-
-}
@@ -40,11 +40,6 @@ public interface MetricVisitor {
   */
  void visitQuery(MetaQueryMetric metric);

-  /**
-   * Visit ORM query metrics.
-   */
-  void visitOrmQuery(MetaOrmQueryMetric metric);
-
  /**
   * Visit a Counter metric.
   */
@@ -0,0 +1,67 @@
+package io.ebean.meta;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Initiate query plan collection for plans by their hash or all query plans.
+ */
+public class QueryPlanInit {
+
+  private boolean all;
+
+  private Set<String> hashes = new HashSet<>();
+
+  private long thresholdMicros;
+
+  /**
+   * Return true if this initiates bind collection on all query plans.
+   */
+  public boolean isAll() {
+    return all;
+  }
+
+  /**
+   * Set to true to initiate bind collection on all query plans.
+   */
+  public void setAll(boolean all) {
+    this.all = all;
+  }
+
+  /**
+   * Return the query execution time threshold which must be exceeded to initiate
+   * query plan collection.
+   */
+  public long getThresholdMicros() {
+    return thresholdMicros;
+  }
+
+  /**
+   * Set the query execution time threshold which must be exceeded to initiate
+   * query plan collection.
+   */
+  public void setThresholdMicros(long thresholdMicros) {
+    this.thresholdMicros = thresholdMicros;
+  }
+
+  /**
+   * Return true if the query plan should be initiated based on it's hash.
+   */
+  public boolean includeHash(String hash) {
+    return all || hashes.contains(hash);
+  }
+
+  /**
+   * Return the specific hashes that we want to collect query plans on.
+   */
+  public Set<String> getHashes() {
+    return hashes;
+  }
+
+  /**
+   * Set the specific hashes that we want to collect query plans on.
+   */
+  public void setHashes(Set<String> hashes) {
+    this.hashes = hashes;
+  }
+}
@@ -1,97 +1,66 @@
 package io.ebean.meta;

-import java.sql.Connection;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
 /**
 * Request used to capture query plans.
 */
 public class QueryPlanRequest {

-  private final List<MetaQueryPlan> plans = new ArrayList<>();
-
-  private Connection connection;
-
-  private boolean store;
-
  private long since;

-  private Set<Class<?>> includedBeanTypes;
+  private int maxCount;

-  private Set<String> includedLabels;
-
-  public List<MetaQueryPlan> getPlans() {
-    return plans;
-  }
+  private long maxTimeMillis;

  /**
-   * Return the connection to use to capture the query plans.
-   */
-  public Connection getConnection() {
-    return connection;
-  }
-
-  /**
-   * Set the connection to use to capture the query plans.
-   */
-  public void setConnection(Connection connection) {
-    this.connection = connection;
-  }
-
-  /**
-   * Return true if the captured query plan is stored.
-   */
-  public boolean isStore() {
-    return store;
-  }
-
-  /**
-   * Set to true to store the captured query plan.
-   */
-  public void setStore(boolean store) {
-    this.store = store;
-  }
-
-  /**
-   * Return the epoch time after which the query plan was capture (to be included).
+   * Return the epoch time in millis for minimum bind capture time.
+   * <p>
+   * When set this ensures that the bind values used to get the query plan
+   * have been around for a while (e.g. 5 mins) and so reasonably represent
+   * bind values that match the slowest execution for this query plan.
   */
  public long getSince() {
    return since;
  }

  /**
-   * Set the epoch time after which the query plan was captured.
-   * <p>
-   * This is used to only capture plans that have changed since a given time (like the time of last capture).
-   * </p>
+   * Set the epoch time (e.g. 5 mins ago) such that the query bind values
+   * reasonably represent bind values that match the slowest execution for this query plan.
   *
-   * @param since The time after which the query plan was captured to be included
+   * @param since The minimum age of the bind values capture.
   */
  public void setSince(long since) {
    this.since = since;
  }

  /**
-   * Process consume the query plan.
+   * Return the maximum number of plans to capture.
   */
-  public void process(MetaQueryPlan plan) {
-    plans.add(plan);
+  public int getMaxCount() {
+    return maxCount;
  }

  /**
-   * Return true if the bean type should be included in the query plan capture.
+   * Set the maximum number of plans to capture.
   */
-  public boolean includeType(Class<?> beanType) {
-    return includedBeanTypes == null || includedBeanTypes.isEmpty() || includedBeanTypes.contains(beanType);
+  public void setMaxCount(int maxCount) {
+    this.maxCount = maxCount;
  }

  /**
-   * Return true if the label should be included in the query plan capture.
+   * Return the maximum amount of time we want to use to capture plans.
+   * <p>
+   * Query plan collection will stop once this time is exceeded.
   */
-  public boolean includeLabel(String label) {
-    return includedLabels == null || includedLabels.isEmpty() || includedLabels.contains(label);
+  public long getMaxTimeMillis() {
+    return maxTimeMillis;
  }

+  /**
+   * Set the maximum amount of time we want to use to capture plans.
+   * <p>
+   * Query plan collection will stop once this time is exceeded.
+   */
+  public void setMaxTimeMillis(long maxTimeMillis) {
+    this.maxTimeMillis = maxTimeMillis;
+  }
 }
@@ -13,14 +13,9 @@ public interface ServerMetrics {
  List<MetaTimedMetric> getTimedMetrics();

  /**
-   * Return the DTO query metrics.
+   * Return the query metrics.
   */
-  List<MetaQueryMetric> getDtoQueryMetrics();
-
-  /**
-   * Return the ORM query metrics.
-   */
-  List<MetaOrmQueryMetric> getOrmQueryMetrics();
+  List<MetaQueryMetric> getQueryMetrics();

  /**
   * Return the Counter metrics.
@@ -0,0 +1,47 @@
+package io.ebean.meta;
+
+import java.util.Comparator;
+
+/**
+ * Collect the metrics in raw JSON form.
+ */
+public interface ServerMetricsAsJson {
+
+  /**
+   * Set to false to exclude profile location and sql.
+   */
+  ServerMetricsAsJson withExtraAttributes(boolean withLocation);
+
+  /**
+   * Set to false to exclude SQL hash.
+   */
+  ServerMetricsAsJson withHash(boolean withHash);
+
+  /**
+   * Set the sort property - see SortMetric
+   * @see SortMetric
+   */
+  ServerMetricsAsJson withSort(Comparator<MetaTimedMetric> sortBy);
+
+  /**
+   * Set the new line character to use.
+   */
+  ServerMetricsAsJson withNewLine(boolean withNewLine);
+
+  /**
+   * Set to include a heading of the database name.
+   * <p>
+   * When this is false the metrics are written without json array start or array end.
+   */
+  ServerMetricsAsJson withHeader(boolean withHeader);
+
+    /**
+     * Collect and write metrics as JSON to the given buffer.
+     */
+  void write(Appendable buffer);
+
+  /**
+   * Return the metrics in raw JSON.
+   */
+  String json();
+}
@@ -1,7 +1,6 @@
 package io.ebean.metric;

 import io.ebean.ProfileLocation;
-import io.ebean.meta.MetricType;

 /**
 * Factory to create timed metric counters.
@@ -18,21 +17,21 @@ public interface MetricFactory {
  /**
   * Create a timed metric group.
   */
-  TimedMetricMap createTimedMetricMap(MetricType metricType, String name);
+  TimedMetricMap createTimedMetricMap(String name);

  /**
   * Create a Timed metric.
   */
-  TimedMetric createTimedMetric(MetricType metricType, String name);
+  TimedMetric createTimedMetric(String name);

  /**
   * Create a counter metric.
   */
-  CountMetric createCountMetric(MetricType metricType, String name);
+  CountMetric createCountMetric(String name);

  /**
   * Create a Timed metric.
   */
-  QueryPlanMetric createQueryPlanMetric(MetricType metricType, Class<?> type, String label, ProfileLocation profileLocation, String sql);
+  QueryPlanMetric createQueryPlanMetric(Class<?> type, String label, ProfileLocation profileLocation, String sql);

 }
--- a/Show More
+++ b/Show More