#1966 Remove sequence batching - postgres opps

Remove Sequence batching in favour of JPA increment 50
Also remove h2sqldb in favour of always using H2
2024-04-21 10:51:47 +00:00 · 2020-03-05 00:34:05 +13:00 · 2020-03-05 00:22:20 +13:00 · 2020-03-05 00:21:36 +13:00 · 2020-03-05 00:13:41 +13:00 · 2020-03-05 00:13:08 +13:00
1497 changed files with 55514 additions and 23568 deletions
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+custom: https://ebean.io/sponsors
@@ -1,14 +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
@@ -1,8 +1,39 @@
+[![Build Status](https://travis-ci.org/ebean-orm/ebean.svg?branch=master)](https://travis-ci.org/ebean-orm/ebean)
+[![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean)
+
+# Sponsors
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="middle">
+        <a href="https://www.foconis.de/" target="_blank">
+          <img width="222px" src="https://www.foconis.de/templates/yootheme/cache/foconis_logo_322-709da1de.png">
+        </a>
+      </td>
+      <td align="center" valign="middle">
+        <a href="https://www.payintech.com/" target="_blank">
+          <img width="222px" src="https://ebean.io/images/sponsor_PayinTech-logo-noir.png">
+        </a>
+      </td>
+      <td align="center" valign="middle">
+        <a href="https://www.premium-minds.com" target="_blank">
+          <img width="222px" src="https://ebean.io/images/logo-med-principal.png">
+        </a>
+      </td>
+      <td align="center" valign="middle">
+        <a href="https://timerbee.de" target="_blank">
+          <img width="222px" src="https://ebean.io/images/logo-timerbee.png">
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>
+
 # Need help?
 Post questions or issues to the Ebean google group - https://groups.google.com/forum/#!forum/ebean

 # Documentation
-Goto [https://ebean-orm.github.io/](http://ebean-orm.github.io/ "Ebean ORM's Website")
+Goto [https://ebean.io/docs/](https://ebean.io/docs/)


 ## Maven cental links:
@@ -10,8 +41,6 @@ Goto [https://ebean-orm.github.io/](http://ebean-orm.github.io/ "Ebean ORM's Web

 [Maven central - all related projects](http://search.maven.org/#search%7Cga%7C1%7Cebean "maven central all related projects")

-## Current versions
-* [![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean) - ebean
+## Other versions
 * [![Maven Central : ebean-agent](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-agent/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-agent) - ebean-agent
 * [![Maven Central : ebean-maven-plugin](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-maven-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean-maven-plugin) - ebean-maven-plugin
-
@@ -3,56 +3,29 @@

  <parent>
    <groupId>org.avaje</groupId>
-    <artifactId>java8-parent</artifactId>
-    <version>1.3</version>
+    <artifactId>java8-oss</artifactId>
+    <version>2.1</version>
  </parent>

  <groupId>io.ebean</groupId>
  <artifactId>ebean</artifactId>
-  <version>11.29.1</version>
+  <version>12.1.14-SNAPSHOT</version>
  <packaging>jar</packaging>

  <name>ebean</name>
  <url>http://ebean-orm.github.io/</url>

  <properties>
-    <jackson-core.version>2.9.5</jackson-core.version>
-    <snakeyaml.version>1.21</snakeyaml.version>
+    <jackson-core.version>2.10.0</jackson-core.version>
+    <jackson-databind.version>2.10.0</jackson-databind.version>
  </properties>

  <scm>
    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-11.29.1</tag>
+    <tag>HEAD</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:
@@ -88,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.0</version>
    </dependency>

    <!--
@@ -111,37 +81,37 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>persistence-api</artifactId>
-      <version>2.2.1</version>
+      <version>2.2.2</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-annotation</artifactId>
-      <version>4.3</version>
+      <version>6.9</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-types</artifactId>
+      <version>2.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-datasource</artifactId>
-      <version>4.3.2</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>11.12.1</version>
+      <version>12.1.4</version>
    </dependency>

    <dependency>
      <groupId>org.antlr</groupId>
      <artifactId>antlr4-runtime</artifactId>
-      <version>4.7.1</version>
+      <version>4.7.2</version>
    </dependency>

    <!-- Jackson core used internally by Ebean -->
@@ -155,7 +125,7 @@
    <dependency>
      <groupId>com.fasterxml.jackson.core</groupId>
      <artifactId>jackson-databind</artifactId>
-      <version>${jackson-core.version}</version>
+      <version>${jackson-databind.version}</version>
      <scope>provided</scope>
    </dependency>

@@ -188,27 +158,49 @@
      <scope>provided</scope>
    </dependency>

+    <!-- Provided scope to compile with java 11 -->
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>2.3.2</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>1.3.2</version>
+      <scope>provided</scope>
+    </dependency>
+
    <!-- Provided scope for Postgres JSON/JSONB support -->
    <dependency>
      <groupId>org.postgresql</groupId>
      <artifactId>postgresql</artifactId>
-      <version>42.2.2</version>
+      <version>42.2.10</version>
      <scope>provided</scope>
    </dependency>

    <!-- Test scope -->

-    <!--<dependency>-->
-      <!--<groupId>oracle</groupId>-->
-      <!--<artifactId>oracle-jdbc</artifactId>-->
-      <!--<version>7.0</version>-->
-      <!--<scope>test</scope>-->
-    <!--</dependency>-->
+    <dependency>
+      <groupId>com.nuodb.jdbc</groupId>
+      <artifactId>nuodb-jdbc</artifactId>
+      <version>20.2.0</version>
+      <scope>test</scope>
+    </dependency>

    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-docker-run</artifactId>
-      <version>1.5.1</version>
+      <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>3.1.3</version>
      <scope>test</scope>
    </dependency>

@@ -219,26 +211,12 @@
      <scope>test</scope>
    </dependency>

-    <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-agentloader</artifactId>
-      <version>2.1.2</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-agent</artifactId>
-      <version>11.25.1</version>
-      <scope>test</scope>
-    </dependency>
-
    <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
         and not require a separate module for it -->
    <dependency>
      <groupId>com.h2database</groupId>
      <artifactId>h2</artifactId>
-      <version>1.4.197</version>
+      <version>1.4.199</version>
      <scope>provided</scope>
    </dependency>

@@ -259,15 +237,14 @@
    <dependency>
      <groupId>com.microsoft.sqlserver</groupId>
      <artifactId>mssql-jdbc</artifactId>
-      <version>6.4.0.jre8</version>
+      <version>7.2.2.jre8</version>
      <scope>test</scope>
    </dependency>

    <dependency>
      <groupId>mysql</groupId>
      <artifactId>mysql-connector-java</artifactId>
-      <!-- Do not upgrade to 6.0.6: https://bugs.mysql.com/bug.php?id=82896 -->
-      <version>5.1.43</version>
+      <version>8.0.17</version>
      <scope>test</scope>
    </dependency>

@@ -278,12 +255,18 @@
      <scope>test</scope>
    </dependency>

+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>3.0.0</version>
+      <scope>test</scope>
+    </dependency>
+
    <dependency>
      <groupId>org.avaje.composite</groupId>
-      <artifactId>avaje-composite-testing</artifactId>
+      <artifactId>junit</artifactId>
      <version>1.1</version>
      <scope>test</scope>
-      <type>pom</type>
    </dependency>

    <dependency>
@@ -294,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>

@@ -309,13 +292,13 @@
      <plugin>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.25.1</version>
+        <version>12.1.12</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>
@@ -327,9 +310,10 @@
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.5</version>
+        <version>2.22.1</version>
        <configuration>
          <useSystemClassLoader>false</useSystemClassLoader>
+          <trimStackTrace>false</trimStackTrace>
          <failIfNoTests>false</failIfNoTests>
          <includes>
            <include>**/Test*.java</include>
@@ -365,25 +349,11 @@
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9.1</version>
+        <version>3.1.1</version>
        <configuration>
-          <doctitle>Ebean 11</doctitle>
+          <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.*:com.avaje.ebean.util</excludePackageNames>
-          <docletArtifact>
-            <groupId>org.avaje</groupId>
-            <artifactId>pygments-doclet</artifactId>
-            <version>1.0.0</version>
-          </docletArtifact>
-          <additionalparam>
-            -Xdoclint:none
-            -include-basedir ${project.basedir}
-            -attributes "idseparator=-; project_name=${project.name}; \
-            project_version=${project.version}; \
-            project_desc=${project.description}"
-          </additionalparam>
+          <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>
          <linksource>true</linksource>
          <overview>src/main/java/com/avaje/ebean/overview.html</overview>
        </configuration>
@@ -1,6 +1,8 @@
 package io.ebean;

+import java.util.concurrent.Callable;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;

 /**
@@ -37,4 +39,21 @@ public interface BackgroundExecutor {
   * </p>
   */
  void executePeriodically(Runnable r, long delay, TimeUnit unit);
+
+  /**
+   * Schedules a Runnable for one-shot action that becomes enabled after the given delay.
+   *
+   * @return a ScheduledFuture representing pending completion of the task and
+   *         whose get() method will return null upon completion
+   */
+  ScheduledFuture<?> schedule(Runnable r, long delay, TimeUnit unit);
+
+  /**
+   * Schedules a Callable for one-shot action that becomes enabled after the given delay.
+   *
+   * @return a ScheduledFuture that can be used to extract result or cancel
+   */
+  <V> ScheduledFuture<V> schedule(Callable<V> c, long delay, TimeUnit unit);
+
+
 }
@@ -15,8 +15,8 @@ import java.util.Optional;
 * public class CustomerFinder extends BeanFinder<Long,Customer> {
 *
 *   @Inject
- *   public CustomerFinder(EbeanServer server) {
- *     super(Customer.class, server);
+ *   public CustomerFinder(Database database) {
+ *     super(Customer.class, database);
 *   }
 *
 *   // ... add customer specific finders
@@ -29,25 +29,25 @@ import java.util.Optional;
 */
 public abstract class BeanFinder<I,T> {

-  protected final EbeanServer server;
+  protected final Database server;

  protected final Class<T> type;

  /**
-   * Create with the given bean type and EbeanServer instance.
+   * Create with the given bean type and Database instance.
   *
   * @param type The bean type
-   * @param server The EbeanServer instance typically created via Spring factory or equivalent.
+   * @param server The Database instance typically created via Spring factory or equivalent.
   */
-  protected BeanFinder(Class<T> type, EbeanServer server) {
+  protected BeanFinder(Class<T> type, Database server) {
    this.type = type;
    this.server = server;
  }

  /**
-   * Return the EbeanServer to use.
+   * Return the Database to use.
   */
-  public EbeanServer db() {
+  public Database db() {
    return server;
  }

@@ -66,21 +66,20 @@ public abstract class BeanFinder<I,T> {
  }

  /**
-   * Return typically a different EbeanServer to the default.
+   * Return typically a different Database to the default.
   * <p>
-   * This is equivalent to {@link Ebean#getServer(String)}
+   * This is equivalent to {@link DB#byName(String)}
   *
-   * @param server The name of the EbeanServer. If this is null then the default EbeanServer is
-   *               returned.
+   * @param server The name of the Database. If this is null then the default Database is returned.
   */
-  public EbeanServer db(String server) {
-    return Ebean.getServer(server);
+  public Database db(String server) {
+    return DB.byName(server);
  }

  /**
   * Creates an entity reference for this ID.
   * <p>
-   * Equivalent to {@link EbeanServer#getReference(Class, Object)}
+   * Equivalent to {@link Database#getReference(Class, Object)}
   */
  @Nonnull
  public T ref(I id) {
@@ -89,8 +88,6 @@ public abstract class BeanFinder<I,T> {

  /**
   * Retrieves an entity by ID.
-   * <p>
-   * Equivalent to {@link EbeanServer#find(Class, Object)}
   */
  @Nullable
  public T findById(I id) {
@@ -107,8 +104,6 @@ public abstract class BeanFinder<I,T> {

  /**
   * Delete a bean by Id.
-   * <p>
-   * Equivalent to {@link EbeanServer#delete(Class, Object)}
   */
  public void deleteById(I id) {
    db().delete(type, id);
@@ -138,7 +133,7 @@ public abstract class BeanFinder<I,T> {
   * }</pre>
   *
   * <p>
-   * Equivalent to {@link EbeanServer#update(Class)}
+   * Equivalent to {@link Database#update(Class)}
   */
  protected UpdateQuery<T> updateQuery() {
    return db().update(type);
@@ -147,7 +142,7 @@ public abstract class BeanFinder<I,T> {
  /**
   * Creates a query.
   * <p>
-   * Equivalent to {@link EbeanServer#find(Class)}
+   * Equivalent to {@link Database#find(Class)}
   */
  protected Query<T> query() {
    return db().find(type);
@@ -13,7 +13,7 @@ import java.util.Collection;
 * public class CustomerRepository extends BeanRepository<Long,Customer> {
 *
 *   @Inject
- *   public CustomerRepository(EbeanServer server) {
+ *   public CustomerRepository(Database server) {
 *     super(Customer.class, server);
 *   }
 *
@@ -34,23 +34,23 @@ import java.util.Collection;
 public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {

  /**
-   * Create with the given bean type and EbeanServer instance.
+   * Create with the given bean type and Database instance.
   * <p>
   * Typically users would extend BeanRepository rather than BeanFinder.
   * </p>
   * <pre>{@code
   *
   *   @Inject
-   *   public CustomerRepository(EbeanServer server) {
+   *   public CustomerRepository(Database server) {
   *     super(Customer.class, server);
   *   }
   *
   * }</pre>
   *
   * @param type   The bean type
-   * @param server The EbeanServer instance typically created via Spring factory or equivalent
+   * @param server The Database instance typically created via Spring factory or equivalent
   */
-  protected BeanRepository(Class<T> type, EbeanServer server) {
+  protected BeanRepository(Class<T> type, Database server) {
    super(type, server);
  }

@@ -75,7 +75,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
   *
   * }</pre>
   *
-   * @see EbeanServer#markAsDirty(Object)
+   * @see Database#markAsDirty(Object)
   */
  public void markAsDirty(T bean) {
    db().markAsDirty(bean);
@@ -111,7 +111,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
   * Ebean will detect if this is a new bean or a previously fetched bean and perform either an
   * insert or an update based on that.
   *
-   * @see EbeanServer#save(Object)
+   * @see Database#save(Object)
   */
  public void save(T bean) {
    db().save(bean);
@@ -127,7 +127,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
  /**
   * Update this entity.
   *
-   * @see EbeanServer#update(Object)
+   * @see Database#update(Object)
   */
  public void update(T bean) {
    db().update(bean);
@@ -136,7 +136,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
  /**
   * Insert this entity.
   *
-   * @see EbeanServer#insert(Object)
+   * @see Database#insert(Object)
   */
  public void insert(T bean) {
    db().insert(bean);
@@ -157,7 +157,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
   * deleted. Note that, if JDBC batch mode is used then this always returns true.
   * </p>
   *
-   * @see EbeanServer#delete(Object)
+   * @see Database#delete(Object)
   */
  public boolean delete(T bean) {
    return db().delete(bean);
@@ -177,7 +177,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
   * want to perform a hard/permanent delete.
   * </p>
   *
-   * @see EbeanServer#deletePermanent(Object)
+   * @see Database#deletePermanent(Object)
   */
  public boolean deletePermanent(T bean) {
    return db().deletePermanent(bean);
@@ -189,7 +189,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
   * Ebean will detect if this is a new bean or a previously fetched bean and perform either an
   * insert or an update based on that.
   *
-   * @see EbeanServer#merge(Object)
+   * @see Database#merge(Object)
   */
  public void merge(T bean) {
    db().merge(bean);
@@ -201,7 +201,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
   * Ebean will detect if this is a new bean or a previously fetched bean and perform either an
   * insert or an update based on that.
   *
-   * @see EbeanServer#merge(Object, MergeOptions)
+   * @see Database#merge(Object, MergeOptions)
   */
  public void merge(T bean, MergeOptions options) {
    db().merge(bean, options);
@@ -210,7 +210,7 @@ public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
  /**
   * Refreshes this entity from the database.
   *
-   * @see EbeanServer#refresh(Object)
+   * @see Database#refresh(Object)
   */
  public void refresh(T bean) {
    db().refresh(bean);
@@ -1,5 +1,6 @@
 package io.ebean;

+import javax.annotation.Nullable;
 import java.util.Map;
 import java.util.Set;

@@ -56,7 +57,7 @@ public interface BeanState {
   *
   *   // set loaded state on the email property to false so that
   *   // the email property is not included in a stateless update
-   *   Ebean.getBeanState(user).setPropertyLoaded("email", false);
+   *   DB.getBeanState(user).setPropertyLoaded("email", false);
   *
   *   user.update();
   *
@@ -101,7 +102,7 @@ public interface BeanState {
  /**
   * Advanced - Used to programmatically build a partially or fully loaded
   * entity bean. First create an entity bean via
-   * {@link EbeanServer#createEntityBean(Class)}, then populate its properties
+   * {@link Database#createEntityBean(Class)}, then populate its properties
   * and then call this method specifying which properties where loaded or null
   * for a fully loaded entity bean.
   */
@@ -111,4 +112,10 @@ public interface BeanState {
   * Reset the bean putting it into NEW state such that a save() results in an insert.
   */
  void resetForInsert();
+
+  /**
+   * Returns a map with load erros.
+   */
+  @Nullable
+  Map<String, Exception> getLoadErrors();
 }
@@ -69,8 +69,8 @@ public enum CacheMode {
   */
  GET(true, false);

-  private boolean get;
-  private boolean put;
+  private final boolean get;
+  private final boolean put;

  CacheMode(boolean get, boolean put) {
    this.get = get;
@@ -17,11 +17,11 @@ import java.sql.SQLException;
 *
 * String sql = "{call sp_order_mod(?,?)}";
 *
- * CallableSql cs = Ebean.createCallableSql(sql);
+ * CallableSql cs = DB.createCallableSql(sql);
 * cs.setParameter(1, "turbo");
 * cs.registerOut(2, Types.INTEGER);
 *
- * Ebean.execute(cs);
+ * DB.execute(cs);
 *
 * // read the out parameter
 * Integer returnValue = (Integer) cs.getObject(2);
@@ -38,7 +38,7 @@ import java.sql.SQLException;
 *
 * String sql = "{call sp_insert_order(?,?)}";
 *
- * CallableSql cs = Ebean.createCallableSql(sql);
+ * CallableSql cs = DB.createCallableSql(sql);
 *
 * // Inform Ebean this stored procedure inserts into the
 * // oe_order table and inserts + updates the oe_order_detail table.
@@ -46,35 +46,33 @@ import java.sql.SQLException;
 * cs.addModification("oe_order", true, false, false);
 * cs.addModification("oe_order_detail", true, true, false);
 *
- * Transaction t = Ebean.startTransaction();
 *
- * // execute using JDBC batching 10 statements at a time
- * t.setBatchMode(true);
- * t.setBatchSize(10);
- * try {
+ * try (Transaction t = DB.beginTransaction()) {
+ *
+ *   // execute using JDBC batching 10 statements at a time
+ *   t.setBatchMode(true);
+ *   t.setBatchSize(10);
+ *
 *   cs.setParameter(1, "Was");
 *   cs.setParameter(2, "Banana");
- *   Ebean.execute(cs);
+ *   DB.execute(cs);
 *
 *   cs.setParameter(1, "Here");
 *   cs.setParameter(2, "Kumera");
- *   Ebean.execute(cs);
+ *   DB.execute(cs);
 *
 *   cs.setParameter(1, "More");
 *   cs.setParameter(2, "Apple");
- *   Ebean.execute(cs);
+ *   DB.execute(cs);
 *
- *   // Ebean.externalModification("oe_order",true,false,false);
- *   // Ebean.externalModification("oe_order_detail",true,true,false);
- *   Ebean.commitTransaction();
+ *   // DB.externalModification("oe_order",true,false,false);
+ *   // DB.externalModification("oe_order_detail",true,true,false);
+ *   t.commit();
 *
- * } finally {
- *   Ebean.endTransaction();
 * }
 * }</pre>
 *
 * @see SqlUpdate
- * @see Ebean#execute(CallableSql)
 */
 public interface CallableSql {

@@ -173,7 +171,7 @@ public interface CallableSql {
   * Add table modification information to the TransactionEvent.
   * <p>
   * This would be similar to using the
-   * <code>Ebean.externalModification()</code> method. It may be easier and make
+   * <code>DB.externalModification()</code> method. It may be easier and make
   * more sense to set it here with the CallableSql.
   * </p>
   * <p>
@@ -0,0 +1,67 @@
+package io.ebean;
+
+import io.ebean.config.ContainerConfig;
+import io.ebean.config.DatabaseConfig;
+
+/**
+ * Creates Database instances.
+ * <p>
+ * This uses either DatabaseConfig or properties in the application.properties file to
+ * configure and create a Database instance.
+ * </p>
+ * <p>
+ * The Database instance can either be registered with the DB singleton or
+ * not. The DB singleton effectively holds a map of Database by a name.
+ * If the Database is registered with the DB singleton you can retrieve it
+ * later via {@link DB#byName(String)}.
+ * </p>
+ * <p>
+ * One Database can be nominated as the 'default/primary' Database. Many
+ * methods on the DB singleton such as {@link DB#find(Class)} are just a
+ * convenient way of using the 'default/primary' Database.
+ * </p>
+ */
+public class DatabaseFactory {
+
+  /**
+   * Initialise the container with clustering configuration.
+   * <p>
+   * Call this prior to creating any Database instances or alternatively set the
+   * ContainerConfig on the ServerConfig when creating the first Database instance.
+   */
+  public static synchronized void initialiseContainer(ContainerConfig containerConfig) {
+    EbeanServerFactory.initialiseContainer(containerConfig);
+  }
+
+  /**
+   * 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 database.
+   */
+  public static synchronized Database create(DatabaseConfig config) {
+    return EbeanServerFactory.create(config);
+  }
+
+  /**
+   * Create using the ServerConfig additionally specifying a classLoader to use as the context class loader.
+   */
+  public static synchronized Database createWithContextClassLoader(DatabaseConfig config, ClassLoader classLoader) {
+    return EbeanServerFactory.createWithContextClassLoader(config, classLoader);
+  }
+
+  /**
+   * Shutdown gracefully all Database instances cleaning up any resources as required.
+   * <p>
+   * This is typically invoked via JVM shutdown hook and not explicitly called.
+   * </p>
+   */
+  public static synchronized void shutdown() {
+    EbeanServerFactory.shutdown();
+  }
+
+}
@@ -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")
@@ -30,7 +30,7 @@ import java.util.function.Predicate;
 *   String sql = "select id, name from customer where name like :name and status_code = :status";
 *
 *   List<CustomerDto> beans =
- *     Ebean.findDto(CustomrDto.class, sql)
+ *     DB.findDto(CustomerDto.class, sql)
 *     .setParameter("name", "Acme%")
 *     .setParameter("status", "ACTIVE")
 *     .findList();
@@ -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);

@@ -109,6 +126,12 @@ public interface DtoQuery<T> {
   */
  DtoQuery<T> setLabel(String label);

+  /**
+   * 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.
+   */
+  DtoQuery<T> setProfileLocation(ProfileLocation profileLocation);
+
  /**
   * Set a timeout on this query.
   * <p>
@@ -130,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,113 +24,28 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;

 /**
- * This Ebean object is effectively a singleton that holds a map of registered
- * {@link EbeanServer}s. It additionally provides a convenient way to use the
- * 'default' EbeanServer.
+ * Ebean will be Deprecated - please migrate to use DB.
 * <p>
- * If you are using a Dependency Injection framework such as
- * <strong>Spring</strong> or <strong>Guice</strong> you will probably
- * <strong>NOT</strong> use this Ebean singleton object. Instead you will
- * configure and construct EbeanServer instances using {@link ServerConfig} and
- * {@link EbeanServerFactory} and inject those EbeanServer instances into your
- * data access objects.
- * </p>
+ * Ebean is a registry of {@link Database} by name. Ebean has now been renamed to {@link DB}.
 * <p>
- * In documentation "Ebean singleton" refers to this object.
- * </p>
- * <ul>
- * <li>There is one EbeanServer per Database (javax.sql.DataSource).</li>
- * <li>EbeanServers can be 'registered' with the Ebean singleton (put into its
- * map). Registered EbeanServer's can later be retrieved via
- * {@link #getServer(String)}.</li>
- * <li>One EbeanServer can be referred to as the 'default' EbeanServer. For
- * convenience, the Ebean singleton (this object) provides methods such as
- * {@link #find(Class)} that proxy through to the 'default' EbeanServer. This
- * can be useful for applications that use a single database.</li>
- * </ul>
+ * Ebean is effectively this is an alias for {@link DB} which is the new and improved name for Ebean.
 * <p>
- * For developer convenience Ebean has static methods that proxy through to the
- * methods on the <em>'default'</em> EbeanServer. These methods are provided for
- * developers who are mostly using a single database. Many developers will be
- * able to use the methods on Ebean rather than get a EbeanServer.
- * </p>
- * <p>
- * EbeanServers can be created and used without ever needing or using the Ebean
- * singleton. Refer to {@link ServerConfig#setRegister(boolean)}.
- * </p>
- * <p>
- * You can either programmatically create/register EbeanServers via
- * {@link EbeanServerFactory} or they can automatically be created and
- * registered when you first use the Ebean singleton. When EbeanServers are
- * created automatically they are configured using information in the
- * ebean.properties file.
- * </p>
- * <pre>{@code
- *
- *   // fetch shipped orders (and also their customer)
- *   List<Order> list = Ebean.find(Order.class)
- * 	  .fetch("customer")
- * 	  .where()
- * 	  .eq("status.code", Order.Status.SHIPPED)
- * 	  .findList();
- *
- *   // read/use the order list ...
- *   for (Order order : list) {
- * 	   Customer customer = order.getCustomer();
- * 	   ...
- *   }
- *
- * }</pre>
- * <pre>{@code
- *
- *   // fetch order 10, modify and save
- *   Order order = Ebean.find(Order.class, 10);
- *
- *   OrderStatus shipped = Ebean.getReference(OrderStatus.class,"SHIPPED");
- *   order.setStatus(shipped);
- *   order.setShippedDate(shippedDate);
- *   ...
- *
- *   // implicitly creates a transaction and commits
- *   Ebean.save(order);
- *
- * }</pre>
- * <p>
- * When you have multiple databases and need access to a specific one the
- * {@link #getServer(String)} method provides access to the EbeanServer for that
- * specific database.
- * </p>
- * <pre>{@code
- *
- *   // Get access to the Human Resources EbeanServer/Database
- *   EbeanServer hrDb = Ebean.getServer("hr");
- *
- *   // fetch contact 3 from the HR database
- *   Contact contact = hrDb.find(Contact.class, 3);
- *
- *   contact.setName("I'm going to change");
- *   ...
- *
- *   // save the contact back to the HR database
- *   hrDb.save(contact);
- *
- * }</pre>
+ * The preference is to use DB and Database rather than Ebean and EbeanServer.
 */
 public final class Ebean {
  private static final Logger logger = LoggerFactory.getLogger(Ebean.class);

  static {
-    EbeanVersion.getVersion(); // initalizes the version class and logs the version.
+    EbeanVersion.getVersion(); // initialises the version class and logs the version.
  }

  /**
-   * Manages creation and cache of EbeanServers.
+   * Manages creation and cache of Databases.
   */
  private static final Ebean.ServerManager serverMgr = new Ebean.ServerManager();

  /**
-   * Helper class for managing fast and safe access and creation of
-   * EbeanServers.
+   * Helper class for managing fast and safe access and creation of Databases.
   */
  private static final class ServerManager {

@@ -147,7 +62,7 @@ public final class Ebean {
    private final Object monitor = new Object();

    /**
-     * The 'default' EbeanServer.
+     * The 'default' Database.
     */
    private EbeanServer defaultServer;

@@ -166,20 +81,20 @@ public final class Ebean {
        throw e;

      } catch (DataSourceConfigurationException e) {
-        String msg = "Configuration error creating DataSource for the default EbeanServer." +
-          " This typically means a missing application-test.yaml or missing ebean-test-config dependency." +
+        String msg = "Configuration error creating DataSource for the default Database." +
+          " 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);

      } catch (Throwable e) {
-        logger.error("Error trying to create the default EbeanServer", e);
+        logger.error("Error trying to create the default Database", e);
        throw new RuntimeException(e);
      }
    }

    private EbeanServer getDefaultServer() {
      if (defaultServer == null) {
-        String msg = "The default EbeanServer has not been defined?";
+        String msg = "The default Database has not been defined?";
        msg += " This is normally set via the ebean.datasource.default property.";
        msg += " Otherwise it should be registered programmatically via registerServer()";
        throw new PersistenceException(msg);
@@ -201,7 +116,7 @@ public final class Ebean {
    }

    /**
-     * Synchronized read, create and put of EbeanServers.
+     * Synchronized read, create and put of Databases.
     */
    private EbeanServer getWithCreate(String name) {

@@ -240,7 +155,7 @@ public final class Ebean {
  }

  /**
-   * Get the EbeanServer for a given DataSource. If name is null this will
+   * Get the Database for a given DataSource. If name is null this will
   * return the 'default' EbeanServer.
   * <p>
   * This is provided to access EbeanServer for databases other than the
@@ -272,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
@@ -294,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;
@@ -549,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;
   * 	   ...
   *   }
@@ -631,12 +546,10 @@ public final class Ebean {
   *   Customer customer = new Customer();
   *   customer.setId(7);
   *   customer.setName("ModifiedNameNoOCC");
-   *   ebeanServer.update(customer);
+   *
+   *   DB.update(customer);
   *
   * }</pre>
-   *
-   * @see ServerConfig#setUpdatesDeleteMissingChildren(boolean)
-   * @see ServerConfig#setUpdateChangesOnly(boolean)
   */
  public static void update(Object bean) throws OptimisticLockException {
    serverMgr.getDefaultServer().update(bean);
@@ -883,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
@@ -954,6 +867,8 @@ public final class Ebean {
  }

  /**
+   * Deprecated - migrate to DB.sqlQuery().
+   * <p>
   * Create a SqlQuery for executing native sql
   * query statements.
   * <p>
@@ -961,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);
  }

  /**
@@ -1131,10 +1048,9 @@ public final class Ebean {
   *
   *   String sql = "select c.id, c.name from customer c where c.name like ? order by c.name";
   *
-   *   Query<Customer> query = ebeanServer.findNative(Customer.class, sql);
-   *   query.setParameter(1, "Rob%");
-   *
-   *   List<Customer> customers = query.findList();
+   *   List<Customer> customers = DB.findNative(Customer.class, sql)
+   *     .setParameter(1, "Rob%")
+   *     .findList()
   *
   * }</pre>
   *
@@ -1283,7 +1199,7 @@ public final class Ebean {
   * 	   public void run() {
   * 		   User u1 = Ebean.find(User.class, 1);
   * 		   ...
-   * 	   }
+   *     }
   *   });
   *
   * }</pre>
@@ -1335,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 "";
+  }
+}
@@ -22,8 +22,8 @@ package io.ebean;
 * example.setName("Rob%");
 * example.setNotes("%something%");
 *
- * List&lt;Customer&gt; list =
- *     Ebean.find(Customer.class)
+ * List<Customer> list =
+ *     DB.find(Customer.class)
 *         .where()
 *         // pass the bean into the where() clause
 *         .exampleLike(example)
@@ -46,7 +46,7 @@ package io.ebean;
 *     .includeZeros();
 *
 * List<Customer> list =
- *     Ebean.find(Customer.class)
+ *     DB.find(Customer.class)
 *         .where()
 *         .add(qbe)
 *         .findList();
@@ -13,27 +13,15 @@ import java.util.Map;
 * {@link Query#where()}.
 * </p>
 * <p>
- * This provides a convenient way to create expressions for the 'Default'
- * server. It is actually a short cut for using the ExpressionFactory of the
- * 'default' EbeanServer.
+ * This provides a convenient way to create expressions for the default
+ * database.
 * <p>
- * See also {@link Ebean#getExpressionFactory()}
+ * See also {@link DB#getExpressionFactory()}
 * </p>
 * <p>
 * Creates standard common expressions for using in a Query Where or Having
 * clause.
 * </p>
- * <pre>{@code
- *
- * // Example: Using an Expr.or() method
- * Query<Order> query = Ebean.createQuery(Order.class);
- * query.where(
- *     Expr.or(Expr.eq("status", Order.NEW),
- *             Expr.gt("orderDate", lastWeek));
- *
- * List<Order> list = query.findList();
- * ...
- * }</pre>
 *
 * @see Query#where()
 */
@@ -46,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);
  }

  /**
@@ -61,30 +49,38 @@ 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);
+  }
+
+  /**
+   * In Range - property >= value1 and property < value2.
+   * <p>
+   * Unlike Between inRange is "half open" and usually more useful for use with dates or timestamps.
+   * </p>
+   */
+  public static Expression inRange(String propertyName, Object value1, Object 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);
  }

  /**
@@ -92,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);
  }

  /**
@@ -135,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);
  }

  /**
@@ -150,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);
  }

  /**
@@ -159,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);
  }

  /**
@@ -174,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);
  }

  /**
@@ -189,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);
  }

  /**
@@ -204,49 +200,86 @@ 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);
+  }
+
+  /**
+   * In where null or empty values means that no predicate is added to the query.
+   * <p>
+   * That is, only add the IN predicate if the values are not null or empty.
+   * <p>
+   * Without this we typically need to code an <code>if</code> block to only add
+   * the IN predicate if the collection is not empty like:
+   * </p>
+   *
+   * <h3>Without inOrEmpty()</h3>
+   * <pre>{@code
+   *
+   *   query.where() // add some predicates
+   *     .eq("status", Status.NEW);
+   *
+   *   if (ids != null && !ids.isEmpty()) {
+   *     query.where().in("customer.id", ids);
+   *   }
+   *
+   *   query.findList();
+   *
+   * }</pre>
+   *
+   * <h3>Using inOrEmpty()</h3>
+   * <pre>{@code
+   *
+   *   query.where()
+   *     .eq("status", Status.NEW)
+   *     .inOrEmpty("customer.id", ids)
+   *     .findList();
+   *
+   * }</pre>
+   */
+  public static Expression inOrEmpty(String propertyName, Collection<?> 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);
  }

  /**
@@ -259,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);
  }

  /**
@@ -270,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);
  }

  /**
@@ -281,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);
  }

  /**
@@ -296,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);
  }

  /**
@@ -304,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);
  }

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

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

  /**
@@ -320,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);
  }

  /**
@@ -328,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,9 +30,9 @@ import java.util.Map;
 *     Expr.or(Expr.eq("status", Order.Status.NEW),
 *             Expr.gt("orderDate", lastWeek));
 *
- * Query<Order> query = Ebean.createQuery(Order.class);
- * query.where().add(newOrLastWeek);
- * List<Order> list = query.findList();
+ * List<Order> list = DB.find(Order.class)
+ *   .where().add(newOrLastWeek)
+ *   .findList();
 * ...
 * }</pre>
 *
@@ -122,6 +122,11 @@ public interface ExpressionFactory {
   */
  Expression eq(String propertyName, Object value);

+  /**
+   * Equal To or Null - property equal to the given value or null.
+   */
+  Expression eqOrNull(String propertyName, Object value);
+
  /**
   * Not Equal To - property not equal to the given value.
   */
@@ -149,6 +154,33 @@ public interface ExpressionFactory {
   */
  Expression ineObject(String propertyName, Object value);

+  /**
+   * In Range - property >= value1 and property < value2.
+   * <p>
+   * Unlike Between inRange is "half open" and usually more useful for use with dates or timestamps.
+   * </p>
+   */
+  Expression inRange(String propertyName, Object value1, Object value2);
+
+  /**
+   * Value in Range between 2 properties.
+   *
+   * <pre>{@code
+   *
+   *    .startDate.inRangeWith(endDate, now)
+   *
+   *    // which equates to
+   *    startDate <= now and (endDate > now or endDate is null)
+   *
+   * }</pre>
+   *
+   * <p>
+   * This is a convenience expression combining a number of simple expressions.
+   * The most common use of this could be called "effective dating" where 2 date or
+   * timestamp columns represent the date range in which
+   */
+  Expression inRangeWith(String lowProperty, String highProperty, Object value);
+
  /**
   * Between - property between the two given values.
   */
@@ -159,6 +191,14 @@ public interface ExpressionFactory {
   */
  Expression betweenProperties(String lowProperty, String highProperty, Object value);

+  /**
+   * Greater Than Or Null - property greater than the given value or null.
+   * <p>
+   * A convenient expression combining GT and Is Null.  Most often useful for range
+   * expressions where the top range value is nullable.
+   */
+  Expression gtOrNull(String propertyName, Object value);
+
  /**
   * Greater Than - property greater than the given value.
   */
@@ -170,6 +210,14 @@ public interface ExpressionFactory {
   */
  Expression ge(String propertyName, Object value);

+  /**
+   * Less Than or Null - property less than the given value or null.
+   * <p>
+   * A convenient expression combining LT and Is Null.  Most often useful for range
+   * expressions where the bottom range value is nullable.
+   */
+  Expression ltOrNull(String propertyName, Object value);
+
  /**
   * Less Than - property less than the given value.
   */
@@ -277,6 +325,41 @@ public interface ExpressionFactory {
   */
  Expression in(String propertyName, Collection<?> values);

+  /**
+   * In where null or empty values means that no predicate is added to the query.
+   * <p>
+   * That is, only add the IN predicate if the values are not null or empty.
+   * <p>
+   * Without this we typically need to code an <code>if</code> block to only add
+   * the IN predicate if the collection is not empty like:
+   * </p>
+   *
+   * <h3>Without inOrEmpty()</h3>
+   * <pre>{@code
+   *
+   *   query.where() // add some predicates
+   *     .eq("status", Status.NEW);
+   *
+   *   if (ids != null && !ids.isEmpty()) {
+   *     query.where().in("customer.id", ids);
+   *   }
+   *
+   *   query.findList();
+   *
+   * }</pre>
+   *
+   * <h3>Using inOrEmpty()</h3>
+   * <pre>{@code
+   *
+   *   query.where()
+   *     .eq("status", Status.NEW)
+   *     .inOrEmpty("customer.id", ids)
+   *     .findList();
+   *
+   * }</pre>
+   */
+  Expression inOrEmpty(String propertyName, Collection<?> values);
+
  /**
   * Not In - property has a value in the array of values.
   */
@@ -453,4 +536,12 @@ public interface ExpressionFactory {
   */
  <T> Junction<T> junction(Junction.Type type, Query<T> query, ExpressionList<T> parent);

+  /**
+   * Add the expressions to the given expression list.
+   *
+   * @param where       The expression list to add the expressions to
+   * @param expressions The expressions that are parsed
+   * @param params      Bind parameters to match ? or ?1 bind positions.
+   */
+  <T> void where(ExpressionList<T> where, String expressions, Object[] params);
 }
@@ -9,6 +9,7 @@ import io.ebean.search.TextSimple;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.persistence.NonUniqueResultException;
+import java.sql.Connection;
 import java.sql.Timestamp;
 import java.util.Collection;
 import java.util.List;
@@ -29,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
@@ -51,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.
@@ -58,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
@@ -76,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);

  /**
@@ -128,6 +127,38 @@ public interface ExpressionList<T> {
   */
  <D> DtoQuery<D> asDto(Class<D> dtoClass);

+  /**
+   * Return the underlying query as an UpdateQuery.
+   * <p>
+   * Typically this is used with query beans to covert a query bean
+   * query into an UpdateQuery like the examples below.
+   * </p>
+   *
+   * <pre>{@code
+   *
+   *  int rowsUpdated = new QCustomer()
+   *       .name.startsWith("Rob")
+   *       .asUpdate()
+   *       .set("active", false)
+   *       .update();;
+   *
+   * }</pre>
+   *
+   * <pre>{@code
+   *
+   *   int rowsUpdated = new QContact()
+   *       .notes.note.startsWith("Make Inactive")
+   *       .email.endsWith("@foo.com")
+   *       .customer.id.equalTo(42)
+   *       .asUpdate()
+   *       .set("inactive", true)
+   *       .setRaw("email = lower(email)")
+   *       .update();
+   *
+   * }</pre>
+   */
+  UpdateQuery<T> asUpdate();
+
  /**
   * Execute using "for update" clause which results in the DB locking the record.
   */
@@ -154,6 +185,16 @@ public interface ExpressionList<T> {
   */
  Query<T> setIncludeSoftDeletes();

+  /**
+   * Execute the query using the given transaction.
+   */
+  Query<T> usingTransaction(Transaction transaction);
+
+  /**
+   * Execute the query using the given connection.
+   */
+  Query<T> usingConnection(Connection connection);
+
  /**
   * Execute as a delete query deleting the 'root level' beans that match the predicates
   * in the query.
@@ -194,6 +235,32 @@ public interface ExpressionList<T> {
   */
  int update(Transaction transaction);

+  /**
+   * Execute the query returning true if a row is found.
+   * <p>
+   * The query is executed using max rows of 1 and will only select the id property.
+   * This method is really just a convenient way to optimise a query to perform a
+   * 'does a row exist in the db' check.
+   * </p>
+   *
+   * <h2>Example:</h2>
+   * <pre>{@code
+   *
+   *   boolean userExists = query().where().eq("email", "rob@foo.com").exists();
+   *
+   * }</pre>
+   *
+   * <h2>Example using a query bean:</h2>
+   * <pre>{@code
+   *
+   *   boolean userExists = new QContact().email.equalTo("rob@foo.com").exists();
+   *
+   * }</pre>
+   *
+   * @return True if the query finds a matching row in the database
+   */
+  boolean exists();
+
  /**
   * Execute the query iterating over the results.
   *
@@ -258,27 +325,27 @@ public interface ExpressionList<T> {

  /**
   * Execute the query returning a list of values for a single property.
-   * <p>
+   *
   * <h3>Example 1:</h3>
   * <pre>{@code
   *
   *  List<String> names =
-   *    Ebean.find(Customer.class)
+   *    DB.find(Customer.class)
   *      .select("name")
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .findSingleAttributeList();
   *
   * }</pre>
-   * <p>
+   *
   * <h3>Example 2:</h3>
   * <pre>{@code
   *
   *  List<String> names =
-   *    Ebean.find(Customer.class)
+   *    DB.find(Customer.class)
   *      .setDistinct(true)
   *      .select("name")
   *      .where().eq("status", Customer.Status.NEW)
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .setMaxRows(100)
   *      .findSingleAttributeList();
   *
@@ -291,11 +358,10 @@ public interface ExpressionList<T> {

  /**
   * Execute a query returning a single value of a single property/column.
-   * <p>
   * <pre>{@code
   *
   *  String name =
-   *    Ebean.find(Customer.class)
+   *    DB.find(Customer.class)
   *      .select("name")
   *      .where().eq("id", 42)
   *      .findSingleAttribute();
@@ -376,10 +442,9 @@ public interface ExpressionList<T> {
   * If maxRows is not set on the query prior to calling findPagedList() then a
   * PersistenceException is thrown.
   * </p>
-   * <p>
   * <pre>{@code
   *
-   *  PagedList<Order> pagedList = Ebean.find(Order.class)
+   *  PagedList<Order> pagedList = DB.find(Order.class)
   *       .setFirstRow(50)
   *       .setMaxRows(20)
   *       .findPagedList();
@@ -422,7 +487,26 @@ public interface ExpressionList<T> {
   * Add some filter predicate expressions to the many property.
   */
  @Nonnull
-  ExpressionList<T> filterMany(String prop);
+  ExpressionList<T> filterMany(String manyProperty);
+
+  /**
+   * Add filter expressions to the many property.
+   *
+   * <pre>{@code
+   *
+   *   DB.find(Customer.class)
+   *   .where()
+   *   .eq("name", "Rob")
+   *   .filterMany("orders", "status = ?", Status.NEW)
+   *   .findList();
+   *
+   * }</pre>
+   *
+   * @param manyProperty The many property
+   * @param expressions  Filter expressions with and, or and ? or ?1 type bind parameters
+   * @param params       Bind parameters used in the expressions
+   */
+  ExpressionList<T> filterMany(String manyProperty, String expressions, Object... params);

  /**
   * Specify specific properties to fetch on the main/root bean (aka partial
@@ -446,7 +530,7 @@ public interface ExpressionList<T> {
   * <pre>{@code
   *
   *   List<Customer> customers =
-   *       Ebean.find(Customer.class)
+   *       DB.find(Customer.class)
   *          .setDistinct(true)
   *          .select("name")     // only select the customer name
   *          .findList();
@@ -473,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.
@@ -515,12 +599,11 @@ public interface ExpressionList<T> {

  /**
   * Extended version for setDistinct in conjunction with "findSingleAttributeList";
-   * <p>
   * <pre>{@code
   *
   *  List<CountedValue<Order.Status>> orderStatusCount =
   *
-   *     Ebean.find(Order.class)
+   *     DB.find(Order.class)
   *      .select("status")
   *      .where()
   *      .gt("orderDate", LocalDate.now().minusMonths(3))
@@ -597,6 +680,14 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> where();

+  /**
+   * Add the expressions to this expression list.
+   *
+   * @param expressions The expressions that are parsed and added to this expression list
+   * @param params      Bind parameters to match ? or ?1 bind positions.
+   */
+  ExpressionList<T> where(String expressions, Object... params);
+
  /**
   * Path exists - for the given path in a JSON document.
   * <pre>{@code
@@ -625,7 +716,6 @@ public interface ExpressionList<T> {

  /**
   * Equal to expression for the value at the given path in the JSON document.
-   * <p>
   * <pre>{@code
   *
   *   where().jsonEqualTo("content", "path.other", 34)
@@ -640,7 +730,6 @@ public interface ExpressionList<T> {

  /**
   * Not Equal to - for the given path in a JSON document.
-   * <p>
   * <pre>{@code
   *
   *   where().jsonNotEqualTo("content", "path.other", 34)
@@ -655,7 +744,6 @@ public interface ExpressionList<T> {

  /**
   * Greater than - for the given path in a JSON document.
-   * <p>
   * <pre>{@code
   *
   *   where().jsonGreaterThan("content", "path.other", 34)
@@ -666,7 +754,6 @@ public interface ExpressionList<T> {

  /**
   * Greater than or equal to - for the given path in a JSON document.
-   * <p>
   * <pre>{@code
   *
   *   where().jsonGreaterOrEqual("content", "path.other", 34)
@@ -677,7 +764,6 @@ public interface ExpressionList<T> {

  /**
   * Less than - for the given path in a JSON document.
-   * <p>
   * <pre>{@code
   *
   *   where().jsonLessThan("content", "path.other", 34)
@@ -688,7 +774,6 @@ public interface ExpressionList<T> {

  /**
   * Less than or equal to - for the given path in a JSON document.
-   * <p>
   * <pre>{@code
   *
   *   where().jsonLessOrEqualTo("content", "path.other", 34)
@@ -699,7 +784,6 @@ public interface ExpressionList<T> {

  /**
   * Between - for the given path in a JSON document.
-   * <p>
   * <pre>{@code
   *
   *   where().jsonBetween("content", "orderDate", lowerDateTime, upperDateTime)
@@ -710,21 +794,6 @@ public interface ExpressionList<T> {

  /**
   * Add an Expression to the list.
-   * <p>
-   * This returns the list so that add() can be chained.
-   * </p>
-   * <p>
-   * <pre>{@code
-   *
-   * Query<Customer> query = Ebean.find(Customer.class);
-   * query.where()
-   *     .like("name","Rob%")
-   *     .eq("status", Customer.ACTIVE);
-   *
-   * List<Customer> list = query.findList();
-   * ...
-   *
-   * }</pre>
   */
  ExpressionList<T> add(Expression expr);

@@ -738,6 +807,11 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> eq(String propertyName, Object value);

+  /**
+   * Equal To or Null - property is equal to a given value or null.
+   */
+  ExpressionList<T> eqOrNull(String propertyName, Object value);
+
  /**
   * Not Equal To - property not equal to the given value.
   */
@@ -755,6 +829,33 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> ine(String propertyName, String value);

+  /**
+   * Value in Range between 2 properties.
+   *
+   * <pre>{@code
+   *
+   *    .startDate.inRangeWith(endDate, now)
+   *
+   *    // which equates to
+   *    startDate <= now and (endDate > now or endDate is null)
+   *
+   * }</pre>
+   *
+   * <p>
+   * This is a convenience expression combining a number of simple expressions.
+   * The most common use of this could be called "effective dating" where 2 date or
+   * timestamp columns represent the date range in which
+   */
+  ExpressionList<T> inRangeWith(String lowProperty, String highProperty, Object value);
+
+  /**
+   * In Range - property >= value1 and property < value2.
+   * <p>
+   * Unlike Between inRange is "half open" and usually more useful for use with dates or timestamps.
+   * </p>
+   */
+  ExpressionList<T> inRange(String propertyName, Object value1, Object value2);
+
  /**
   * Between - property between the two given values.
   */
@@ -770,6 +871,11 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> gt(String propertyName, Object value);

+  /**
+   * Greater Than or Null - property greater than the given value or null.
+   */
+  ExpressionList<T> gtOrNull(String propertyName, Object value);
+
  /**
   * Greater Than or Equal to - property greater than or equal to the given
   * value.
@@ -781,6 +887,11 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> lt(String propertyName, Object value);

+  /**
+   * Less Than or Null - property less than the given value or null.
+   */
+  ExpressionList<T> ltOrNull(String propertyName, Object value);
+
  /**
   * Less Than or Equal to - property less than or equal to the given value.
   */
@@ -810,7 +921,6 @@ public interface ExpressionList<T> {
   * To get control over the options you can create an ExampleExpression and set
   * those options such as case insensitive etc.
   * </p>
-   * <p>
   * <pre>{@code
   *
   * // create an example bean and set the properties
@@ -819,16 +929,15 @@ public interface ExpressionList<T> {
   * example.setName("Rob%");
   * example.setNotes("%something%");
   *
-   * List&lt;Customer&gt; list = Ebean.find(Customer.class).where()
-   *     // pass the bean into the where() clause
-   *     .exampleLike(example)
-   *     // you can add other expressions to the same query
-   *     .gt("id", 2).findList();
+   * List<Customer> list =
+   *   DB.find(Customer.class)
+   *     .where().exampleLike(example)
+   *     .findList();
   *
   * }</pre>
   * <p>
   * Similarly you can create an ExampleExpression
-   * <p>
+   * </p>
   * <pre>{@code
   *
   * Customer example = new Customer();
@@ -838,7 +947,7 @@ public interface ExpressionList<T> {
   * // create a ExampleExpression with more control
   * ExampleExpression qbe = new ExampleExpression(example, true, LikeType.EQUAL_TO).includeZeros();
   *
-   * List<Customer> list = Ebean.find(Customer.class).where().add(qbe).findList();
+   * List<Customer> list = DB.find(Customer.class).where().add(qbe).findList();
   *
   * }</pre>
   */
@@ -915,6 +1024,41 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> in(String propertyName, Collection<?> values);

+  /**
+   * In where null or empty values means that no predicate is added to the query.
+   * <p>
+   * That is, only add the IN predicate if the values are not null or empty.
+   * <p>
+   * Without this we typically need to code an <code>if</code> block to only add
+   * the IN predicate if the collection is not empty like:
+   * </p>
+   *
+   * <h3>Without inOrEmpty()</h3>
+   * <pre>{@code
+   *
+   *   query.where() // add some predicates
+   *     .eq("status", Status.NEW);
+   *
+   *   if (ids != null && !ids.isEmpty()) {
+   *     query.where().in("customer.id", ids);
+   *   }
+   *
+   *   query.findList();
+   *
+   * }</pre>
+   *
+   * <h3>Using inOrEmpty()</h3>
+   * <pre>{@code
+   *
+   *   query.where()
+   *     .eq("status", Status.NEW)
+   *     .inOrEmpty("customer.id", ids)
+   *     .findList();
+   *
+   * }</pre>
+   */
+  ExpressionList<T> inOrEmpty(String propertyName, Collection<?> values);
+
  /**
   * In - using a subQuery.
   * <p>
@@ -1050,7 +1194,6 @@ public interface ExpressionList<T> {

  /**
   * Add expression for ALL of the given bit flags to be set.
-   * <p>
   * <pre>{@code
   *
   * where().bitwiseAll("flags", BwFlags.HAS_BULK + BwFlags.HAS_COLOUR)
@@ -1064,7 +1207,6 @@ public interface ExpressionList<T> {

  /**
   * Add expression for the given bit flags to be NOT set.
-   * <p>
   * <pre>{@code
   *
   * where().bitwiseNot("flags", BwFlags.HAS_COLOUR)
@@ -1115,6 +1257,13 @@ public interface ExpressionList<T> {
   *   raw("add_days(orderDate, 10) < ?", someDate)
   *
   * }</pre>
+   *
+   * <h4>Subquery example:</h4>
+   * <pre>{@code
+   *
+   *   .raw("t0.customer_id in (select customer_id from customer_group where group_id = any(?::uuid[]))", groupIds)
+   *
+   * }</pre>
   */
  ExpressionList<T> raw(String raw, Object value);

@@ -1139,15 +1288,83 @@ public interface ExpressionList<T> {
   * then they are not translated. logical property name names (not fully
   * qualified) will still be translated to their physical name.
   * </p>
-   * <p>
   * <pre>{@code
   *
   *   raw("orderQty < shipQty")
   *
   * }</pre>
+   *
+   * <h4>Subquery example:</h4>
+   * <pre>{@code
+   *
+   *   .raw("t0.customer_id in (select customer_id from customer_group where group_id = any(?::uuid[]))", groupIds)
+   *
+   * }</pre>
   */
  ExpressionList<T> raw(String raw);

+  /**
+   * Only add the raw expression if the values is not null or empty.
+   * <p>
+   * This is a pure convenience expression to make it nicer to deal with the pattern where we use
+   * raw() expression with a subquery and only want to add the subquery predicate when the collection
+   * of values is not empty.
+   * </p>
+   * <h3>Without inOrEmpty()</h3>
+   * <pre>{@code
+   *
+   *   query.where() // add some predicates
+   *     .eq("status", Status.NEW);
+   *
+   *   // common pattern - we can use rawOrEmpty() instead
+   *   if (orderIds != null && !orderIds.isEmpty()) {
+   *     query.where().raw("t0.customer_id in (select o.customer_id from orders o where o.id in (?1))", orderIds);
+   *   }
+   *
+   *   query.findList();
+   *
+   * }</pre>
+   *
+   * <h3>Using rawOrEmpty()</h3>
+   * Note that in the example below we use the <code>?1</code> bind parameter to get  "parameter expansion"
+   * for each element in the collection.
+   *
+   * <pre>{@code
+   *
+   *   query.where()
+   *     .eq("status", Status.NEW)
+   *     // only add the expression if orderIds is not empty
+   *     .rawOrEmpty("t0.customer_id in (select o.customer_id from orders o where o.id in (?1))", orderIds);
+   *     .findList();
+   *
+   * }</pre>
+   *
+   * <h3>Postgres ANY</h3>
+   * With Postgres we would often use the SQL <code>ANY</code> expression and array parameter binding
+   * rather than <code>IN</code>.
+   *
+   * <pre>{@code
+   *
+   *   query.where()
+   *     .eq("status", Status.NEW)
+   *     .rawOrEmpty("t0.customer_id in (select o.customer_id from orders o where o.id = any(?))", orderIds);
+   *     .findList();
+   *
+   * }</pre>
+   * <p>
+   * Note that we need to cast the Postgres array for UUID types like:
+   * </p>
+   * <pre>{@code
+   *
+   *   " ... = any(?::uuid[])"
+   *
+   * }</pre>
+   *
+   * @param raw    The raw expression that is typically a subquery
+   * @param values The values which is typically a list or set of id values.
+   */
+  ExpressionList<T> rawOrEmpty(String raw, Collection<?> values);
+
  /**
   * Add a match expression.
   *
@@ -1218,12 +1435,10 @@ public interface ExpressionList<T> {
   * typically you only explicitly need to use the and() junction
   * when it is nested inside an or() or not() junction.
   * </p>
-   * <p>
   * <pre>{@code
   *
   *  // Example: Nested and()
   *
-   *  Ebean.find(Customer.class)
   *    .where()
   *    .or()
   *      .and() // nested and
@@ -1234,7 +1449,7 @@ public interface ExpressionList<T> {
   *        .eq("status", Customer.Status.ACTIVE)
   *        .gt("id", 0)
   *        .endAnd()
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .findList();
   * }</pre>
   */
@@ -1244,16 +1459,27 @@ public interface ExpressionList<T> {
   * Return a list of expressions that will be joined by OR's.
   * This is exactly the same as disjunction();
   * <p>
-   * <p>
   * Use endOr() or endJunction() to end the OR junction.
   * </p>
-   * <p>
+   *
+   * <pre>{@code
+   *
+   *  // Example: (status active OR anniversary is null)
+   *
+   *    .where()
+   *    .or()
+   *      .eq("status", Customer.Status.ACTIVE)
+   *      .isNull("anniversary")
+   *    .order().asc("name")
+   *    .findList();
+   *
+   * }</pre>
+   *
   * <pre>{@code
   *
   *  // Example: Use or() to join
   *  // two nested and() expressions
   *
-   *  Ebean.find(Customer.class)
   *    .where()
   *    .or()
   *      .and()
@@ -1264,7 +1490,7 @@ public interface ExpressionList<T> {
   *        .eq("status", Customer.Status.ACTIVE)
   *        .gt("id", 0)
   *        .endAnd()
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .findList();
   *
   * }</pre>
@@ -1277,8 +1503,8 @@ public interface ExpressionList<T> {
   * Use endNot() or endJunction() to end expressions being added to the
   * NOT expression list.
   * </p>
-   * <p>
-   * <pre>@{code
+   *
+   * <pre>{@code
   *
   *    .where()
   *      .not()
@@ -1287,19 +1513,18 @@ public interface ExpressionList<T> {
   *        .endNot()
   *
   * }</pre>
-   * <p>
-   * <pre>@{code
+   *
+   * <pre>{@code
   *
   * // Example: nested not()
   *
-   * Ebean.find(Customer.class)
   *   .where()
   *     .eq("status", Customer.Status.ACTIVE)
   *     .not()
   *       .gt("id", 1)
   *       .eq("anniversary", onAfter)
   *       .endNot()
-   *     .orderBy()
+   *     .order()
   *       .asc("name")
   *     .findList();
   *
@@ -10,9 +10,10 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import java.util.stream.Stream;

 /**
- * The extended API for EbeanServer.
+ * The extended API for Database.
 * <p>
 * This provides the finder methods that take an explicit transaction rather than obtaining
 * the transaction from the usual mechanism (which is ThreadLocal based).
@@ -23,7 +24,7 @@ import java.util.function.Predicate;
 * the transaction to use.
 * </p>
 * <p>
- * Note that in all cases the transaction supplied can be null and in this case the EbeanServer
+ * Note that in all cases the transaction supplied can be null and in this case the Database
 * will use the normal mechanism to obtain the transaction to use.
 * </p>
 */
@@ -42,6 +43,32 @@ public interface ExtendedServer {
   */
  void setClock(Clock clock);

+  /**
+   * Execute the query returning true if a row is found.
+   * <p>
+   * The query is executed using max rows of 1 and will only select the id property.
+   * This method is really just a convenient way to optimise a query to perform a
+   * 'does a row exist in the db' check.
+   * </p>
+   *
+   * <h2>Example:</h2>
+   * <pre>{@code
+   *
+   *   boolean userExists = query().where().eq("email", "rob@foo.com").exists();
+   *
+   * }</pre>
+   *
+   * <h2>Example using a query bean:</h2>
+   * <pre>{@code
+   *
+   *   boolean userExists = new QContact().email.equalTo("rob@foo.com").exists();
+   *
+   * }</pre>
+   *
+   * @return True if the query finds a matching row in the database
+   */
+  <T> boolean exists(Query<?> ormQuery, Transaction transaction);
+
  /**
   * Return the number of 'top level' or 'root' entities this query should return.
   *
@@ -78,6 +105,24 @@ public interface ExtendedServer {
  @Nonnull
  <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction);

+  /**
+   * Return the query result as a Stream using a single persistence context.
+   * <p>
+   * Note that the stream needs to be closed so use with try with resources.
+   * </p>
+   */
+  @Nonnull
+  <T> Stream<T> findStream(Query<T> query, Transaction transaction);
+
+  /**
+   * Return the query result as a Stream (with multiple persistence contexts).
+   * <p>
+   * Note that the stream needs to be closed so use with try with resources.
+   * </p>
+   */
+  @Nonnull
+  <T> Stream<T> findLargeStream(Query<T> query, Transaction transaction);
+
  /**
   * Execute the query visiting the each bean one at a time.
   * <p>
@@ -92,7 +137,7 @@ public interface ExtendedServer {
   * <p>
   * <pre>{@code
   *
-   *     ebeanServer.find(Order.class)
+   *     DB.find(Order.class)
   *       .where().eq("status", Order.Status.NEW)
   *       .order().asc("id")
   *       .findEach((Order order) -> {
@@ -126,7 +171,7 @@ public interface ExtendedServer {
   * <p>
   * <pre>{@code
   *
-   *     ebeanServer.find(Order.class)
+   *     DB.find(Order.class)
   *       .where().eq("status", Order.Status.NEW)
   *       .order().asc("id")
   *       .findEachWhile((Order order) -> {
@@ -165,8 +210,7 @@ public interface ExtendedServer {
   * <p>
   * <pre>{@code
   *
-   * List<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * List<Customer> customers = DB.find(Customer.class)
   *     .where().ilike("name", "rob%")
   *     .findList();
   *
@@ -243,7 +287,7 @@ public interface ExtendedServer {
   * <p>
   * <pre>{@code
   *
-   *  PagedList<Order> pagedList = Ebean.find(Order.class)
+   *  PagedList<Order> pagedList = DB.find(Order.class)
   *       .setFirstRow(50)
   *       .setMaxRows(20)
   *       .findPagedList();
@@ -272,8 +316,7 @@ public interface ExtendedServer {
   * <p>
   * <pre>{@code
   *
-   * Set<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * Set<Customer> customers = DB.find(Customer.class)
   *     .where().ilike("name", "rob%")
   *     .findSet();
   *
@@ -312,9 +355,9 @@ public interface ExtendedServer {
   * <pre>{@code
   *
   *  List<String> names =
-   *    Ebean.find(Customer.class)
+   *    DB.find(Customer.class)
   *      .select("name")
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .findSingleAttributeList();
   *
   * }</pre>
@@ -322,11 +365,11 @@ public interface ExtendedServer {
   * <pre>{@code
   *
   *  List<String> names =
-   *    Ebean.find(Customer.class)
+   *    DB.find(Customer.class)
   *      .setDistinct(true)
   *      .select("name")
   *      .where().eq("status", Customer.Status.NEW)
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .setMaxRows(100)
   *      .findSingleAttributeList();
   *
@@ -384,7 +427,7 @@ public interface ExtendedServer {
  /**
   * Execute the update query returning the number of rows updated.
   * <p>
-   * The update query must be created using {@link EbeanServer#update(Class)}.
+   * The update query must be created using {@link Database#update(Class)}.
   * </p>
   *
   * @param query       the update query to execute
@@ -24,7 +24,7 @@ import java.io.Serializable;
 * <p>
 * <pre>{@code
 * // Normal fetch join results in a single SQL query
- * List<Order> list = Ebean.find(Order.class).fetch("details").findList();
+ * List<Order> list = DB.find(Order.class).fetch("details").findList();
 *
 * // Find Orders join details using a single SQL query
 * }</pre>
@@ -36,7 +36,7 @@ import java.io.Serializable;
 *
 * // This will use 2 SQL queries to build this object graph
 * List<Order> list =
- *     Ebean.find(Order.class)
+ *     DB.find(Order.class)
 *         .fetch("details", new FetchConfig().query())
 *         .findList();
 *
@@ -52,7 +52,7 @@ import java.io.Serializable;
 *
 * // This will use 3 SQL queries to build this object graph
 * List<Order> list =
- *     Ebean.find(Order.class)
+ *     DB.find(Order.class)
 *         .fetch("details", new FetchConfig().query())
 *         .fetch("customer", new FetchConfig().queryFirst(5))
 *         .findList();
@@ -70,7 +70,7 @@ import java.io.Serializable;
 * <pre>{@code
 * // This will use 3 SQL queries to build this object graph
 * List<Order> list =
- *     Ebean.find(Order.class)
+ *     DB.find(Order.class)
 *         .select("status, shipDate")
 *         .fetch("details", "quantity, price", new FetchConfig().query())
 *         .fetch("details.product", "sku, name")
@@ -100,7 +100,7 @@ import java.io.Serializable;
 * <pre>{@code
 *
 * List<Order> list =
- *     Ebean.find(Order.class)
+ *     DB.find(Order.class)
 *         .fetch("customer", new FetchConfig().query(10).lazy(5))
 *         .findList();
 *
@@ -121,7 +121,7 @@ import java.io.Serializable;
 * <p>
 * <pre>{@code
 *
- * List<Order> list = Ebean.find(Order.class)
+ * List<Order> list = DB.find(Order.class)
 *   .fetch("customer","name", new FetchConfig().lazy(5))
 *   .fetch("customer.contacts","contactName, phone, email")
 *   .fetch("customer.shippingAddress")
@@ -148,6 +148,8 @@ public class FetchConfig implements Serializable {

  private boolean queryAll;

+  private boolean cache;
+
  /**
   * Construct the fetch configuration object.
   */
@@ -188,6 +190,17 @@ public class FetchConfig implements Serializable {
    return this;
  }

+  /**
+   * Eagerly fetch the beans fetching the beans from the L2 bean cache
+   * and using the DB for beans not in the cache.
+   */
+  public FetchConfig cache() {
+    this.cache = true;
+    this.queryBatchSize = 0;
+    this.queryAll = true;
+    return this;
+  }
+
  /**
   * Eagerly fetch the beans in this path as a separate query (rather than as
   * part of the main query).
@@ -247,6 +260,13 @@ public class FetchConfig implements Serializable {
    return queryAll;
  }

+  /**
+   * Return true if this uses L2 bean cache.
+   */
+  public boolean isCache() {
+    return cache;
+  }
+
  @Override
  public boolean equals(Object o) {
    if (this == o) return true;
@@ -255,6 +275,7 @@ public class FetchConfig implements Serializable {
    FetchConfig that = (FetchConfig) o;
    if (lazyBatchSize != that.lazyBatchSize) return false;
    if (queryBatchSize != that.queryBatchSize) return false;
+    if (cache != that.cache) return false;
    return queryAll == that.queryAll;
  }

@@ -263,6 +284,7 @@ public class FetchConfig implements Serializable {
    int result = lazyBatchSize;
    result = 92821 * result + queryBatchSize;
    result = 92821 * result + (queryAll ? 1 : 0);
+    result = 92821 * result + (cache ? 1 : 0);
    return result;
  }
 }
@@ -1,5 +1,7 @@
 package io.ebean;

+import io.ebean.service.SpiFetchGroupQuery;
+
 import javax.annotation.Nonnull;

 /**
@@ -111,4 +113,11 @@ public interface FetchGroup<T> {
    return XServiceProvider.fetchGroupOf(cls);
  }

+  /**
+   * Return a query to be used by query beans for constructing FetchGroup.
+   */
+  static <T> SpiFetchGroupQuery<T> queryFor(Class<T> beanType) {
+    return XServiceProvider.fetchGroupQueryFor(beanType);
+  }
+
 }
@@ -67,12 +67,26 @@ public interface FetchGroupBuilder<T> {
  @Nonnull
  FetchGroupBuilder<T> fetchQuery(String path);

+  /**
+   * Fetch the path including all its properties using L2 cache.
+   * Cache misses fallback to fetchQuery().
+   */
+  @Nonnull
+  FetchGroupBuilder<T> fetchCache(String path);
+
  /**
   * Fetch the path including specified properties using a query join.
   */
  @Nonnull
  FetchGroupBuilder<T> fetchQuery(String path, String properties);

+  /**
+   * Fetch the path including specified properties using L2 cache.
+   * Cache misses fallback to fetchQuery().
+   */
+  @Nonnull
+  FetchGroupBuilder<T> fetchCache(String path, String properties);
+
  /**
   * Fetch the path including all its properties lazily.
   */
@@ -25,14 +25,14 @@ import java.util.Set;
 * // get a list of entities (query execution statistics in this case)
 *
 * List<MetaQueryStatistic> list =
- *     Ebean.find(MetaQueryStatistic.class).findList();
+ *     DB.find(MetaQueryStatistic.class).findList();
 *
 * long nowMinus24Hrs = System.currentTimeMillis() - 24 * (1000 * 60 * 60);
 *
 * // sort and filter the list returning a filtered list...
 *
 * List<MetaQueryStatistic> filteredList =
- *     Ebean.filter(MetaQueryStatistic.class)
+ *     DB.filter(MetaQueryStatistic.class)
 *         .sort("avgTimeMicros desc")
 *         .gt("executionCount", 0)
 *         .gt("lastQueryTime", nowMinus24Hrs)
@@ -63,12 +63,12 @@ import java.util.Set;
 * // get a list of entities (query execution statistics)
 *
 * List<Order> orders =
- *     Ebean.find(Order.class).findList();
+ *     DB.find(Order.class).findList();
 *
 * // Apply a filter...
 *
 * List<Order> filteredOrders =
- *     Ebean.filter(Order.class)
+ *     DB.filter(Order.class)
 *         .startsWith("customer.name", "Rob")
 *         .eq("customer.shippingAddress.city", "Auckland")
 *         .filter(orders);
@@ -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);
@@ -2,7 +2,6 @@ package io.ebean;

 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
 import java.util.List;

 /**
@@ -14,8 +13,7 @@ import java.util.List;
 * </p>
 * <h3>Testing</h3>
 * <p>
- * For testing the mocki-ebean project has the ability to replace the finder implementation
- * <p>
+ * For testing the mocki-ebean project has the ability to replace the finder implementation.
 * </p>
 * <pre>{@code
 *
@@ -25,7 +23,7 @@ import java.util.List;
 *     super(Customer.class);
 *   }
 *
- *   // Add your customer finder methods ...
+ *   // Add finder methods ...
 *
 *   public Customer byName(String name) {
 *     return query().eq("name", name).findOne();
@@ -34,7 +32,7 @@ import java.util.List;
 *   public List<Customer> findNew() {
 *     return query().where()
 *       .eq("status", Customer.Status.NEW)
- *       .orderBy("name")
+ *       .order("name")
 *       .findList()
 *   }
 * }
@@ -46,6 +44,15 @@ import java.util.List;
 *   ...
 *
 * }</pre>
+ * <p>
+ *  When the Finder is registered as a field on Customer it can then be used like:
+ * </p>
+ * <pre>{@code
+ *
+ *   Customer rob = Customer.find.byName("Rob");
+ *
+ * }</pre>
+ *
 */
 public class Finder<I, T> {

@@ -55,9 +62,9 @@ public class Finder<I, T> {
  private final Class<T> type;

  /**
-   * The name of the EbeanServer, null for the default server.
+   * The name of the database this finder will use, null for the default database.
   */
-  private final String serverName;
+  private final String _$dbName;

  /**
   * Create with the type of the entity bean.
@@ -82,15 +89,15 @@ public class Finder<I, T> {
   */
  public Finder(Class<T> type) {
    this.type = type;
-    this.serverName = null;
+    this._$dbName = null;
  }

  /**
-   * Create with the type of the entity bean and specific server name.
+   * Create with the type of the entity bean and specific database name.
   */
-  public Finder(Class<T> type, String serverName) {
+  public Finder(Class<T> type, String databaseName) {
    this.type = type;
-    this.serverName = serverName;
+    this._$dbName = databaseName;
  }

  /**
@@ -108,30 +115,27 @@ public class Finder<I, T> {
  }

  /**
-   * Return the underlying 'default' EbeanServer.
-   * <p>
-   * This provides full access to the API such as explicit transaction demarcation etc.
+   * Return the Database this finder will use.
   */
-  public EbeanServer db() {
-    return Ebean.getServer(serverName);
+  public Database db() {
+    return DB.byName(_$dbName);
  }

  /**
-   * Return typically a different EbeanServer to the default.
+   * Return typically a different Database to the default.
   * <p>
-   * This is equivalent to {@link Ebean#getServer(String)}
+   * This is equivalent to {@link DB#byName(String)}
   *
-   * @param server The name of the EbeanServer. If this is null then the default EbeanServer is
-   *               returned.
+   * @param databaseName The name of the Database. If this is null then the default database is returned.
   */
-  public EbeanServer db(String server) {
-    return Ebean.getServer(server);
+  public Database db(String databaseName) {
+    return DB.byName(databaseName);
  }

  /**
   * Creates an entity reference for this ID.
   * <p>
-   * Equivalent to {@link EbeanServer#getReference(Class, Object)}
+   * Equivalent to {@link Database#getReference(Class, Object)}
   */
  @Nonnull
  public T ref(I id) {
@@ -141,7 +145,7 @@ public class Finder<I, T> {
  /**
   * Retrieves an entity by ID.
   * <p>
-   * Equivalent to {@link EbeanServer#find(Class, Object)}
+   * Equivalent to {@link Database#find(Class, Object)}
   */
  @Nullable
  public T byId(I id) {
@@ -151,7 +155,7 @@ public class Finder<I, T> {
  /**
   * Delete a bean by Id.
   * <p>
-   * Equivalent to {@link EbeanServer#delete(Class, Object)}
+   * Equivalent to {@link Database#delete(Class, Object)}
   */
  public void deleteById(I id) {
    db().delete(type, id);
@@ -181,7 +185,7 @@ public class Finder<I, T> {
   * }</pre>
   *
   * <p>
-   * Equivalent to {@link EbeanServer#update(Class)}
+   * Equivalent to {@link Database#update(Class)}
   */
  public UpdateQuery<T> update() {
    return db().update(type);
@@ -190,7 +194,7 @@ public class Finder<I, T> {
  /**
   * Creates a query.
   * <p>
-   * Equivalent to {@link EbeanServer#find(Class)}
+   * Equivalent to {@link Database#find(Class)}
   */
  public Query<T> query() {
    return db().find(type);
@@ -20,7 +20,7 @@ import java.util.concurrent.TimeoutException;
 * <pre>{@code
 *
 *  // create a query to find all orders
- * Query<Order> query = Ebean.find(Order.class);
+ * Query<Order> query = DB.find(Order.class);
 *
 *  // execute the query in a background thread
 *  // immediately returning the futureList
@@ -11,7 +11,7 @@ package io.ebean;
 * </p>
 * <pre>{@code
 * Query q =
- *     Ebean.find(Person.class)
+ *     DB.find(Person.class)
 *       .where()
 *         .or()
 *           .like("name", "Rob%")
@@ -30,7 +30,7 @@ package io.ebean;
 * <pre>{@code
 *
 * Query q =
- *     Ebean.find(Person.class)
+ *     DB.find(Person.class)
 *       .where()
 *         .or()
 *           .like("name", "Rob%")
@@ -50,7 +50,7 @@ package io.ebean;
 * </p>
 * <pre>{@code
 * Query<Customer> q =
- *  Ebean.find(Customer.class)
+ *  DB.find(Customer.class)
 *      .where()
 *        .or()
 *          .and()
@@ -11,15 +11,15 @@ import io.ebean.bean.EntityBean;
 * Ebean users.
 * <p>
 * Note that there is a ebean-mocker project that enables you to use Mockito or similar
- * tools to still mock out the underlying 'default EbeanServer' for testing purposes.
+ * tools to still mock out the underlying 'default Database' for testing purposes.
 * <p>
 * You may choose not use this Model mapped superclass if you don't like the 'Active Record' style
 * or if you believe it 'pollutes' your entity beans.
 * <p>
- * You can use Dependency Injection like Guice or Spring to construct and wire a EbeanServer instance
+ * You can use Dependency Injection like Guice or Spring to construct and wire a Database instance
 * and have that same instance used with this Model and Finder. The way that works is that when the
- * DI container creates the EbeanServer instance it can be registered with the Ebean singleton. In this
- * way the EbeanServer instance can be injected as per normal Guice / Spring dependency injection and
+ * DI container creates the Database instance it can be registered with DB. In this
+ * way the Database instance can be injected as per normal Guice / Spring dependency injection and
 * that same instance also used to support the Model and Finder active record style.
 * <p>
 * If you choose to use the Model mapped superclass you will probably also chose to additionally add
@@ -76,15 +76,33 @@ import io.ebean.bean.EntityBean;
 public abstract class Model {

  /**
-   * Return the underlying 'default' EbeanServer.
+   * The name of the database this entity will use, null for the default database.
+   */
+  private final String _$dbName;
+
+  /**
+   * Create using the default database.
+   */
+  public Model() {
+    this._$dbName = null;
+  }
+
+  /**
+   * Create with a named database (typically not the default database).
+   */
+  public Model(String dbName) {
+    this._$dbName = dbName;
+  }
+
+  /**
+   * Return the underlying 'default' Database.
   * <p>
   * This provides full access to the API such as explicit transaction demarcation etc.
   * <p>
   * Example:
   * <pre>{@code
   *
-   * Transaction transaction = Customer.db().beginTransaction();
-   * try {
+   * try (Transaction transaction = Customer.db().beginTransaction()) {
   *
   *   // turn off cascade persist for this transaction
   *   transaction.setPersistCascade(false);
@@ -104,26 +122,12 @@ public abstract class Model {
   *
   *   transaction.commit();
   *
-   * } finally {
-   *   transaction.end();
   * }
   *
   * }</pre>
   */
-  public static EbeanServer db() {
-    return Ebean.getDefaultServer();
-  }
-
-  /**
-   * Return a named EbeanServer that is typically different to the default server.
-   * <p>
-   * If you are using multiple databases then each database has a name and maps to a single
-   * EbeanServer. You can use this method to get an EbeanServer for another database.
-   *
-   * @param server The name of the EbeanServer. If this is null then the default EbeanServer is returned.
-   */
-  public static EbeanServer db(String server) {
-    return Ebean.getServer(server);
+  public Database db() {
+    return DB.byName(_$dbName);
  }

  /**
@@ -146,7 +150,7 @@ public abstract class Model {
   *
   * }</pre>
   *
-   * @see EbeanServer#markAsDirty(Object)
+   * @see Database#markAsDirty(Object)
   */
  public void markAsDirty() {
    db().markAsDirty(this);
@@ -182,12 +186,19 @@ public abstract class Model {
   * Ebean will detect if this is a new bean or a previously fetched bean and perform either an
   * insert or an update based on that.
   *
-   * @see EbeanServer#save(Object)
+   * @see Database#save(Object)
   */
  public void save() {
    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>
@@ -202,21 +213,35 @@ public abstract class Model {
  /**
   * Update this entity.
   *
-   * @see EbeanServer#update(Object)
+   * @see Database#update(Object)
   */
  public void update() {
    db().update(this);
  }

+  /**
+   * Update this entity with an explicit transaction.
+   */
+  public void update(Transaction transaction) {
+    db().update(this, transaction);
+  }
+
  /**
   * Insert this entity.
   *
-   * @see EbeanServer#insert(Object)
+   * @see Database#insert(Object)
   */
  public void insert() {
    db().insert(this);
  }

+  /**
+   * Insert with an explicit transaction.
+   */
+  public void insert(Transaction transaction) {
+    db().insert(this, transaction);
+  }
+
  /**
   * Delete this bean.
   * <p>
@@ -232,12 +257,19 @@ public abstract class Model {
   * deleted. Note that, if JDBC batch mode is used then this always returns true.
   * </p>
   *
-   * @see EbeanServer#delete(Object)
+   * @see Database#delete(Object)
   */
  public boolean delete() {
    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>
@@ -245,37 +277,23 @@ public abstract class Model {
   * want to perform a hard/permanent delete.
   * </p>
   *
-   * @see EbeanServer#deletePermanent(Object)
+   * @see Database#deletePermanent(Object)
   */
  public boolean deletePermanent() {
    return db().deletePermanent(this);
  }

  /**
-   * Perform an update using this entity against the specified server.
+   * Delete a bean permanently without soft delete using an explicit transaction.
   */
-  public void update(String server) {
-    db(server).update(this);
-  }
-
-  /**
-   * Perform an insert using this entity against the specified server.
-   */
-  public void insert(String server) {
-    db(server).insert(this);
-  }
-
-  /**
-   * Perform a delete using this entity against the specified server.
-   */
-  public boolean delete(String server) {
-    return db(server).delete(this);
+  public boolean deletePermanent(Transaction transaction) {
+    return db().deletePermanent(this, transaction);
  }

  /**
   * Refreshes this entity from the database.
   *
-   * @see EbeanServer#refresh(Object)
+   * @see Database#refresh(Object)
   */
  public void refresh() {
    db().refresh(this);
@@ -4,7 +4,6 @@ import io.ebean.util.StringHelper;

 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;

@@ -81,7 +80,6 @@ public final class OrderBy<T> implements Serializable {
   * Add a property with ascending order to this OrderBy.
   */
  public Query<T> asc(String propertyName, String collation) {
-
    list.add(new Property(propertyName, true, collation));
    return query;
  }
@@ -90,7 +88,6 @@ public final class OrderBy<T> implements Serializable {
   * Add a property with descending order to this OrderBy.
   */
  public Query<T> desc(String propertyName) {
-
    list.add(new Property(propertyName, false));
    return query;
  }
@@ -99,7 +96,6 @@ public final class OrderBy<T> implements Serializable {
   * Add a property with descending order to this OrderBy.
   */
  public Query<T> desc(String propertyName, String collation) {
-
    list.add(new Property(propertyName, false, collation));
    return query;
  }
@@ -109,7 +105,6 @@ public final class OrderBy<T> implements Serializable {
   * Return true if the property is known to be contained in the order by clause.
   */
  public boolean containsProperty(String propertyName) {
-
    for (Property aList : list) {
      if (propertyName.equals(aList.getProperty())) {
        return true;
@@ -162,10 +157,9 @@ public final class OrderBy<T> implements Serializable {
   * Return a copy of the OrderBy.
   */
  public OrderBy<T> copy() {
-
    OrderBy<T> copy = new OrderBy<>();
-    for (Property aList : list) {
-      copy.add(aList.copy());
+    for (Property property : list) {
+      copy.add(property.copy());
    }
    return copy;
  }
@@ -242,6 +236,18 @@ public final class OrderBy<T> implements Serializable {
    return this;
  }

+  /**
+   * Return true if this order by can be used in select clause.
+   */
+  public boolean supportsSelect() {
+    for (Property property : list) {
+      if (!property.supportsSelect()) {
+        return false;
+      }
+    }
+    return true;
+  }
+
  /**
   * A property and its ascending descending order.
   */
@@ -402,6 +408,12 @@ public final class OrderBy<T> implements Serializable {
      this.ascending = ascending;
    }

+    /**
+     * Support use in select clause if no collation or nulls ordering.
+     */
+    boolean supportsSelect() {
+      return nulls == null;
+    }
  }

  private void parse(String orderByClause) {
@@ -412,15 +424,15 @@ public final class OrderBy<T> implements Serializable {

    String[] chunks = orderByClause.split(",");
    for (String chunk : chunks) {
-      String[] pairs = chunk.split(" ");
-      Property p = parseProperty(pairs);
+      Property p = parseProperty(chunk);
      if (p != null) {
        list.add(p);
      }
    }
  }

-  private Property parseProperty(String[] pairs) {
+  private Property parseProperty(String chunk) {
+    String[] pairs = chunk.split(" ");
    if (pairs.length == 0) {
      return null;
    }
@@ -446,8 +458,7 @@ public final class OrderBy<T> implements Serializable {
      boolean asc = isAscending(wordList.get(1));
      return new Property(wordList.get(0), asc, wordList.get(2), wordList.get(3));
    }
-    String m = "Expecting a 1, 2 or 4 words in [" + Arrays.toString(pairs) + "] but got " + wordList;
-    throw new RuntimeException(m);
+    return new Property(chunk.trim(), true);
  }

  private boolean isAscending(String s) {
@@ -24,8 +24,7 @@ import java.util.concurrent.Future;
 *     // We want to find the first 50 new orders
 *     //  ... so we don't really need setFirstRow(0)
 *
- *     PagedList<Order> pagedList
- *       = ebeanServer.find(Order.class)
+ *     PagedList<Order> pagedList = DB.find(Order.class)
 *       .where().eq("status", Order.Status.NEW)
 *       .order().asc("id")
 *       .setFirstRow(0)
@@ -61,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
@@ -26,11 +26,11 @@ import java.util.List;
 *   pairs.add("sj2", 1001);
 *   pairs.add("pf3", 1000);
 *
- *   List<OCachedNatKeyBean3> list = Ebean.find(OCachedNatKeyBean3.class)
+ *   List<OCachedNatKeyBean3> list = DB.find(OCachedNatKeyBean3.class)
 *   .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,17 +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);
 }
@@ -3,6 +3,7 @@ package io.ebean;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.persistence.NonUniqueResultException;
+import java.sql.Connection;
 import java.sql.Timestamp;
 import java.util.List;
 import java.util.Map;
@@ -10,6 +11,7 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import java.util.stream.Stream;

 /**
 * Object relational query for finding a List, Set, Map or single entity bean.
@@ -19,14 +21,11 @@ import java.util.function.Predicate;
 * <p>
 * <pre>{@code
 *
- * List<Order> orderList =
- *   ebeanServer.find(Order.class)
- *     .fetch("customer")
- *     .fetch("details")
+ * List<Order> orderList = DB.find(Order.class)
 *     .where()
 *       .like("customer.name","rob%")
 *       .gt("orderDate",lastWeek)
- *     .orderBy("customer.id, id desc")
+ *     .order("customer.id, id desc")
 *     .setMaxRows(50)
 *     .findList();
 *
@@ -38,29 +37,14 @@ import java.util.function.Predicate;
 * <pre>{@code
 *
 * String oql =
- *   	+" fetch customer "
- *   	+" fetch details "
 *   	+" where customer.name like :custName and orderDate > :minOrderDate "
 *   	+" order by customer.id, id desc "
 *   	+" limit 50 ";
 *
- * Query<Order> query = ebeanServer.createQuery(Order.class, oql);
- * query.setParameter("custName", "Rob%");
- * query.setParameter("minOrderDate", lastWeek);
- *
- * List<Order> orderList = query.findList();
- * ...
- * }</pre>
- * <p>
- * Example: Using a named query called "with.cust.and.details"
- * </p>
- * <pre>{@code
- *
- * Query<Order> query = ebeanServer.createNamedQuery(Order.class,"with.cust.and.details");
- * query.setParameter("custName", "Rob%");
- * query.setParameter("minOrderDate", lastWeek);
- *
- * List<Order> orderList = query.findList();
+ * List<Order> orderList = DB.createQuery(Order.class, oql)
+ *   .setParameter("custName", "Rob%")
+ *   .setParameter("minOrderDate", lastWeek)
+ *   .findList();
 * ...
 * }</pre>
 * <h3>AutoTune</h3>
@@ -244,6 +228,38 @@ public interface Query<T> {
   */
  <D> DtoQuery<D> asDto(Class<D> dtoClass);

+  /**
+   * Convert the query to a UpdateQuery.
+   * <p>
+   * Typically this is used with query beans to covert a query bean
+   * query into an UpdateQuery like the examples below.
+   * </p>
+   *
+   * <pre>{@code
+   *
+   *  int rowsUpdated = new QCustomer()
+   *       .name.startsWith("Rob")
+   *       .asUpdate()
+   *       .set("active", false)
+   *       .update();;
+   *
+   * }</pre>
+   *
+   * <pre>{@code
+   *
+   *   int rowsUpdated = new QContact()
+   *       .notes.note.startsWith("Make Inactive")
+   *       .email.endsWith("@foo.com")
+   *       .customer.id.equalTo(42)
+   *       .asUpdate()
+   *       .set("inactive", true)
+   *       .setRaw("email = lower(email)")
+   *       .update();
+   *
+   * }</pre>
+   */
+  UpdateQuery<T> asUpdate();
+
  /**
   * Cancel the query execution if supported by the underlying database and
   * driver.
@@ -340,6 +356,27 @@ public interface Query<T> {
   */
  Query<T> setAutoTune(boolean autoTune);

+  /**
+   * Execute the query allowing properties with invalid JSON to be collected and not fail the query.
+   * <pre>{@code
+   *
+   *   // fetch a bean with JSON content
+   *   EBasicJsonList bean= DB.find(EBasicJsonList.class)
+   *       .setId(42)
+   *       .setAllowLoadErrors()  // collect errors into bean state if we have invalid JSON
+   *       .findOne();
+   *
+   *
+   *   // get the invalid JSON errors from the bean state
+   *   Map<String, Exception> errors = server().getBeanState(bean).getLoadErrors();
+   *
+   *   // If this map is not empty tell we have invalid JSON
+   *   // and should try and fix the JSON content or inform the user
+   *
+   * }</pre>
+   */
+  Query<T> setAllowLoadErrors();
+
  /**
   * Set the default lazy loading batch size to use.
   * <p>
@@ -383,8 +420,7 @@ public interface Query<T> {
   * </p>
   * <pre>{@code
   *
-   * List<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * List<Customer> customers = DB.find(Customer.class)
   *     // Only fetch the customer id, name and status.
   *     // This is described as a "Partial Object"
   *     .select("name, status")
@@ -412,8 +448,7 @@ public interface Query<T> {
   * <pre>{@code
   *
   * // query orders...
-   * List<Order> orders =
-   *     ebeanServer.find(Order.class)
+   * List<Order> orders = DB.find(Order.class)
   *       // fetch the customer...
   *       // ... getting the customers name and phone number
   *       .fetch("customer", "name, phoneNumber")
@@ -428,8 +463,7 @@ public interface Query<T> {
   * <pre>{@code
   *
   * // fetch customers (their id, name and status)
-   * List<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * List<Customer> customers = DB.find(Customer.class)
   *     .select("name, status")
   *     .fetch("contacts", "firstName,lastName,email")
   *     .findList();
@@ -468,6 +502,14 @@ public interface Query<T> {
   */
  Query<T> fetchQuery(String path, String fetchProperties);

+  /**
+   * Fetch the path and properties using L2 bean cache.
+   *
+   * @param path            The path of the beans we are fetching from L2 cache.
+   * @param fetchProperties The properties that should be loaded.
+   */
+  Query<T> fetchCache(String path, String fetchProperties);
+
  /**
   * Fetch the path and properties lazily (via batch lazy loading).
   * <p>
@@ -498,8 +540,7 @@ public interface Query<T> {
   * <pre>{@code
   *
   * // fetch customers (their id, name and status)
-   * List<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * List<Customer> customers = DB.find(Customer.class)
   *     .select("name, status")
   *     .fetch("contacts", "firstName,lastName,email", new FetchConfig().lazy(10))
   *     .findList();
@@ -520,8 +561,7 @@ public interface Query<T> {
   * <pre>{@code
   *
   * // fetch customers (their id, name and status)
-   * List<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * List<Customer> customers = DB.find(Customer.class)
   *     // eager fetch the contacts
   *     .fetch("contacts")
   *     .findList();
@@ -556,6 +596,11 @@ public interface Query<T> {
   */
  Query<T> fetchQuery(String path);

+  /**
+   * Fetch the path eagerly using L2 cache.
+   */
+  Query<T> fetchCache(String path);
+
  /**
   * Fetch the path lazily (via batch lazy loading).
   * <p>
@@ -584,8 +629,7 @@ public interface Query<T> {
   * <pre>{@code
   *
   * // fetch customers (their id, name and status)
-   * List<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * List<Customer> customers = DB.find(Customer.class)
   *     // lazy fetch contacts with a batch size of 100
   *     .fetch("contacts", new FetchConfig().lazy(100))
   *     .findList();
@@ -602,10 +646,25 @@ public interface Query<T> {
   */
  Query<T> apply(FetchPath fetchPath);

+  /**
+   * Execute the query using the given transaction.
+   */
+  Query<T> usingTransaction(Transaction transaction);
+
+  /**
+   * Execute the query using the given connection.
+   */
+  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>
-   * This query will execute against the EbeanServer that was used to create it.
+   * This query will execute against the Database that was used to create it.
   * </p>
   */
  @Nonnull
@@ -627,24 +686,21 @@ public interface Query<T> {
   * the jdbc statement and resultSet are closed at the end of the iteration.
   * </p>
   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
+   * This query will execute against the Database that was used to create it.
   * </p>
   * <pre>{@code
   *
-   *  Query<Customer> query =
-   *    ebeanServer.find(Customer.class)
+   *  Query<Customer> query = DB.find(Customer.class)
   *     .where().eq("status", Status.NEW)
   *     .order().asc("id");
   *
-   *  QueryIterator<Customer> it = query.findIterate();
-   *  try {
+   *  // use try with resources to ensure QueryIterator is closed
+   *
+   *  try (QueryIterator<Customer> it = query.findIterate()) {
   *    while (it.hasNext()) {
   *      Customer customer = it.next();
   *      // do something with customer ...
   *    }
-   *  } finally {
-   *    // close the underlying resources
-   *    it.close();
   *  }
   *
   * }</pre>
@@ -652,6 +708,49 @@ public interface Query<T> {
  @Nonnull
  QueryIterator<T> findIterate();

+  /**
+   * Execute the query returning the result as a Stream.
+   * <p>
+   * Note that this will hold all resulting beans in memory using a single
+   * persistence context. Use findLargeStream() for queries that expect to
+   * return a large number of results.
+   * </p>
+   * <pre>{@code
+   *
+   *  // use try with resources to ensure Stream is closed
+   *
+   *  try (Stream<Customer> stream = query.findStream()) {
+   *    stream
+   *    .map(...)
+   *    .collect(...);
+   *  }
+   *
+   * }</pre>
+   */
+  @Nonnull
+  Stream<T> findStream();
+
+  /**
+   * Execute the query returning the result as a Stream.
+   * <p>
+   * Note that this uses multiple persistence contexts such that we can use
+   * it with a large number of results.
+   * </p>
+   * <pre>{@code
+   *
+   *  // use try with resources to ensure Stream is closed
+   *
+   *  try (Stream<Customer> stream = query.findLargeStream()) {
+   *    stream
+   *    .map(...)
+   *    .collect(...);
+   *  }
+   *
+   * }</pre>
+   */
+  @Nonnull
+  Stream<T> findLargeStream();
+
  /**
   * Execute the query processing the beans one at a time.
   * <p>
@@ -681,7 +780,7 @@ public interface Query<T> {
   * </p>
   * <pre>{@code
   *
-   *  ebeanServer.find(Customer.class)
+   *  DB.find(Customer.class)
   *     .where().eq("status", Status.NEW)
   *     .order().asc("id")
   *     .findEach((Customer customer) -> {
@@ -710,7 +809,7 @@ public interface Query<T> {
   * </p>
   * <pre>{@code
   *
-   *  ebeanServer.find(Customer.class)
+   *  DB.find(Customer.class)
   *     .fetch("contacts", new FetchConfig().query(2))
   *     .where().eq("status", Status.NEW)
   *     .order().asc("id")
@@ -733,12 +832,11 @@ public interface Query<T> {
  /**
   * Execute the query returning the list of objects.
   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
+   * This query will execute against the Database that was used to create it.
   * </p>
   * <pre>{@code
   *
-   * List<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * List<Customer> customers = DB.find(Customer.class)
   *     .where().ilike("name", "rob%")
   *     .findList();
   *
@@ -750,12 +848,11 @@ public interface Query<T> {
  /**
   * Execute the query returning the set of objects.
   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
+   * This query will execute against the Database that was used to create it.
   * </p>
   * <pre>{@code
   *
-   * Set<Customer> customers =
-   *     ebeanServer.find(Customer.class)
+   * Set<Customer> customers = DB.find(Customer.class)
   *     .where().ilike("name", "rob%")
   *     .findSet();
   *
@@ -767,7 +864,7 @@ public interface Query<T> {
  /**
   * Execute the query returning a map of the objects.
   * <p>
-   * This query will execute against the EbeanServer that was used to create it.
+   * This query will execute against the Database that was used to create it.
   * </p>
   * <p>
   * You can use setMapKey() so specify the property values to be used as keys
@@ -775,8 +872,7 @@ public interface Query<T> {
   * </p>
   * <pre>{@code
   *
-   * Map<String, Product> map =
-   *   ebeanServer.find(Product.class)
+   * Map<String, Product> map = DB.find(Product.class)
   *     .setMapKey("sku")
   *     .findMap();
   *
@@ -792,9 +888,9 @@ public interface Query<T> {
   * <pre>{@code
   *
   *  List<String> names =
-   *    Ebean.find(Customer.class)
+   *    DB.find(Customer.class)
   *      .select("name")
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .findSingleAttributeList();
   *
   * }</pre>
@@ -803,11 +899,11 @@ public interface Query<T> {
   * <pre>{@code
   *
   *  List<String> names =
-   *    Ebean.find(Customer.class)
+   *    DB.find(Customer.class)
   *      .setDistinct(true)
   *      .select("name")
   *      .where().eq("status", Customer.Status.NEW)
-   *      .orderBy().asc("name")
+   *      .order().asc("name")
   *      .setMaxRows(100)
   *      .findSingleAttributeList();
   *
@@ -824,7 +920,7 @@ public interface Query<T> {
   * <pre>{@code
   *
   *  String name =
-   *    Ebean.find(Customer.class)
+   *    DB.find(Customer.class)
   *      .select("name")
   *      .where().eq("id", 42)
   *      .findSingleAttribute();
@@ -838,6 +934,37 @@ public interface Query<T> {
   */
  boolean isCountDistinct();

+  /**
+   * Execute the query returning true if a row is found.
+   * <p>
+   * The query is executed using max rows of 1 and will only select the id property.
+   * This method is really just a convenient way to optimise a query to perform a
+   * 'does a row exist in the db' check.
+   * </p>
+   *
+   * <h2>Example using a query bean:</h2>
+   * <pre>{@code
+   *
+   *   boolean userExists =
+   *     new QContact()
+   *       .email.equalTo("rob@foo.com")
+   *       .exists();
+   *
+   * }</pre>
+   *
+   * <h2>Example:</h2>
+   * <pre>{@code
+   *
+   *   boolean userExists = query()
+   *     .where().eq("email", "rob@foo.com")
+   *     .exists();
+   *
+   * }</pre>
+   *
+   * @return True if the query finds a matching row in the database
+   */
+  boolean exists();
+
  /**
   * Execute the query returning either a single bean or null (if no matching
   * bean is found).
@@ -852,8 +979,7 @@ public interface Query<T> {
   * <pre>{@code
   *
   * // assuming the sku of products is unique...
-   * Product product =
-   *     ebeanServer.find(Product.class)
+   * Product product = DB.find(Product.class)
   *         .where().eq("sku", "aa113")
   *         .findOne();
   * ...
@@ -865,8 +991,7 @@ public interface Query<T> {
   * <pre>{@code
   *
   * // Fetch order 1 and additionally fetch join its order details...
-   * Order order =
-   *     ebeanServer.find(Order.class)
+   * Order order = DB.find(Order.class)
   *       .setId(1)
   *       .fetch("details")
   *       .findOne();
@@ -1007,7 +1132,7 @@ public interface Query<T> {
   * </p>
   * <pre>{@code
   *
-   *  PagedList<Order> pagedList = Ebean.find(Order.class)
+   *  PagedList<Order> pagedList = DB.find(Order.class)
   *       .setFirstRow(50)
   *       .setMaxRows(20)
   *       .findPagedList();
@@ -1032,11 +1157,9 @@ public interface Query<T> {
   * // a query with a named parameter
   * String oql = "find order where status = :orderStatus";
   *
-   * Query<Order> query = ebeanServer.find(Order.class, oql);
-   *
-   * // bind the named parameter
-   * query.bind("orderStatus", OrderStatus.NEW);
-   * List<Order> list = query.findList();
+   * List<Order> list = DB.find(Order.class, oql)
+   *   .setParameter("orderStatus", OrderStatus.NEW)
+   *   .findList();
   *
   * }</pre>
   *
@@ -1054,12 +1177,9 @@ public interface Query<T> {
   * // a query with a positioned parameter
   * String oql = "where status = ? order by id desc";
   *
-   * Query<Order> query = ebeanServer.createQuery(Order.class, oql);
-   *
-   * // bind the parameter
-   * query.setParameter(1, OrderStatus.NEW);
-   *
-   * List<Order> list = query.findList();
+   * List<Order> list = DB.createQuery(Order.class, oql)
+   *   .setParameter(1, OrderStatus.NEW)
+   *   .findList();
   *
   * }</pre>
   *
@@ -1068,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>
@@ -1076,8 +1220,7 @@ public interface Query<T> {
   * </p>
   * <pre>{@code
   *
-   * Order order =
-   *     ebeanServer.find(Order.class)
+   * Order order = DB.find(Order.class)
   *     .setId(1)
   *     .fetch("details")
   *     .findOne();
@@ -1098,8 +1241,7 @@ public interface Query<T> {
   * Add a single Expression to the where clause returning the query.
   * <pre>{@code
   *
-   * List<Order> newOrders =
-   *     ebeanServer.find(Order.class)
+   * List<Order> newOrders = DB.find(Order.class)
   * 		.where().eq("status", Order.NEW)
   * 		.findList();
   * ...
@@ -1114,8 +1256,7 @@ public interface Query<T> {
   * where clause.
   * <pre>{@code
   *
-   * List<Order> orders =
-   *     ebeanServer.find(Order.class)
+   * List<Order> orders = DB.find(Order.class)
   *     .where()
   *       .eq("status", Order.NEW)
   *       .ilike("customer.name","rob%")
@@ -1161,10 +1302,7 @@ public interface Query<T> {
   * </p>
   * <pre>{@code
   *
-   * List<Customer> list =
-   *     ebeanServer.find(Customer.class)
-   *     // .fetch("orders", new FetchConfig().lazy())
-   *     // .fetch("orders", new FetchConfig().query())
+   * List<Customer> list = DB.find(Customer.class)
   *     .fetch("orders")
   *     .where().ilike("name", "rob%")
   *     .filterMany("orders").eq("status", Order.Status.NEW).gt("orderDate", lastWeek)
@@ -1178,8 +1316,7 @@ public interface Query<T> {
   * </p>
   *
   * @param propertyName the name of the many property that you want to have a filter on.
-   * @return the expression list that you add filter expressions for the many
-   * to.
+   * @return the expression list that you add filter expressions for the many to.
   */
  ExpressionList<T> filterMany(String propertyName);

@@ -1215,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);

  /**
@@ -1235,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);

@@ -1248,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);

  /**
@@ -1293,7 +1402,7 @@ public interface Query<T> {
   * <pre>{@code
   *
   *   List<Customer> customers =
-   *       Ebean.find(Customer.class)
+   *       DB.find(Customer.class)
   *          .setDistinct(true)
   *          .select("name")
   *          .findList();
@@ -1309,7 +1418,7 @@ public interface Query<T> {
   *
   *  List<CountedValue<Order.Status>> orderStatusCount =
   *
-   *     Ebean.find(Order.class)
+   *     DB.find(Order.class)
   *      .select("status")
   *      .where()
   *      .gt("orderDate", LocalDate.now().minusMonths(3))
@@ -1329,7 +1438,6 @@ public interface Query<T> {
   *   count:1 orderStatus:COMPLETE
   *
   * }</pre>
-   *
   */
  Query<T> setCountDistinct(CountDistinctOrder orderBy);

@@ -1366,10 +1474,8 @@ public interface Query<T> {
   *
   * // Assuming sku is unique for products...
   *
-   * Map<String,Product> productMap =
-   *     ebeanServer.find(Product.class)
-   *     // use sku for keys...
-   *     .setMapKey("sku")
+   * Map<String,Product> productMap = DB.find(Product.class)
+   *     .setMapKey("sku")  // sku map keys...
   *     .findMap();
   *
   * }</pre>
@@ -1419,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.
@@ -1541,11 +1636,50 @@ public interface Query<T> {
   */
  Query<T> alias(String alias);

+  /**
+   * Set the base table to use for this query.
+   * <p>
+   * Typically this is used when a table has partitioning and we wish to specify a specific
+   * partition/table to query against.
+   * </p>
+   * <pre>{@code
+   *
+   *   QOrder()
+   *   .setBaseTable("order_2019_05")
+   *   .status.equalTo(Status.NEW)
+   *   .findList();
+   *
+   * }</pre>
+   */
+  Query<T> setBaseTable(String baseTable);
+
  /**
   * Return the type of beans being queried.
   */
  Class<T> getBeanType();

+  /**
+   * Restrict the query to only return subtypes of the given inherit type.
+   *
+   * <pre>{@code
+   *
+   *   List<Animal> animals =
+   *     new QAnimal()
+   *       .name.startsWith("Fluffy")
+   *       .setInheritType(Cat.class)
+   *       .findList();
+   *
+   * }</pre>
+   *
+   * @param type An inheritance subtype of the
+   */
+  Query<T> setInheritType(Class<? extends T> type);
+
+  /**
+   * Returns the inherit type. This is normally the same as getBeanType() returns as long as no other type is set.
+   */
+  Class<? extends T> getInheritType();
+
  /**
   * Return the type of query being executed.
   */
@@ -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();
@@ -87,7 +87,7 @@ package io.ebean;
 *     // .columnMapping("sum(d.order_qty*d.unit_price)", "totalAmount")
 *     .create();
 *
- *   List<OrderAggregate> list = Ebean.find(OrderAggregate.class)
+ *   List<OrderAggregate> list = DB.find(OrderAggregate.class)
 *       .setRawSql(rawSql)
 *       .where().gt("order.id", 0)
 *       .having().gt("totalAmount", 20)
@@ -114,7 +114,7 @@ package io.ebean;
 *     .columnMappingIgnore("'ignoreMe'")
 *     .create();
 *
- *   List<OrderAggregate> orders = Ebean.find(OrderAggregate.class)
+ *   List<OrderAggregate> orders = DB.find(OrderAggregate.class)
 *     .setRawSql(rawSql)
 *     .fetch("order", "status,orderDate", new FetchConfig().query())
 *     .fetch("order.customer", "name")
@@ -146,7 +146,7 @@ package io.ebean;
 *       .tableAliasMapping("p", "details.product")
 *       .create();
 *
- *  List<Order> ordersFromRaw = Ebean.find(Order.class)
+ *  List<Order> ordersFromRaw = DB.find(Order.class)
 *       .setRawSql(rawSql)
 *       .setParameter("maxOrderId", 2)
 *       .setParameter("productId", 1)
@@ -13,7 +13,7 @@ import java.sql.SQLException;
 *
 *  String sql = "select id, name, status from o_customer order by name desc";
 *
- *  Ebean.createSqlQuery(sql)
+ *  DB.sqlQuery(sql)
 *    .findEachRow((resultSet, rowNum) -> {
 *
 *      // read directly from ResultSet
@@ -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> {
 *
@@ -40,9 +40,10 @@ import java.sql.SQLException;
 *
 *   String sql = "select id, name, status from o_customer where name = ?";
 *
- *  CustomerDto rob = Ebean.createSqlQuery(sql)
+ *  CustomerDto rob = DB.sqlQuery(sql)
 *    .setParameter(1, "Rob")
- *    .findOne(CUSTOMER_MAPPER);
+ *    .mapTo(CUSTOMER_MAPPER)
+ *    .findOne();
 *
 *
 * }</pre>
@@ -13,20 +13,8 @@ import java.util.Map;
 * <h3>Example of simple use</h3>
 * <pre>{@code
 *
- *   EbeanServer server = Ebean.getDefaultServer();
- *   server.script().run("/scripts/test-script.sql");
- *
- * }</pre>
- *
- *
- * <h3>Example using place holders in the script</h3>
- * <pre>{@code
- *
- *   Map<String,String> placeholders = new HashMap<>();
- *   placeholders.put("tableName", "e_basic");
- *
- *   EbeanServer server = Ebean.getDefaultServer();
- *   server.script().run("/scripts/test-script.sql");
+ *   Database database = DB.getDefault();
+ *   database.script().run("/scripts/test-script.sql");
 *
 * }</pre>
 */
@@ -45,8 +33,8 @@ public interface ScriptRunner {
   *   Map<String,String> placeholders = new HashMap<>();
   *   placeholders.put("tableName", "e_basic");
   *
-   *   EbeanServer server = Ebean.getDefaultServer();
-   *   server.script().run("/scripts/test-script.sql");
+   *   Database database = DB.getDefault();
+   *   database.script().run("/scripts/test-script.sql", placeholders);
   *
   * }</pre>
   */
@@ -62,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);
+
 }
@@ -0,0 +1,18 @@
+package io.ebean;
+
+import javax.persistence.OptimisticLockException;
+
+/**
+ * Thrown at SERIALIZABLE isolation level for non-recoverable concurrent conflict.
+ */
+public class SerializableConflictException extends OptimisticLockException {
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * Create with a message and cause.
+   */
+  public SerializableConflictException(String message, Throwable cause) {
+    super(message, cause);
+  }
+}
@@ -10,34 +10,30 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;

 /**
- * Query object for performing native SQL queries that return SqlRow's.
- * <p>
- * Firstly note that you can use your own sql queries with <em>entity beans</em>
- * by using the SqlSelect annotation. This should be your first approach when
- * wanting to use your own SQL queries.
- * </p>
- * <p>
- * If ORM Mapping is too tight and constraining for your problem then SqlQuery
- * could be a good approach.
- * </p>
+ * Query object for performing native SQL queries that return SqlRow or directly read
+ * ResultSet using a RowMapper.
 * <p>
 * The returned SqlRow objects are similar to a LinkedHashMap with some type
 * conversion support added.
 * </p>
 * <p>
+ * Refer to {@link DtoQuery} for native sql queries returning DTO beans.
+ * </p>
+ * <p>
+ * Refer to {@link Database#findNative(Class, String)} for native sql queries returning entity beans.
+ * </p>
+ *
 * <pre>{@code
 *
- *   // its typically a good idea to use a named query
- *   // and put the sql in the orm.xml instead of in your code
+ *   // example using named parameters
 *
 *   String sql = "select id, name from customer where name like :name and status_code = :status";
 *
- *   SqlQuery sqlQuery = Ebean.createSqlQuery(sql);
- *   sqlQuery.setParameter("name", "Acme%");
- *   sqlQuery.setParameter("status", "ACTIVE");
- *
- *   // execute the query returning a List of MapBean objects
- *   List<SqlRow> list = sqlQuery.findList();
+ *   List<SqlRow> list =
+ *     DB.sqlQuery(sql)
+ *       .setParameter("name", "Acme%")
+ *       .setParameter("status", "ACTIVE")
+ *       .findList();
 *
 * }</pre>
 */
@@ -79,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);

  /**
@@ -104,7 +98,7 @@ public interface SqlQuery extends Serializable {
   *
   *  String sql = "select id, name, status from customer order by name desc";
   *
-   *  Ebean.createSqlQuery(sql)
+   *  DB.sqlQuery(sql)
   *    .findEachRow((resultSet, rowNum) -> {
   *
   *      // read directly from ResultSet
@@ -129,77 +123,121 @@ 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 = Ebean.createSqlQuery(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 = Ebean.createSqlQuery(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.
+   * Set one of more positioned parameters.
+   * <p>
+   * This is a convenient alternative to multiple calls to {@link #setParameter(Object)}.
+   *
+   * <pre>{@code
+   *
+   *   String sql = "select id, name from customer where name like ? and status = ?";
+   *
+   *   List<SqlRow> list =
+   *     DB.sqlQuery(sql)
+   *       .setParameters("Rob", Status.NEW)
+   *       .findList();
+   *
+   *
+   *   // effectively the same as ...
+   *
+   *       .setParameter("Rob")
+   *       .setParameter("Status.NEW)
+   *
+   *   // and ...
+   *
+   *       .setParameter(1, "Rob")
+   *       .setParameter(2, "Status.NEW)
+   *
+   * }</pre>
   */
-  SqlQuery setParameter(String name, Object value);
+  SqlQuery setParameters(Object... values);

  /**
-   * The same as bind for positioned parameters.
+   * Deprecated migrate to setParameters(Object... values)
+   */
+  @Deprecated
+  SqlQuery setParams(Object... values);
+
+  /**
+   * 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.
   */
@@ -236,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();
+  }
 }
@@ -16,20 +16,33 @@ package io.ebean;
 * notify Ebean of external changes and enable Ebean to maintain it's "L2"
 * server cache.
 * </p>
- * <p>
+ *
 * <pre>{@code
 *
- *   // example that uses 'named' parameters
+ *   // example using 'positioned' parameters
 *
- *   String s = "UPDATE f_topic set post_count = :count where id = :id";
+ *   String sql = "insert into audit_log (group, title, description) values (?, ?, ?);
 *
- *   SqlUpdate update = Ebean.createSqlUpdate(s);
- *   update.setParameter("id", 1);
- *   update.setParameter("count", 50);
+ *   int rows =
+ *     DB.sqlUpdate(sql)
+ *       .setParams("login", "new user", "user rob was created")
+ *       .executeNow();
 *
- *   int modifiedCount = update.execute();
+ * }</pre>
 *
- *   String msg = "There were " + modifiedCount + " rows updated";
+ * <pre>{@code
+ *
+ *   // example using 'named' parameters
+ *
+ *   String sql = "update topic set post_count = :count where id = :id";
+ *
+ *   int rows =
+ *     DB.sqlUpdate(sql)
+ *       .setParameter("id", 1)
+ *       .setParameter("count", 50)
+ *       .execute();
+ *
+ *   String msg = "There were " + rows + " rows updated";
 *
 * }</pre>
 * <p>
@@ -37,9 +50,10 @@ package io.ebean;
 * <pre>{@code
 *
 *  String sql = "insert into audit_log (id, description, modified_description) values (?,?,?)";
- *  SqlUpdate insert = Ebean.createSqlUpdate(sql);
 *
- *  try (Transaction txn = Ebean.beginTransaction()) {
+ *  SqlUpdate insert = DB.sqlUpdate(sql);
+ *
+ *  try (Transaction txn = DB.beginTransaction()) {
 *    txn.setBatchMode(true);
 *
 *    insert.setNextParameter(10000);
@@ -65,7 +79,7 @@ package io.ebean;
 * </p>
 * <pre>{@code
 *
- *   try (Transaction txn = Ebean.beginTransaction()) {
+ *   try (Transaction txn = DB.beginTransaction()) {
 *
 *     insert.setNextParameter(10000);
 *     insert.setNextParameter("hello");
@@ -112,8 +126,6 @@ public interface SqlUpdate {
   * {@link Transaction#setBatchMode(boolean)} and
   * {@link Transaction#setBatchSize(int)}.
   * </p>
-   *
-   * @see Ebean#execute(SqlUpdate)
   */
  int execute();

@@ -218,10 +230,56 @@ public interface SqlUpdate {
  SqlUpdate setTimeout(int secs);

  /**
-   * Set the next positioned parameter.
+   * Set one of more positioned parameters.
+   * <p>
+   * This is a convenient alternative to multiple setParameter() calls.
+   *
+   * <pre>{@code
+   *
+   *   String sql = "insert into audit_log (id, name, version) values (?,?,?)";
+   *
+   *   DB.sqlUpdate(sql)
+   *       .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 bind parameter by position.
   *
   * @param value The value to bind
   */
+  SqlUpdate setParameter(Object value);
+
+  /**
+   * Deprecated migrate to setParameter(value).
+   */
+  @Deprecated
  SqlUpdate setNextParameter(Object value);

  /**
@@ -14,21 +14,20 @@ import java.sql.Connection;
 public interface Transaction extends AutoCloseable {

  /**
-   * Return the current transaction (of the default server) or null if there is
+   * Return the current transaction (of the default database) or null if there is
   * no current transaction in scope.
   * <p>
-   * This is the same as <code>Ebean.currentTransaction()</code>
+   * This is the same as <code>DB.currentTransaction()</code>
   * </p>
   * <p>
-   * This returns the current transaction for the 'default server'.  If you are using
-   * multiple EbeanServer's then use {@link EbeanServer#currentTransaction()}.
+   * This returns the current transaction for the default database.
   * </p>
   *
-   * @see Ebean#currentTransaction()
-   * @see EbeanServer#currentTransaction()
+   * @see DB#currentTransaction()
+   * @see Database#currentTransaction()
   */
  static Transaction current() {
-    return Ebean.currentTransaction();
+    return DB.currentTransaction();
  }

  /**
@@ -244,8 +243,7 @@ public interface Transaction extends AutoCloseable {
   *
   *   // assume Customer has L2 bean caching enabled ...
   *
-   *   Transaction transaction = Ebean.beginTransaction();
-   *   try {
+   *   try (Transaction transaction = DB.beginTransaction()) {
   *
   *     // this uses L2 bean cache as the transaction
   *     // ... is considered "query only" at this point
@@ -253,7 +251,7 @@ public interface Transaction extends AutoCloseable {
   *
   *     // transaction no longer "query only" once
   *     // ... a bean has been saved etc
-   *     Ebean.save(someBean);
+   *     someBean.save();
   *
   *     // will NOT use L2 bean cache as the transaction
   *     // ... is no longer considered "query only"
@@ -273,8 +271,7 @@ public interface Transaction extends AutoCloseable {
   *     Customer.find.byId(99); // skips l2 bean cache
   *
   *
-   *   } finally {
-   *     transaction.end();
+   *     transaction.commit();
   *   }
   *
   * }</pre>
@@ -290,36 +287,66 @@ public interface Transaction extends AutoCloseable {
  boolean isSkipCache();

  /**
-   * Turn on or off statement batching. Statement batching can be transparent
-   * for drivers and databases that support getGeneratedKeys. Otherwise you may
-   * wish to specifically control when batching is used via this method.
-   * <p>
-   * Refer to <code>java.sql.PreparedStatement.addBatch();</code>
-   * <p>
-   * Note that you may also wish to use the setPersistCascade method to stop
-   * save and delete cascade behaviour. You may do this to have full control
-   * over the order of execution rather than the normal cascading fashion.
-   * </p>
-   * <p>
-   * Note that the <em>execution order</em> in batch mode may be different from
-   * non batch mode execution order. Also note that <em>insert behaviour</em>
-   * may be different depending on the JDBC driver and its support for
-   * getGeneratedKeys. That is, for JDBC drivers that do not support
-   * getGeneratedKeys you may not get back the generated IDs (used for inserting
-   * associated detail beans etc).
-   * </p>
+   * Turn on or off use of JDBC statement batching.
   * <p>
   * Calls to save(), delete(), insert() and execute() all support batch
-   * processing. This includes normal beans, MapBean, CallableSql and UpdateSql.
+   * processing. This includes normal beans, CallableSql and UpdateSql.
   * </p>
+   *
+   * <pre>{@code
+   *
+   * try (Transaction transaction = database.beginTransaction()) {
+   *
+   *   // turn on JDBC batch
+   *   transaction.setBatchMode(true);
+   *
+   *   // tune the batch size
+   *   transaction.setBatchSize(50);
+   *
+   *   ...
+   *
+   *   transaction.commit();
+   * }
+   *
+   * }</pre>
+   *
+   * <h3>getGeneratedKeys</h3>
   * <p>
-   * The flushing of the batched statements is automatic but you can call
-   * batchFlush when you like. Note that flushing occurs when a query is
-   * executed or when you mix UpdateSql and CallableSql with save and delete of
+   * Often with large batch inserts we want to turn off getGeneratedKeys. We do
+   * this via {@link #setBatchGetGeneratedKeys(boolean)}.
+   * Also note that some JDBC drivers do not support getGeneratedKeys in JDBC batch mode.
+   * </p>
+   * <pre>{@code
+   *
+   * try (Transaction transaction = database.beginTransaction()) {
+   *
+   *   transaction.setBatchMode(true);
+   *   transaction.setBatchSize(100);
+   *   // insert but don't bother getting back the generated keys
+   *   transaction.setBatchGetGeneratedKeys(false);
+   *
+   *
+   *   // perform lots of inserts ...
+   *   ...
+   *
+   *   transaction.commit();
+   * }
+   *
+   * }</pre>
+   *
+   * <h3>Flush</h3>
+   * <p>
+   * The batch is automatically flushed when it hits the batch size and also when we
+   * execute queries or when we mix UpdateSql and CallableSql with save and delete of
   * beans.
   * </p>
   * <p>
-   * Example: batch processing executing every 3 rows
+   * We use {@link #flush()} to explicitly flush the batch and we can use
+   * {@link #setBatchFlushOnQuery(boolean)} and {@link #setBatchFlushOnMixed(boolean)}
+   * to control the automatic flushing behaviour.
+   * </p>
+   * <p>
+   * Example: batch processing of CallableSql executing every 10 rows
   * </p>
   *
   * <pre>{@code
@@ -334,24 +361,21 @@ public interface Transaction extends AutoCloseable {
   * CallableSql cs = new CallableSql(sql);
   * cs.registerOut(2, Types.INTEGER);
   *
-   * // (optional) inform eBean this stored procedure
+   * // (optional) inform Ebean this stored procedure
   * // inserts into a table called sp_test
   * cs.addModification("sp_test", true, false, false);
   *
-   * Transaction txn = ebeanServer.beginTransaction();
-   * txn.setBatchMode(true);
-   * txn.setBatchSize(3);
-   * try {
+   * try (Transaction txn = DB.beginTransaction()) {
+   *   txn.setBatchMode(true);
+   *   txn.setBatchSize(10);
+   *
   *   for (int i = 0; i < da.length;) {
   *     cs.setParameter(1, da[i]);
-   *     ebeanServer.execute(cs);
+   *     DB.execute(cs);
   *   }
   *
-   *   // NB: commit implicitly flushes
+   *   // Note: commit implicitly flushes
   *   txn.commit();
-   *
-   * } finally {
-   *   txn.end();
   * }
   *
   * }</pre>
@@ -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 {

@@ -41,7 +41,7 @@ package io.ebean;
 * <p>
 * <pre>{@code
 *
- * Update<Topic> update = Ebean.createUpdate(Topic.class, "incrementPostCount");
+ * Update<Topic> update = DB.createUpdate(Topic.class, "incrementPostCount");
 * update.setParameter("id", 1);
 * int rows = update.execute();
 *
@@ -12,8 +12,7 @@ package io.ebean;
 * <p>
 * <pre>{@code
 *
- *  int rows = ebeanServer
- *      .update(Customer.class)
+ *  int rows = DB.update(Customer.class)
 *      .set("status", Customer.Status.ACTIVE)
 *      .set("updtime", new Timestamp(System.currentTimeMillis()))
 *      .where()
@@ -39,8 +38,7 @@ package io.ebean;
 * <p>
 * <pre>{@code
 *
- *   int rows = ebeanServer
- *       .update(Customer.class)
+ *   int rows = DB.update(Customer.class)
 *       .set("status", Customer.Status.ACTIVE)
 *       .set("updtime", new Timestamp(System.currentTimeMillis()))
 *       .where()
@@ -73,8 +71,7 @@ public interface UpdateQuery<T> {
   * <p>
   * <pre>{@code
   *
-   *   int rows = ebeanServer
-   *      .update(Customer.class)
+   *   int rows = DB.update(Customer.class)
   *      .set("status", Customer.Status.ACTIVE)
   *      .set("updtime", new Timestamp(System.currentTimeMillis()))
   *      .where()
@@ -93,8 +90,7 @@ public interface UpdateQuery<T> {
   * <p>
   * <pre>{@code
   *
-   *   int rows = ebeanServer
-   *      .update(Customer.class)
+   *   int rows = DB.update(Customer.class)
   *      .setNull("notes")
   *      .where()
   *      .gt("id", 1000)
@@ -114,8 +110,7 @@ public interface UpdateQuery<T> {
   * <p>
   * <pre>{@code
   *
-   *   int rows = ebeanServer
-   *      .update(Customer.class)
+   *   int rows = DB.update(Customer.class)
   *      .setRaw("status = coalesce(status, 'A')")
   *      .where()
   *      .gt("id", 1000)
@@ -134,8 +129,7 @@ public interface UpdateQuery<T> {
   * </p>
   * <pre>{@code
   *
-   *   int rows = ebeanServer
-   *      .update(Customer.class)
+   *   int rows = DB.update(Customer.class)
   *      .setRaw("status = coalesce(status, ?)", Customer.Status.ACTIVE)
   *      .where()
   *      .gt("id", 1000)
@@ -154,9 +148,19 @@ public interface UpdateQuery<T> {
   */
  UpdateQuery<T> setProfileLocation(ProfileLocation profileLocation);

+  /**
+   * Set the label on the update query.
+   */
+  UpdateQuery<T> setLabel(String label);
+
  /**
   * Return the query expression list to add predicates to.
   */
  ExpressionList<T> where();

+  /**
+   * Execute the update returning the number of rows updated.
+   */
+  int update();
+
 }
@@ -1,5 +1,6 @@
 package io.ebean;

+import io.ebean.service.SpiFetchGroupQuery;
 import io.ebean.service.SpiFetchGroupService;
 import io.ebean.service.SpiProfileLocationFactory;
 import io.ebean.service.SpiRawSqlService;
@@ -19,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);
  }

  /**
@@ -71,4 +66,11 @@ class XServiceProvider {
  static <T> FetchGroupBuilder<T> fetchGroupOf(Class<T> cls) {
    return fetchGroupService.of(cls);
  }
+
+  /**
+   * Return the FetchGroup Query for building fetch groups via query beans.
+   */
+  static <T> SpiFetchGroupQuery<T> fetchGroupQueryFor(Class<T> cls) {
+    return fetchGroupService.queryFor(cls);
+  }
 }
@@ -9,7 +9,7 @@ package io.ebean.bean;
 public interface BeanCollectionLoader {

  /**
-   * Return the name of the associated EbeanServer.
+   * Return the name of the associated Database.
   */
  String getName();

@@ -9,7 +9,7 @@ package io.ebean.bean;
 public interface BeanLoader {

  /**
-   * Return the name of the associated EbeanServer.
+   * Return the name of the associated Database.
   */
  String getName();

@@ -0,0 +1,22 @@
+package io.ebean.bean;
+
+/**
+ * A call origin for query execution profiling to collect graph use (for query tuning).
+ */
+public interface CallOrigin {
+
+  /**
+   * Return the top element. Typically the top stack element with class and line.
+   */
+  String getTopElement();
+
+  /**
+   * Return the full description of the call origin.
+   */
+  String getFullDescription();
+
+  /**
+   * Compute and return an origin key based on the query hash.
+   */
+  String getOriginKey(int queryHash);
+}
@@ -3,6 +3,8 @@ package io.ebean.bean;
 import java.io.Serializable;
 import java.util.Arrays;

+import static io.ebean.util.EncodeB64.enc;
+
 /**
 * Represent the call stack (stack trace elements).
 * <p>
@@ -17,15 +19,15 @@ import java.util.Arrays;
 * Note the call stack is trimmed to remove the common ebean internal elements.
 * </p>
 */
-public final class CallStack implements Serializable {
+public final class CallStack implements Serializable, CallOrigin {

  private static final long serialVersionUID = -8590644046907438579L;

+  private static final String NEWLINE = "\n";
+
  private final String zeroHash;
  private final String pathHash;
-
  private final StackTraceElement[] callStack;
-
  private final int hc;

  public CallStack(StackTraceElement[] callStack, int zeroHash, int pathHash) {
@@ -37,12 +39,17 @@ public final class CallStack implements Serializable {

  private int computeHashCode() {
    int hc = 0;
-    for (StackTraceElement aCallStack : callStack) {
-      hc = 92821 * hc + aCallStack.hashCode();
+    for (StackTraceElement element : callStack) {
+      hc = 92821 * hc + element.hashCode();
    }
    return hc;
  }

+  @Override
+  public String toString() {
+    return zeroHash + ":" + pathHash + ":" + callStack[0];
+  }
+
  @Override
  public int hashCode() {
    return hc;
@@ -63,73 +70,29 @@ public final class CallStack implements Serializable {
  /**
   * Return the first element of the call stack.
   */
-  public StackTraceElement getFirstStackTraceElement() {
-    return callStack[0];
-  }
-
-  /**
-   * Return the call stack.
-   */
-  public StackTraceElement[] getCallStack() {
-    return callStack;
-  }
-
-  /**
-   * Return the hash for the first stack element.
-   */
-  public String getZeroHash() {
-    return zeroHash;
-  }
-
-  /**
-   * Return the hash for the stack elements (excluding first stack element).
-   */
-  public String getPathHash() {
-    return pathHash;
-  }
-
  @Override
-  public String toString() {
-    return zeroHash + ":" + pathHash + ":" + callStack[0];
+  public String getTopElement() {
+    return callStack[0].toString();
  }

  /**
   * Return the call stack lines appended with the given newLine string.
   */
-  public String description(String newLine) {
+  @Override
+  public String getFullDescription() {
    StringBuilder sb = new StringBuilder(400);
-    for (StackTraceElement aCallStack : callStack) {
-      sb.append(aCallStack.toString()).append(newLine);
+    for (int i = 0; i < callStack.length; i++) {
+      if (i > 0) {
+        sb.append(NEWLINE);
+      }
+      sb.append(callStack[i].toString());
    }
    return sb.toString();
  }

+  @Override
  public String getOriginKey(int queryHash) {
    return enc(queryHash) + "." + zeroHash + "." + pathHash;
  }

-  private static final int radix = 1 << 6;
-  private static final int mask = radix - 1;
-
-  /**
-   * Convert the integer to unsigned base 64.
-   */
-  public static String enc(int i) {
-    char[] buf = new char[32];
-    int charPos = 32;
-    do {
-      buf[--charPos] = intToBase64[i & mask];
-      i >>>= 6;
-    } while (i != 0);
-
-    return new String(buf, charPos, (32 - charPos));
-  }
-
-  private static final char intToBase64[] = {
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-    'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-    'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
-    'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '_'
-  };
 }
@@ -16,12 +16,16 @@ public interface EntityBean extends Serializable {
  /**
   * Return all the property names in defined order.
   */
-  String[] _ebean_getPropertyNames();
+  default String[] _ebean_getPropertyNames() {
+    throw new NotEnhancedException();
+  }

  /**
   * Return the property name at the given position.
   */
-  String _ebean_getPropertyName(int pos);
+  default String _ebean_getPropertyName(int pos) {
+    throw new NotEnhancedException();
+  }

  /**
   * Return the enhancement marker value.
@@ -30,28 +34,38 @@ public interface EntityBean extends Serializable {
   * entity classes are enhanced (specifically not just a super class).
   * </p>
   */
-  String _ebean_getMarker();
+  default String _ebean_getMarker() {
+    throw new NotEnhancedException();
+  }

  /**
   * Create and return a new entity bean instance.
   */
-  Object _ebean_newInstance();
+  default Object _ebean_newInstance() {
+    throw new NotEnhancedException();
+  }

  /**
   * Generated method that sets the loaded state on all the embedded beans on
   * this entity bean by using EntityBeanIntercept.setEmbeddedLoaded(Object o);
   */
-  void _ebean_setEmbeddedLoaded();
+  default void _ebean_setEmbeddedLoaded() {
+    throw new NotEnhancedException();
+  }

  /**
   * Return true if any embedded beans are new or dirty.
   */
-  boolean _ebean_isEmbeddedNewOrDirty();
+  default boolean _ebean_isEmbeddedNewOrDirty() {
+    throw new NotEnhancedException();
+  }

  /**
   * Return the intercept for this object.
   */
-  EntityBeanIntercept _ebean_getIntercept();
+  default EntityBeanIntercept _ebean_getIntercept() {
+    throw new NotEnhancedException();
+  }

  /**
   * Similar to _ebean_getIntercept() except it checks to see if the intercept
@@ -66,7 +80,9 @@ public interface EntityBean extends Serializable {
   * frameworks that can't take into account our ebean fields.
   * </p>
   */
-  EntityBeanIntercept _ebean_intercept();
+  default EntityBeanIntercept _ebean_intercept() {
+    throw new NotEnhancedException();
+  }

  /**
   * Set the value of a field of an entity bean of this type.
@@ -75,12 +91,16 @@ public interface EntityBean extends Serializable {
   * on entity beans. That means lazy loading and oldValues creation.
   * </p>
   */
-  void _ebean_setField(int fieldIndex, Object value);
+  default void _ebean_setField(int fieldIndex, Object value) {
+    throw new NotEnhancedException();
+  }

  /**
   * Set the field value with interception.
   */
-  void _ebean_setFieldIntercept(int fieldIndex, Object value);
+  default void _ebean_setFieldIntercept(int fieldIndex, Object value) {
+    throw new NotEnhancedException();
+  }

  /**
   * Return the value of a field from an entity bean of this type.
@@ -89,11 +109,15 @@ public interface EntityBean extends Serializable {
   * on entity beans. That means lazy loading.
   * </p>
   */
-  Object _ebean_getField(int fieldIndex);
+  default Object _ebean_getField(int fieldIndex) {
+    throw new NotEnhancedException();
+  }

  /**
   * Return the field value with interception.
   */
-  Object _ebean_getFieldIntercept(int fieldIndex);
+  default Object _ebean_getFieldIntercept(int fieldIndex) {
+    throw new NotEnhancedException();
+  }

 }
@@ -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;
@@ -95,25 +96,29 @@ public final class EntityBeanIntercept implements Serializable {
  private final byte[] flags;

  private boolean fullyLoadedBean;
-
+  private boolean loadedFromCache;
  private Object[] origValues;
-
+  private Exception[] loadErrors;
  private int lazyLoadProperty = -1;
-
  private Object ownerId;
  private int sortOrder;

  /**
   * Create a intercept with a given entity.
-   * <p>
-   * Refer to agent ProxyConstructor.
-   * </p>
   */
  public EntityBeanIntercept(Object ownerBean) {
    this.owner = (EntityBean) ownerBean;
    this.flags = new byte[owner._ebean_getPropertyNames().length];
  }

+  /**
+   * EXPERIMENTAL - Constructor only for use by serialization frameworks.
+   */
+  public EntityBeanIntercept() {
+    this.owner = null;
+    this.flags = null;
+  }
+
  /**
   * Return the 'owning' entity bean.
   */
@@ -301,6 +306,22 @@ public final class EntityBeanIntercept implements Serializable {
    }
  }

+  /**
+   * Set true when the bean has been loaded from L2 bean cache.
+   * The effect of this is that we should skip the cache if there
+   * is subsequent lazy loading (bean cache partially populated).
+   */
+  public void setLoadedFromCache(boolean loadedFromCache) {
+    this.loadedFromCache = loadedFromCache;
+  }
+
+  /**
+   * Return true if this bean was loaded from L2 bean cache.
+   */
+  public boolean isLoadedFromCache() {
+    return loadedFromCache;
+  }
+
  /**
   * Return true if the bean should be treated as readOnly. If a setter method
   * is called when it is readOnly an Exception is thrown.
@@ -770,7 +791,7 @@ public final class EntityBeanIntercept implements Serializable {
  }

  public boolean[] getLoaded() {
-    boolean[] ret= new boolean[flags.length];
+    boolean[] ret = new boolean[flags.length];
    for (int i = 0; i < ret.length; i++) {
      ret[i] = (flags[i] & FLAG_LOADED_PROP) != 0;
    }
@@ -798,14 +819,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;
      }
    }
@@ -1115,4 +1136,36 @@ public final class EntityBeanIntercept implements Serializable {
  public void setSortOrder(int sortOrder) {
    this.sortOrder = sortOrder;
  }
+
+  /**
+   * Set the load error that happened on this property.
+   */
+  public void setLoadError(int propertyIndex, Exception t) {
+    if (loadErrors == null) {
+      loadErrors = new Exception[owner._ebean_getPropertyNames().length];
+    }
+    loadErrors[propertyIndex] = t;
+    flags[propertyIndex] |= FLAG_LOADED_PROP;
+  }
+
+  /**
+   * Returns the loadErrors.
+   */
+  public Map<String, Exception> getLoadErrors() {
+    if (loadErrors == null) {
+      return null;
+    }
+    Map<String, Exception> ret = null;
+    int len = getPropertyLength();
+    for (int i = 0; i < len; i++) {
+      Exception loadError = loadErrors[i];
+      if (loadError != null) {
+        if (ret == null) {
+          ret = new LinkedHashMap<>();
+        }
+        ret.put(getProperty(i), loadError);
+      }
+    }
+    return ret;
+  }
 }
@@ -0,0 +1,12 @@
+package io.ebean.bean;
+
+/**
+ * This exception is thrown, when the default implementation of EntityBean is not or not properly overwritten by enhancer.
+ *
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class NotEnhancedException extends RuntimeException {
+  private static final long serialVersionUID = 1L;
+
+}
@@ -1,6 +1,7 @@
 package io.ebean.bean;

 import java.io.Serializable;
+import java.util.Objects;

 /**
 * Identifies a unique node of an object graph.
@@ -85,8 +86,7 @@ public final class ObjectGraphNode implements Serializable {
    }

    ObjectGraphNode e = (ObjectGraphNode) obj;
-    //noinspection StringEquality
-    return ((e.path == path) || (e.path != null && e.path.equals(path)))
+    return (Objects.equals(e.path, path))
      && e.originQueryPoint.equals(originQueryPoint);
  }
 }
@@ -16,7 +16,7 @@ public final class ObjectGraphOrigin implements Serializable {

  private static final long serialVersionUID = 410937765287968708L;

-  private final CallStack callStack;
+  private final CallOrigin callOrigin;

  private final String beanType;

@@ -24,11 +24,11 @@ public final class ObjectGraphOrigin implements Serializable {

  private final String key;

-  public ObjectGraphOrigin(int queryHash, CallStack callStack, String beanType) {
-    this.callStack = callStack;
+  public ObjectGraphOrigin(int queryHash, CallOrigin callOrigin, String beanType) {
+    this.callOrigin = callOrigin;
    this.beanType = beanType;
    this.queryHash = queryHash;
-    this.key = callStack.getOriginKey(queryHash);
+    this.key = callOrigin.getOriginKey(queryHash);
  }

  /**
@@ -49,22 +49,22 @@ public final class ObjectGraphOrigin implements Serializable {
  /**
   * The call stack involved.
   */
-  public CallStack getCallStack() {
-    return callStack;
+  public CallOrigin getCallOrigin() {
+    return callOrigin;
  }

-  public String getFirstStackElement() {
-    return callStack.getFirstStackTraceElement().toString();
+  public String getTopElement() {
+    return callOrigin.getTopElement();
  }

  @Override
  public String toString() {
-    return "key[" + key + "] type[" + beanType + "] " + callStack.getFirstStackTraceElement() + " ";
+    return "key[" + key + "] type[" + beanType + "] " + callOrigin.getTopElement();
  }

  @Override
  public int hashCode() {
-    int hc = 92821 * callStack.hashCode();
+    int hc = 92821 * callOrigin.hashCode();
    hc = 92821 * hc + beanType.hashCode();
    hc = 92821 * hc + queryHash;
    return hc;
@@ -82,6 +82,6 @@ public final class ObjectGraphOrigin implements Serializable {
    ObjectGraphOrigin e = (ObjectGraphOrigin) obj;
    return e.queryHash == queryHash
      && e.beanType.equals(beanType)
-      && e.callStack.equals(callStack);
+      && e.callOrigin.equals(callOrigin);
  }
 }
@@ -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,5 +1,7 @@
 package io.ebean.cache;

+import io.ebean.meta.MetricVisitor;
+
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
@@ -79,4 +81,11 @@ public interface ServerCache {
   * @param reset if true the statistics are reset.
   */
  ServerCacheStatistics getStatistics(boolean reset);
+
+  /**
+   * Visit the metrics for the cache.
+   */
+  default void visit(MetricVisitor visitor) {
+    // do nothing by default
+  }
 }
@@ -9,13 +9,15 @@ public class ServerCacheConfig {

  private final ServerCacheType type;
  private final String cacheKey;
+  private final String shortName;
  private final ServerCacheOptions cacheOptions;
  private final CurrentTenantProvider tenantProvider;
  private final QueryCacheEntryValidate queryCacheEntryValidate;

-  public ServerCacheConfig(ServerCacheType type, String cacheKey, ServerCacheOptions cacheOptions, CurrentTenantProvider tenantProvider, QueryCacheEntryValidate queryCacheEntryValidate) {
+  public ServerCacheConfig(ServerCacheType type, String cacheKey, String shortName, ServerCacheOptions cacheOptions, CurrentTenantProvider tenantProvider, QueryCacheEntryValidate queryCacheEntryValidate) {
    this.type = type;
    this.cacheKey = cacheKey;
+    this.shortName = shortName;
    this.cacheOptions = cacheOptions;
    this.tenantProvider = tenantProvider;
    this.queryCacheEntryValidate = queryCacheEntryValidate;
@@ -35,6 +37,13 @@ public class ServerCacheConfig {
    return cacheKey;
  }

+  /**
+   * Return the short name for the cache.
+   */
+  public String getShortName() {
+    return shortName;
+  }
+
  /**
   * Return the tuning options.
   */
@@ -1,10 +1,19 @@
 package io.ebean.cache;

+import io.ebean.meta.MetricVisitor;
+
 /**
 * Defines method for constructing caches for beans and queries.
 */
 public interface ServerCacheFactory {

+  /**
+   * Visit the metrics for the cache.
+   */
+  default void visit(MetricVisitor visitor) {
+    // do nothing by default
+  }
+
  /**
   * Create the cache for the given type with options.
   */
@@ -1,10 +1,19 @@
 package io.ebean.cache;

+import io.ebean.meta.MetricVisitor;
+
+import java.util.List;
+
 /**
 * The cache service for server side caching of beans and query results.
 */
 public interface ServerCacheManager {

+  /**
+   * Visit the metrics for all the server caches.
+   */
+  void visitMetrics(MetricVisitor visitor);
+
  /**
   * Return true if the L2 caching is local.
   * <p>
@@ -14,6 +23,31 @@ public interface ServerCacheManager {
   */
  boolean isLocalL2Caching();

+  /**
+   * Return all the cache regions.
+   */
+  List<ServerCacheRegion> allRegions();
+
+  /**
+   * Set the regions that are enabled.
+   * <p>
+   * Typically this is set on startup and at runtime (via dynamic configuration).
+   * </p>
+   *
+   * @param regions A region name or comma delimited list of region names.
+   */
+  void setEnabledRegions(String regions);
+
+  /**
+   * Enable or disable all the cache regions.
+   */
+  void setAllRegionsEnabled(boolean enabled);
+
+  /**
+   * Return the cache region by name. Typically to enable or disable the region.
+   */
+  ServerCacheRegion getRegion(String name);
+
  /**
   * Return the cache for mapping natural keys to id values.
   */
@@ -46,7 +80,7 @@ public interface ServerCacheManager {

  /**
   * Clear all the local caches.
-   *
+   * <p>
   * This is used when the L2 Cache is based on clustered near-caches (Like Ebean-K8s-L2Cache).
   * It is not used when the L2 cache is a distributed cache such as HazelCast or Ignite etc.
   */
@@ -54,7 +88,7 @@ public interface ServerCacheManager {

  /**
   * Clear the local caches for this bean type.
-   *
+   * <p>
   * This is used when the L2 Cache is based on clustered near-caches (Like Ebean-K8s-L2Cache).
   * It is not used when the L2 cache is a distributed cache such as HazelCast or Ignite etc.
   */
@@ -10,17 +10,15 @@ import java.util.Set;
 */
 public class ServerCacheNotification {

-  private final long modifyTimestamp;
-
  private final Set<String> dependentTables;

-  public ServerCacheNotification(long modifyTimestamp, Set<String> dependentTables) {
-    this.modifyTimestamp = modifyTimestamp;
+  public ServerCacheNotification(Set<String> dependentTables) {
    this.dependentTables = dependentTables;
  }

-  public long getModifyTimestamp() {
-    return modifyTimestamp;
+  @Override
+  public String toString() {
+    return "tables:" + dependentTables;
  }

  public Set<String> getDependentTables() {
@@ -12,6 +12,7 @@ public class ServerCacheOptions {
  private int maxIdleSecs;
  private int maxSecsToLive;
  private int trimFrequency;
+  private boolean nearCache;

  /**
   * Construct with no set options.
@@ -40,6 +41,14 @@ public class ServerCacheOptions {
    this.trimFrequency = cacheTuning.trimFrequency();
  }

+  /**
+   * Create with nearCache option.
+   */
+  public ServerCacheOptions(boolean nearCache, CacheBeanTuning tuning) {
+    this(tuning);
+    this.nearCache = nearCache;
+  }
+
  /**
   * Apply any settings from the default settings that have not already been
   * specifically set.
@@ -70,9 +79,33 @@ public class ServerCacheOptions {
    copy.maxIdleSecs = maxIdleSecs;
    copy.maxSecsToLive = maxSecsToLive;
    copy.trimFrequency = trimFrequency;
+    copy.nearCache = this.nearCache;
    return copy;
  }

+  /**
+   * Return a copy of this object with nearCache option.
+   */
+  public ServerCacheOptions copy(boolean nearCache) {
+    ServerCacheOptions copy = copy();
+    copy.nearCache = nearCache;
+    return copy;
+  }
+
+  /**
+   * Return true if nearCache was explicitly turned on.
+   */
+  public boolean isNearCache() {
+    return nearCache;
+  }
+
+  /**
+   * Turn on nearCache option.
+   */
+  public void setNearCache(boolean nearCache) {
+    this.nearCache = nearCache;
+  }
+
  /**
   * Return the maximum cache size.
   */
@@ -0,0 +1,23 @@
+package io.ebean.cache;
+
+/**
+ * Cache region can be enabled independently.
+ */
+public interface ServerCacheRegion {
+
+  /**
+   * Return the region name.
+   */
+  String getName();
+
+  /**
+   * Return true if the cache region is enabled.
+   */
+  boolean isEnabled();
+
+  /**
+   * Set to true to enable the cache region.
+   */
+  void setEnabled(boolean enabled);
+
+}
@@ -21,23 +21,13 @@ public class ServerCacheStatistics {

  protected long missCount;

-  protected long insertCount;
-
-  protected long updateCount;
+  protected long putCount;

  protected long removeCount;

  protected long clearCount;

-  protected long evictionRunCount;
-
-  protected long evictionRunMicros;
-
-  protected long evictByIdle;
-
-  protected long evictByTTL;
-
-  protected long evictByLRU;
+  protected long evictCount;

  @Override
  public String toString() {
@@ -49,15 +39,10 @@ public class ServerCacheStatistics {
    sb.append(" hitRatio:").append(getHitRatio());
    sb.append(" hit:").append(hitCount);
    sb.append(" miss:").append(missCount);
-    sb.append(" insert:").append(insertCount);
-    sb.append(" update:").append(updateCount);
+    sb.append(" put:").append(putCount);
    sb.append(" remove:").append(removeCount);
    sb.append(" clear:").append(clearCount);
-    sb.append(" evictByIdle:").append(evictByIdle);
-    sb.append(" evictByTTL:").append(evictByTTL);
-    sb.append(" evictByLRU:").append(evictByLRU);
-    sb.append(" evictionRunCount:").append(evictionRunCount);
-    sb.append(" evictionRunMicros:").append(evictionRunMicros);
+    sb.append(" evict:").append(evictCount);
    return sb.toString();
  }

@@ -153,29 +138,15 @@ public class ServerCacheStatistics {
  /**
   * Set the put insert count.
   */
-  public void setInsertCount(long insertCount) {
-    this.insertCount = insertCount;
+  public void setPutCount(long putCount) {
+    this.putCount = putCount;
  }

  /**
   * Return the put insert count.
   */
-  public long getInsertCount() {
-    return insertCount;
-  }
-
-  /**
-   * Set the put update count.
-   */
-  public void setUpdateCount(long updateCount) {
-    this.updateCount = updateCount;
-  }
-
-  /**
-   * Return the put update count.
-   */
-  public long getUpdateCount() {
-    return updateCount;
+  public long getPutCount() {
+    return putCount;
  }

  /**
@@ -206,73 +177,18 @@ public class ServerCacheStatistics {
    return clearCount;
  }

-  /**
-   * Set the eviction run count.
-   */
-  public void setEvictionRunCount(long evictCount) {
-    this.evictionRunCount = evictCount;
-  }
-
-  /**
-   * Return the eviction run count.
-   */
-  public long getEvictionRunCount() {
-    return evictionRunCount;
-  }
-
-  /**
-   * Set the eviction run time in micros.
-   */
-  public void setEvictionRunMicros(long evictionRunMicros) {
-    this.evictionRunMicros = evictionRunMicros;
-  }
-
-  /**
-   * Return the eviction run time in micros.
-   */
-  public long getEvictionRunMicros() {
-    return evictionRunMicros;
-  }
-
  /**
   * Set the count of entries evicted due to idle time.
   */
-  public void setEvictByIdle(long evictByIdle) {
-    this.evictByIdle = evictByIdle;
+  public void setEvictCount(long evictCount) {
+    this.evictCount = evictCount;
  }

  /**
   * Return the count of entries evicted due to idle time.
   */
-  public long getEvictByIdle() {
-    return evictByIdle;
+  public long getEvictCount() {
+    return evictCount;
  }

-  /**
-   * Set the count of entries evicted due to time to live.
-   */
-  public void setEvictByTTL(long evictByTTL) {
-    this.evictByTTL = evictByTTL;
-  }
-
-  /**
-   * Return the count of entries evicted due to time to live.
-   */
-  public long getEvictByTTL() {
-    return evictByTTL;
-  }
-
-  /**
-   * Set the count of entries evicted due to time least recently used.
-   */
-  public void setEvictByLRU(long evictByLRU) {
-    this.evictByLRU = evictByLRU;
-  }
-
-  /**
-   * Return the count of entries evicted due to time least recently used.
-   */
-  public long getEvictByLRU() {
-    return evictByLRU;
-  }
 }
@@ -25,7 +25,7 @@ public enum ServerCacheType {
   */
  QUERY("_Q");

-  private String code;
+  private final String code;

  ServerCacheType(String code) {
    this.code = code;
@@ -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;
@@ -20,7 +20,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
  protected boolean disableLazyLoad;

  /**
-   * The EbeanServer this is associated with. (used for lazy fetch).
+   * The Database this is associated with. (used for lazy fetch).
   */
  protected transient BeanCollectionLoader loader;

@@ -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();
@@ -219,7 +219,6 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {

  /**
   * Copies all relevant properties for a clone. See {@link #getShallowCopy()}
-   * @param other
   */
  protected void setFromOriginal(AbstractBeanCollection<E> other) {
    this.disableLazyLoad = other.disableLazyLoad;
@@ -237,7 +237,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
  }

  @Override
-  @SuppressWarnings({"unchecked", "rawtypes"})
+  @SuppressWarnings({"unchecked"})
  public Set<Entry<K, E>> entrySet() {
    init();
    if (isReadOnly()) {
@@ -83,10 +83,13 @@ public abstract class AbstractNamingConvention implements NamingConvention {
  }

  @Override
-  public String getSequenceName(String tableName, String pkColumn) {
-    String s = TABLE_REPLACE.matcher(sequenceFormat).replaceAll(Matcher.quoteReplacement(tableName));
+  public String getSequenceName(String rawTableName, String pkColumn) {
+    final String tableNameUnquoted = databasePlatform.unQuote(rawTableName);
+    String s = TABLE_REPLACE.matcher(sequenceFormat).replaceAll(Matcher.quoteReplacement(tableNameUnquoted));
    if (pkColumn == null) {
      pkColumn = "";
+    } else {
+      pkColumn = databasePlatform.unQuote(pkColumn);
    }
    return COLUMN_REPLACE.matcher(s).replaceAll(Matcher.quoteReplacement(pkColumn));
  }
@@ -1,7 +1,7 @@
 package io.ebean.config;

 /**
- * Used to provide some automatic configuration early in the creation of an EbeanServer.
+ * Used to provide some automatic configuration early in the creation of a Database.
 */
 public interface AutoConfigure {

@@ -1,11 +1,11 @@
 package io.ebean.config;

 /**
- * Defines the AutoTune behaviour for a EbeanServer.
+ * Defines the AutoTune behaviour for a Database.
 */
 public class AutoTuneConfig {

-  private AutoTuneMode mode = AutoTuneMode.DEFAULT_ON;
+  private AutoTuneMode mode = AutoTuneMode.DEFAULT_OFF;

  private String queryTuningFile = "ebean-autotune.xml";

@@ -3,7 +3,7 @@ package io.ebean.config;
 import java.util.Properties;

 /**
- * Configuration for the container that holds the EbeanServer instances.
+ * Configuration for the container that holds the Database instances.
 * <p>
 * Provides configuration for cluster communication (if clustering is used). The cluster communication is
 * used to invalidate appropriate parts of the L2 cache across the cluster.
@@ -0,0 +1,44 @@
+package io.ebean.config;
+
+import io.ebean.DatabaseFactory;
+
+/**
+ * The configuration used for creating a Database.
+ * <p>
+ * Used to programmatically construct an Database and optionally register it
+ * with the DB singleton.
+ * </p>
+ * <p>
+ * If you just use DB thout this programmatic configuration Ebean will read
+ * the application.properties file and take the configuration from there. This usually
+ * includes searching the class path and automatically registering any entity
+ * classes and listeners etc.
+ * </p>
+ * <pre>{@code
+ *
+ * DatabaseConfig config = new DatabaseConfig();
+ *
+ * // read the ebean.properties and load
+ * // those settings into this serverConfig object
+ * config.loadFromProperties();
+ *
+ * // explicitly register the entity beans to avoid classpath scanning
+ * config.addClass(Customer.class);
+ * config.addClass(User.class);
+ *
+ * Database db = DatabaseFactory.create(config);
+ *
+ * }</pre>
+ *
+ * <p>
+ * Note that ServerConfigProvider provides a standard Java ServiceLoader mechanism that can
+ * be used to apply configuration to the DatabaseConfig.
+ * </p>
+ *
+ * @author emcgreal
+ * @author rbygrave
+ * @see DatabaseFactory
+ */
+public class DatabaseConfig extends ServerConfig {
+
+}
@@ -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.
   */
@@ -140,7 +140,7 @@ public class DbMigrationConfig {
   * <p>
   * The default of "dbmigration" is reasonable in most cases. You may look to set this
   * to be something like "dbmigration/myapp" where myapp gives it a unique resource path
-   * in the case there are multiple EbeanServer applications in the single classpath.
+   * in the case there are multiple Database applications in the single classpath.
   * </p>
   */
  public void setMigrationPath(String migrationPath) {
@@ -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
   */
@@ -5,6 +5,22 @@ package io.ebean.config;
 */
 public abstract class JsonConfig {

+  /**
+   * Defined the format used for Date types.
+   */
+  public enum Date {
+
+    /**
+     * Format as epoch millis.
+     */
+    MILLIS,
+
+    /**
+     * Format as ISO-8601 date format.
+     */
+    ISO8601
+  }
+
  /**
   * Defined the format used for DateTime types.
   */
@@ -36,8 +36,7 @@ public class MatchingNamingConvention extends AbstractNamingConvention {

  @Override
  public TableName getTableNameByConvention(Class<?> beanClass) {
-
-    return new TableName(getCatalog(), getSchema(), beanClass.getSimpleName());
+    return new TableName(quoteIdentifiers(getCatalog()), quoteIdentifiers(getSchema()), quoteIdentifiers(beanClass.getSimpleName()));
  }

  @Override
@@ -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).
   */
@@ -27,11 +34,6 @@ public class PlatformConfig {
   */
  private String databaseBooleanFalse;

-  /**
-   * For DB's using sequences this is the number of sequence values prefetched.
-   */
-  private int databaseSequenceBatchSize = 20;
-
  /**
   * Set for DB's that support both Sequence and Identity (and the default choice is not desired).
   */
@@ -47,6 +49,13 @@ public class PlatformConfig {
   */
  private DbUuid dbUuid = DbUuid.AUTO_VARCHAR;

+  /**
+   * Set to true to force InetAddress to map to Varchar (for Postgres rather than INET)
+   */
+  private boolean databaseInetAddressVarchar;
+
+  private boolean caseSensitiveCollation = true;
+
  /**
   * Modify the default mapping of standard types such as default precision for DECIMAL etc.
   */
@@ -56,7 +65,7 @@ public class PlatformConfig {
   * Construct with defaults.
   */
  public PlatformConfig() {
-
+    this.constraintNaming = new DbConstraintNaming();
  }

  /**
@@ -65,10 +74,26 @@ public class PlatformConfig {
  public PlatformConfig(PlatformConfig platformConfig) {
    this.databaseBooleanFalse = platformConfig.databaseBooleanFalse;
    this.databaseBooleanTrue = platformConfig.databaseBooleanTrue;
-    this.databaseSequenceBatchSize = platformConfig.databaseSequenceBatchSize;
    this.idType = platformConfig.idType;
    this.geometrySRID = platformConfig.geometrySRID;
    this.dbUuid = platformConfig.dbUuid;
+    this.caseSensitiveCollation = platformConfig.caseSensitiveCollation;
+    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;
  }

  /**
@@ -83,6 +108,23 @@ public class PlatformConfig {
   */
  public void setAllQuotedIdentifiers(boolean allQuotedIdentifiers) {
    this.allQuotedIdentifiers = allQuotedIdentifiers;
+    if (!customConstraintNaming) {
+      this.constraintNaming = new DbConstraintNaming(!allQuotedIdentifiers);
+    }
+  }
+
+  /**
+   * Return true if the collation is case sensitive.
+   */
+  public boolean isCaseSensitiveCollation() {
+    return caseSensitiveCollation;
+  }
+
+  /**
+   * Set to false to indicate that the collation is case insensitive.
+   */
+  public void setCaseSensitiveCollation(boolean caseSensitiveCollation) {
+    this.caseSensitiveCollation = caseSensitiveCollation;
  }

  /**
@@ -125,20 +167,6 @@ public class PlatformConfig {
    this.databaseBooleanFalse = databaseBooleanFalse;
  }

-  /**
-   * Return the number of DB sequence values that should be preallocated.
-   */
-  public int getDatabaseSequenceBatchSize() {
-    return databaseSequenceBatchSize;
-  }
-
-  /**
-   * Set the number of DB sequence values that should be preallocated.
-   */
-  public void setDatabaseSequenceBatchSize(int databaseSequenceBatchSize) {
-    this.databaseSequenceBatchSize = databaseSequenceBatchSize;
-  }
-
  /**
   * Return the Geometry SRID.
   */
@@ -181,6 +209,20 @@ public class PlatformConfig {
    this.idType = idType;
  }

+  /**
+   * Return true if InetAddress should map to varchar column (rather than Postgres INET).
+   */
+  public boolean isDatabaseInetAddressVarchar() {
+    return databaseInetAddressVarchar;
+  }
+
+  /**
+   * Set to true to force InetAddress to map to varchar column.
+   */
+  public void setDatabaseInetAddressVarchar(boolean databaseInetAddressVarchar) {
+    this.databaseInetAddressVarchar = databaseInetAddressVarchar;
+  }
+
  /**
   * Add a custom type mapping.
   * <p>
@@ -232,9 +274,10 @@ public class PlatformConfig {
  public void loadSettings(PropertiesWrapper p) {

    idType = p.getEnum(IdType.class, "idType", idType);
-    databaseSequenceBatchSize = p.getInt("databaseSequenceBatchSize", databaseSequenceBatchSize);
    databaseBooleanTrue = p.get("databaseBooleanTrue", databaseBooleanTrue);
    databaseBooleanFalse = p.get("databaseBooleanFalse", databaseBooleanFalse);
+    databaseInetAddressVarchar = p.getBoolean("databaseInetAddressVarchar", databaseInetAddressVarchar);
+    caseSensitiveCollation = p.getBoolean("caseSensitiveCollation", caseSensitiveCollation);

    DbUuid dbUuid = p.getEnum(DbUuid.class, "dbuuid", null);
    if (dbUuid != null) {
@@ -1,7 +1,8 @@
 package io.ebean.config;

 import com.fasterxml.jackson.core.JsonFactory;
-import io.ebean.EbeanServerFactory;
+import io.avaje.config.Config;
+import io.ebean.DatabaseFactory;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Query;
 import io.ebean.Transaction;
@@ -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,10 +28,10 @@ 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;

+import javax.persistence.EnumType;
 import javax.sql.DataSource;
 import java.time.Clock;
 import java.util.ArrayList;
@@ -44,30 +44,30 @@ import java.util.Properties;
 import java.util.ServiceLoader;

 /**
- * The configuration used for creating a EbeanServer.
+ * The configuration used for creating a Database.
 * <p>
- * Used to programmatically construct an EbeanServer and optionally register it
- * with the Ebean singleton.
+ * Used to programmatically construct a Database and optionally register it
+ * with the DB singleton.
 * </p>
 * <p>
- * If you just use Ebean without this programmatic configuration Ebean will read
- * the ebean.properties file and take the configuration from there. This usually
+ * If you just use DB without this programmatic configuration DB will read
+ * the application.properties file and take the configuration from there. This usually
 * includes searching the class path and automatically registering any entity
 * classes and listeners etc.
 * </p>
 * <pre>{@code
 *
- * ServerConfig c = new ServerConfig();
+ * ServerConfig config = new ServerConfig();
 *
 * // read the ebean.properties and load
 * // those settings into this serverConfig object
- * c.loadFromProperties();
+ * config.loadFromProperties();
 *
 * // explicitly register the entity beans to avoid classpath scanning
- * c.addClass(Customer.class);
- * c.addClass(User.class);
+ * config.addClass(Customer.class);
+ * config.addClass(User.class);
 *
- * EbeanServer server = EbeanServerFactory.create(c);
+ * Database database = DatabaseFactory.create(config);
 *
 * }</pre>
 *
@@ -78,12 +78,12 @@ import java.util.ServiceLoader;
 *
 * @author emcgreal
 * @author rbygrave
- * @see EbeanServerFactory
+ * @see DatabaseFactory
 */
 public class ServerConfig {

  /**
-   * The EbeanServer name.
+   * The Database name.
   */
  private String name = "db";

@@ -106,12 +106,12 @@ public class ServerConfig {
  private String resourceDirectory;

  /**
-   * Set to true to register this EbeanServer with the Ebean singleton.
+   * Set to true to register this Database with the DB singleton.
   */
  private boolean register = true;

  /**
-   * Set to true if this is the default/primary server.
+   * Set to true if this is the default/primary database.
   */
  private boolean defaultServer = true;

@@ -132,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;
+
  /**
   * List of interesting classes such as entities, embedded, ScalarTypes,
   * Listeners, Finders, Controllers etc.
@@ -150,7 +159,7 @@ public class ServerConfig {
  private DocStoreConfig docStoreConfig = new DocStoreConfig();

  /**
-   * Set to true when the EbeanServer only uses Document store.
+   * Set to true when the Database only uses Document store.
   */
  private boolean docStoreOnly;

@@ -168,7 +177,12 @@ public class ServerConfig {
  /**
   * The JSON format used for DateTime types. Default to millis.
   */
-  private JsonConfig.DateTime jsonDateTime = JsonConfig.DateTime.MILLIS;
+  private JsonConfig.DateTime jsonDateTime = JsonConfig.DateTime.ISO8601;
+
+  /**
+   * The JSON format used for Date types. Default to millis.
+   */
+  private JsonConfig.Date jsonDate = JsonConfig.Date.ISO8601;

  /**
   * For writing JSON specify if null values or empty collections should be exluded.
@@ -229,6 +243,8 @@ public class ServerConfig {

  private int persistBatchSize = 20;

+  private EnumType defaultEnumType = EnumType.ORDINAL;
+
  private boolean disableLazyLoading;

  /**
@@ -252,6 +268,8 @@ public class ServerConfig {

  private boolean ddlRun;

+  private boolean ddlExtra = true;
+
  private boolean ddlCreateOnly;

  private String ddlInitSql;
@@ -335,25 +353,10 @@ 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 update to include on the change properties.
-   */
-  private boolean updateChangesOnly = true;
-
  /**
   * Behaviour of updates in JDBC batch to by default include all properties.
   */
-  private boolean updateAllPropertiesInBatch = true;
-
-  /**
-   * Default behaviour for updates when cascade save on a O2M or M2M to delete any missing children.
-   */
-  private boolean updatesDeleteMissingChildren = true;
+  private boolean updateAllPropertiesInBatch;

  /**
   * Database platform configuration.
@@ -366,9 +369,10 @@ public class ServerConfig {
  private UuidVersion uuidVersion = UuidVersion.VERSION4;

  /**
-   * The UUID state file (for Version 1 UUIDs).
+   * The UUID state file (for Version 1 UUIDs). By default, the file is created in
+   * ${HOME}/.ebean/${servername}-uuid.state
   */
-  private String uuidStateFile = "ebean-uuid.state";
+  private String uuidStateFile;

  /**
   * The clock used for setting the timestamps (e.g. @UpdatedTimestamp) on objects.
@@ -414,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.
   */
@@ -473,6 +473,7 @@ public class ServerConfig {
   */
  private boolean disableL2Cache;

+  private String enabledL2Regions;

  /**
   * Should the javax.validation.constraints.NotNull enforce a notNull column in DB.
@@ -486,6 +487,16 @@ public class ServerConfig {
   */
  private boolean notifyL2CacheInForeground;

+  /**
+   * Set to true to support query plan capture.
+   */
+  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.
   */
@@ -501,7 +512,7 @@ public class ServerConfig {
  /**
   * Controls the default order by id setting of queries. See {@link Query#orderById(boolean)}
   */
-  private boolean defaultOrderById = false;
+  private boolean defaultOrderById;

  /**
   * The mappingLocations for searching xml mapping.
@@ -513,8 +524,12 @@ public class ServerConfig {
   */
  private boolean idGeneratorAutomatic = true;

+  private boolean dumpMetricsOnShutdown;
+
+  private String dumpMetricsOptions;
+
  /**
-   * Construct a Server Configuration for programmatically creating an EbeanServer.
+   * Construct a Database Configuration for programmatically creating an Database.
   */
  public ServerConfig() {

@@ -564,8 +579,9 @@ public class ServerConfig {


  /**
-   * Sets the default orderById setting for queries.
+   * Deprecated - look to have explicit order by. Sets the default orderById setting for queries.
   */
+  @Deprecated
  public void setDefaultOrderById(boolean defaultOrderById) {
    this.defaultOrderById = defaultOrderById;
  }
@@ -594,6 +610,48 @@ public class ServerConfig {
    return serviceObject.get(key);
  }

+  /**
+   * Put a service object into configuration such that it can be passed to a plugin.
+   *
+   * <pre>{@code
+   *
+   *   JedisPool jedisPool = ..
+   *
+   *   serverConfig.putServiceObject(jedisPool);
+   *
+   * }</pre>
+   */
+  public void putServiceObject(Object configObject) {
+    String key = serviceObjectKey(configObject);
+    serviceObject.put(key, configObject);
+  }
+
+  private String serviceObjectKey(Object configObject) {
+    return serviceObjectKey(configObject.getClass());
+  }
+
+  private String serviceObjectKey(Class<?> cls) {
+    String simpleName = cls.getSimpleName();
+    return Character.toLowerCase(simpleName.charAt(0)) + simpleName.substring(1);
+  }
+
+  /**
+   * Used by plugins to obtain service objects.
+   *
+   * <pre>{@code
+   *
+   *   JedisPool jedisPool = serverConfig.getServiceObject(JedisPool.class);
+   *
+   * }</pre>
+   *
+   * @param cls The type of the service object to obtain
+   * @return The service object given the class type
+   */
+  @SuppressWarnings("unchecked")
+  public <P> P getServiceObject(Class<P> cls) {
+    return (P) serviceObject.get(serviceObjectKey(cls));
+  }
+
  /**
   * Return the Jackson JsonFactory to use.
   * <p>
@@ -626,6 +684,20 @@ public class ServerConfig {
    this.jsonDateTime = jsonDateTime;
  }

+  /**
+   * Return the JSON format used for Date types.
+   */
+  public JsonConfig.Date getJsonDate() {
+    return jsonDate;
+  }
+
+  /**
+   * Set the JSON format to use for Date types.
+   */
+  public void setJsonDate(JsonConfig.Date jsonDate) {
+    this.jsonDate = jsonDate;
+  }
+
  /**
   * Return the JSON include mode used when writing JSON.
   */
@@ -644,14 +716,14 @@ public class ServerConfig {
  }

  /**
-   * Return the name of the EbeanServer.
+   * Return the name of the Database.
   */
  public String getName() {
    return name;
  }

  /**
-   * Set the name of the EbeanServer.
+   * Set the name of the Database.
   */
  public void setName(String name) {
    this.name = name;
@@ -660,8 +732,8 @@ public class ServerConfig {
  /**
   * Return the container / clustering configuration.
   * <p/>
-   * The container holds all the EbeanServer instances and provides clustering communication
-   * services to all the EbeanServer instances.
+   * The container holds all the Database instances and provides clustering communication
+   * services to all the Database instances.
   */
  public ContainerConfig getContainerConfig() {
    return containerConfig;
@@ -670,8 +742,8 @@ public class ServerConfig {
  /**
   * Set the container / clustering configuration.
   * <p/>
-   * The container holds all the EbeanServer instances and provides clustering communication
-   * services to all the EbeanServer instances.
+   * The container holds all the Database instances and provides clustering communication
+   * services to all the Database instances.
   */
  public void setContainerConfig(ContainerConfig containerConfig) {
    this.containerConfig = containerConfig;
@@ -711,8 +783,8 @@ public class ServerConfig {
  }

  /**
-   * Set false if you do not want this EbeanServer to be registered as the "default" server
-   * with the Ebean singleton.
+   * Set false if you do not want this Database to be registered as the "default" database
+   * with the DB singleton.
   * <p>
   * This is only used when {@link #setRegister(boolean)} is also true.
   * </p>
@@ -929,6 +1001,14 @@ public class ServerConfig {
    this.queryBatchSize = queryBatchSize;
  }

+  public EnumType getDefaultEnumType() {
+    return defaultEnumType;
+  }
+
+  public void setDefaultEnumType(EnumType defaultEnumType) {
+    this.defaultEnumType = defaultEnumType;
+  }
+
  /**
   * Return true if lazy loading is disabled on queries by default.
   */
@@ -970,18 +1050,6 @@ public class ServerConfig {
    this.lazyLoadBatchSize = lazyLoadBatchSize;
  }

-  /**
-   * Set the number of sequences to fetch/preallocate when using DB sequences.
-   * <p>
-   * This is a performance optimisation to reduce the number times Ebean
-   * requests a sequence to be used as an Id for a bean (aka reduce network
-   * chatter).
-   * </p>
-   */
-  public void setDatabaseSequenceBatchSize(int databaseSequenceBatchSize) {
-    platformConfig.setDatabaseSequenceBatchSize(databaseSequenceBatchSize);
-  }
-
  /**
   * Return the default JDBC fetchSize hint for findList queries.
   */
@@ -1498,14 +1566,14 @@ public class ServerConfig {
  }

  /**
-   * Return true if this EbeanServer is a Document store only instance (has no JDBC DB).
+   * Return true if this Database is a Document store only instance (has no JDBC DB).
   */
  public boolean isDocStoreOnly() {
    return docStoreOnly;
  }

  /**
-   * Set to true if this EbeanServer is Document store only instance (has no JDBC DB).
+   * Set to true if this Database is Document store only instance (has no JDBC DB).
   */
  public void setDocStoreOnly(boolean docStoreOnly) {
    this.docStoreOnly = docStoreOnly;
@@ -1529,14 +1597,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);
  }

  /**
@@ -1748,32 +1816,6 @@ public class ServerConfig {
    this.platformConfig.setDatabaseBooleanFalse(databaseFalse);
  }

-  /**
-   * Return the number of DB sequence values that should be preallocated.
-   */
-  public int getDatabaseSequenceBatchSize() {
-    return platformConfig.getDatabaseSequenceBatchSize();
-  }
-
-  /**
-   * Set the number of DB sequence values that should be preallocated and cached
-   * by Ebean.
-   * <p>
-   * This is only used for DB's that use sequences and is a performance
-   * optimisation. This reduces the number of times Ebean needs to get a
-   * sequence value from the Database reducing network chatter.
-   * </p>
-   * <p>
-   * By default this value is 10 so when we need another Id (and don't have one
-   * in our cache) Ebean will fetch 10 id's from the database. Note that when
-   * the cache drops to have full (which is 5 by default) Ebean will fetch
-   * another batch of Id's in a background thread.
-   * </p>
-   */
-  public void setDatabaseSequenceBatch(int databaseSequenceBatchSize) {
-    this.platformConfig.setDatabaseSequenceBatchSize(databaseSequenceBatchSize);
-  }
-
  /**
   * Return the database platform name (can be null).
   * <p>
@@ -1806,7 +1848,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;
@@ -1905,16 +1947,16 @@ public class ServerConfig {
  }

  /**
-   * Return true if the EbeanServer instance should be created in offline mode.
+   * Return true if the Database instance should be created in offline mode.
   */
  public boolean isDbOffline() {
    return dbOffline;
  }

  /**
-   * Set to true if the EbeanServer instance should be created in offline mode.
+   * Set to true if the Database instance should be created in offline mode.
   * <p>
-   * Typically used to create an EbeanServer instance for DDL Migration generation
+   * Typically used to create an Database instance for DDL Migration generation
   * without requiring a real DataSource / Database to connect to.
   * </p>
   */
@@ -2069,6 +2111,16 @@ public class ServerConfig {
    this.ddlRun = ddlRun;
  }

+  /**
+   * Set to false if you not want to run the extra-ddl.xml scripts. (default = true)
+   * <p>
+   * Typically we want this on when we are running tests.
+   */
+  public void setDdlExtra(boolean ddlExtra) {
+    this.ddlExtra = ddlExtra;
+  }
+
+
  /**
   * Return true if the "drop all ddl" should be skipped.
   * <p>
@@ -2139,6 +2191,13 @@ public class ServerConfig {
    return ddlRun;
  }

+  /**
+   * Return true, if extra-ddl.xml should be executed.
+   */
+  public boolean isDdlExtra() {
+    return ddlExtra;
+  }
+
  /**
   * Return true if the class path search should be disabled.
   */
@@ -2148,7 +2207,7 @@ public class ServerConfig {

  /**
   * Set to true to disable the class path search even for the case where no entity bean classes
-   * have been registered. This can be used to start an EbeanServer instance just to use the
+   * have been registered. This can be used to start an Database instance just to use the
   * SQL functions such as SqlQuery, SqlUpdate etc.
   */
  public void setDisableClasspathSearch(boolean disableClasspathSearch) {
@@ -2185,15 +2244,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>
@@ -2201,9 +2266,6 @@ public class ServerConfig {
   * </p>
   */
  public void addPackage(String packageName) {
-    if (packages == null) {
-      packages = new ArrayList<>();
-    }
    packages.add(packageName);
  }

@@ -2229,7 +2291,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.
@@ -2243,7 +2305,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() {
@@ -2262,8 +2324,7 @@ public class ServerConfig {
   *
   *   // assume Customer has L2 bean caching enabled ...
   *
-   *   Transaction transaction = Ebean.beginTransaction();
-   *   try {
+   *   try (Transaction transaction = DB.beginTransaction()) {
   *
   *     // this uses L2 bean cache as the transaction
   *     // ... is considered "query only" at this point
@@ -2271,7 +2332,7 @@ public class ServerConfig {
   *
   *     // transaction no longer "query only" once
   *     // ... a bean has been saved etc
-   *     Ebean.save(someBean);
+   *     DB.save(someBean);
   *
   *     // will NOT use L2 bean cache as the transaction
   *     // ... is no longer considered "query only"
@@ -2290,9 +2351,6 @@ public class ServerConfig {
   *     transaction.setSkipCache(true);
   *     Customer.find.byId(99); // skips l2 bean cache
   *
-   *
-   *   } finally {
-   *     transaction.end();
   *   }
   *
   * }</pre>
@@ -2310,20 +2368,6 @@ public class ServerConfig {
    this.skipCacheAfterWrite = skipCacheAfterWrite;
  }

-  /**
-   * Return true to only update changed properties.
-   */
-  public boolean isUpdateChangesOnly() {
-    return updateChangesOnly;
-  }
-
-  /**
-   * Set to true to only update changed properties.
-   */
-  public void setUpdateChangesOnly(boolean updateChangesOnly) {
-    this.updateChangesOnly = updateChangesOnly;
-  }
-
  /**
   * Returns true if updates in JDBC batch default to include all properties by default.
   */
@@ -2343,68 +2387,6 @@ public class ServerConfig {
    this.updateAllPropertiesInBatch = updateAllPropertiesInBatch;
  }

-  /**
-   * Return true if updates by default delete missing children when cascading save to a OneToMany or
-   * ManyToMany. When not set this defaults to true.
-   */
-  public boolean isUpdatesDeleteMissingChildren() {
-    return updatesDeleteMissingChildren;
-  }
-
-  /**
-   * Set if updates by default delete missing children when cascading save to a OneToMany or
-   * ManyToMany. When not set this defaults to true.
-   */
-  public void setUpdatesDeleteMissingChildren(boolean updatesDeleteMissingChildren) {
-    this.updatesDeleteMissingChildren = updatesDeleteMissingChildren;
-  }
-
-  /**
-   * Return true if the ebeanServer should collection query statistics 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.
   */
@@ -2726,7 +2708,7 @@ public class ServerConfig {
   * Load settings from ebean.properties.
   */
  public void loadFromProperties() {
-    this.properties = PropertiesLoader.load();
+    this.properties = Config.asProperties();
    configureFromProperties();
  }

@@ -2735,7 +2717,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();
  }

@@ -2830,10 +2812,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);
+    enabledL2Regions = p.get("enabledL2Regions", enabledL2Regions);
    notifyL2CacheInForeground = p.getBoolean("notifyL2CacheInForeground", notifyL2CacheInForeground);
    explicitTransactionBeginMode = p.getBoolean("explicitTransactionBeginMode", explicitTransactionBeginMode);
    autoCommitMode = p.getBoolean("autoCommitMode", autoCommitMode);
@@ -2857,15 +2846,8 @@ 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);
-    updateChangesOnly = p.getBoolean("updateChangesOnly", updateChangesOnly);
-
-    boolean defaultDeleteMissingChildren = p.getBoolean("defaultDeleteMissingChildren", updatesDeleteMissingChildren);
-    updatesDeleteMissingChildren = p.getBoolean("updatesDeleteMissingChildren", defaultDeleteMissingChildren);

    if (p.get("batch.mode") != null || p.get("persistBatching") != null) {
      throw new IllegalArgumentException("Property 'batch.mode' or 'persistBatching' is being set but no longer used. Please change to use 'persistBatchMode'");
@@ -2900,20 +2882,18 @@ public class ServerConfig {
    localTimeWithNanos = p.getBoolean("localTimeWithNanos", localTimeWithNanos);
    jodaLocalTimeMode = p.get("jodaLocalTimeMode", jodaLocalTimeMode);

+    defaultEnumType = p.getEnum(EnumType.class, "defaultEnumType", defaultEnumType);
    disableLazyLoading = p.getBoolean("disableLazyLoading", disableLazyLoading);
    lazyLoadBatchSize = p.getInt("lazyLoadBatchSize", lazyLoadBatchSize);
    queryBatchSize = p.getInt("queryBatchSize", queryBatchSize);

    jsonInclude = p.getEnum(JsonConfig.Include.class, "jsonInclude", jsonInclude);
-    String jsonDateTimeFormat = p.get("jsonDateTime", null);
-    if (jsonDateTimeFormat != null) {
-      jsonDateTime = JsonConfig.DateTime.valueOf(jsonDateTimeFormat);
-    } else {
-      jsonDateTime = JsonConfig.DateTime.MILLIS;
-    }
+    jsonDateTime = p.getEnum(JsonConfig.DateTime.class, "jsonDateTime", jsonDateTime);
+    jsonDate = p.getEnum(JsonConfig.Date.class, "jsonDate", jsonDate);

    ddlGenerate = p.getBoolean("ddl.generate", ddlGenerate);
    ddlRun = p.getBoolean("ddl.run", ddlRun);
+    ddlExtra = p.getBoolean("ddl.extra", ddlExtra);
    ddlCreateOnly = p.getBoolean("ddl.createOnly", ddlCreateOnly);
    ddlInitSql = p.get("ddl.initSql", ddlInitSql);
    ddlSeedSql = p.get("ddl.seedSql", ddlSeedSql);
@@ -2958,20 +2938,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) {
@@ -3054,6 +3034,20 @@ public class ServerConfig {
    this.expressionNativeIlike = expressionNativeIlike;
  }

+  /**
+   * Return the enabled L2 cache regions.
+   */
+  public String getEnabledL2Regions() {
+    return enabledL2Regions;
+  }
+
+  /**
+   * Set the enabled L2 cache regions (comma delimited).
+   */
+  public void setEnabledL2Regions(String enabledL2Regions) {
+    this.enabledL2Regions = enabledL2Regions;
+  }
+
  /**
   * Return true if L2 cache is disabled.
   */
@@ -3197,6 +3191,75 @@ public class ServerConfig {
    this.idGeneratorAutomatic = idGeneratorAutomatic;
  }

+  /**
+   * Return true if query plan capture is enabled.
+   */
+  public boolean isCollectQueryPlans() {
+    return collectQueryPlans;
+  }
+
+  /**
+   * Set to true to enable query plan capture.
+   */
+  public void setCollectQueryPlans(boolean collectQueryPlans) {
+    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.
+   */
+  public boolean isDumpMetricsOnShutdown() {
+    return dumpMetricsOnShutdown;
+  }
+
+  /**
+   * Set to true if metrics should be dumped when the server is shutdown.
+   */
+  public void setDumpMetricsOnShutdown(boolean dumpMetricsOnShutdown) {
+    this.dumpMetricsOnShutdown = dumpMetricsOnShutdown;
+  }
+
+  /**
+   * Return the options for dumping metrics.
+   */
+  public String getDumpMetricsOptions() {
+    return dumpMetricsOptions;
+  }
+
+  /**
+   * Include 'sql' or 'hash' in options such that they are included in the output.
+   *
+   * @param dumpMetricsOptions Example "sql,hash", "sql"
+   */
+  public void setDumpMetricsOptions(String dumpMetricsOptions) {
+    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();
+  }
+
  public enum UuidVersion {
    VERSION4,
    VERSION1,
@@ -35,9 +35,9 @@ public enum TenantMode {
   * (that holds configuration e.g.)
   */
  DB_WITH_MASTER(true, true);
-  
-  boolean dynamicDataSource;
-  boolean ddlEnabled;
+
+  final boolean dynamicDataSource;
+  final boolean ddlEnabled;

  TenantMode(boolean dynamicDataSource, boolean ddlEnabled) {
    this.dynamicDataSource = dynamicDataSource;
@@ -50,12 +50,12 @@ public enum TenantMode {
  public boolean isDynamicDataSource() {
    return dynamicDataSource;
  }
-  
+
  /**
   * Returns true, if DDL is enabled.
   */
  public boolean isDdlEnabled() {
    return ddlEnabled;
  }
- 
+
 }
@@ -18,5 +18,10 @@ public enum DataErrorType {
  /**
   * Data integrity error like an invalid foreign key.
   */
-  DataIntegrity
+  DataIntegrity,
+
+  /**
+   * Non recoverable concurrency conflict.
+   */
+  SerializableConflict
 }
@@ -49,6 +49,10 @@ public class DatabasePlatform {
   */
  protected boolean useExtraTransactionOnIterateSecondaryQueries;

+  protected boolean supportsDeleteTableAlias;
+
+  protected boolean supportsSavepointId = true;
+
  /**
   * The behaviour used when ending a read only transaction at read committed isolation level.
   */
@@ -69,6 +73,13 @@ public class DatabasePlatform {
   */
  protected boolean allQuotedIdentifiers;

+  protected boolean caseSensitiveCollation = true;
+
+  /**
+   * Set true if the Database support LIMIT clause on sql update.
+   */
+  protected boolean inlineSqlUpdateLimit;
+
  /**
   * For limit/offset, row_number etc limiting of SQL queries.
   */
@@ -99,10 +110,6 @@ public class DatabasePlatform {
   */
  protected DbIdentity dbIdentity = new DbIdentity();

-  protected boolean sequenceBatchMode = true;
-
-  protected int sequenceBatchSize = 20;
-
  /**
   * The history support for this database platform.
   */
@@ -133,9 +140,9 @@ public class DatabasePlatform {
   */
  protected Platform platform = Platform.GENERIC;

-  protected String columnAliasPrefix = "c";
+  protected String truncateTable = "truncate table %s";

-  protected String tableAliasPlaceHolder = "${ta}";
+  protected String columnAliasPrefix = "c";

  /**
   * Use a BackTick ` at the beginning and end of table or column names that you
@@ -163,23 +170,24 @@ public class DatabasePlatform {
  /**
   * Characters escaped for startsWith, endsWith and contains.
   */
-  protected char[] likeSpecialCharacters = { '%', '_', '|' };
+  protected char[] likeSpecialCharacters = {'%', '_', '|'};

  protected DbEncrypt dbEncrypt;

  protected boolean idInExpandedForm;

  protected boolean selectCountWithAlias;
+  protected boolean selectCountWithColumnAlias;

  /**
   * If set then use the FORWARD ONLY hint when creating ResultSets for
   * findIterate() and findVisit().
   */
  protected boolean forwardOnlyHintOnFindIterate;
-  
+
  /**
   * If set then use the CONCUR_UPDATABLE hint when creating ResultSets.
-   * 
+   * <p>
   * This is {@code false} for HANA
   */
  protected boolean supportsResultSetConcurrencyModeUpdatable = true;
@@ -223,7 +231,7 @@ public class DatabasePlatform {
   * Configure the platform given the server configuration.
   */
  public void configure(PlatformConfig config) {
-    this.sequenceBatchSize = config.getDatabaseSequenceBatchSize();
+    this.caseSensitiveCollation = config.isCaseSensitiveCollation();
    configureIdType(config.getIdType());
    configure(config, config.isAllQuotedIdentifiers());
  }
@@ -265,7 +273,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;
  }

  /**
@@ -285,20 +293,6 @@ public class DatabasePlatform {
    return platform.name().toLowerCase();
  }

-  /**
-   * Return true if we are using Sequence batch mode rather than STEP.
-   */
-  public boolean isSequenceBatchMode() {
-    return sequenceBatchMode;
-  }
-
-  /**
-   * Set to false to not use sequence batch mode but instead STEP mode.
-   */
-  public void setSequenceBatchMode(boolean sequenceBatchMode) {
-    this.sequenceBatchMode = sequenceBatchMode;
-  }
-
  /**
   * Return true if this database platform supports native ILIKE expression.
   */
@@ -306,6 +300,37 @@ public class DatabasePlatform {
    return supportsNativeIlike;
  }

+  /**
+   * Return true if the platform supports delete statements with table alias.
+   */
+  public boolean isSupportsDeleteTableAlias() {
+    return supportsDeleteTableAlias;
+  }
+
+  /**
+   * Return true if the collation is case sensitive.
+   * <p>
+   * This is expected to be used for testing only.
+   * </p>
+   */
+  public boolean isCaseSensitiveCollation() {
+    return caseSensitiveCollation;
+  }
+
+  /**
+   * Return true if the platform supports SavepointId values.
+   */
+  public boolean isSupportsSavepointId() {
+    return supportsSavepointId;
+  }
+
+  /**
+   * Return true if the platform supports LIMIT with sql update.
+   */
+  public boolean isInlineSqlUpdateLimit() {
+    return inlineSqlUpdateLimit;
+  }
+
  /**
   * Return the maximum table name length.
   * <p>
@@ -340,10 +365,10 @@ public class DatabasePlatform {
   * @param be        the BackgroundExecutor that can be used to load the sequence if
   *                  desired
   * @param ds        the DataSource
-   * @param stepSize  the sequence allocation size as defined by mapping (defaults to 50)
+   * @param increment the sequence allocation size as defined by mapping (defaults to 50)
   * @param seqName   the name of the sequence
   */
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int increment, String seqName) {
    return null;
  }

@@ -433,20 +458,6 @@ public class DatabasePlatform {
    this.columnAliasPrefix = columnAliasPrefix;
  }

-  /**
-   * Return the table alias placeholder.
-   */
-  public String getTableAliasPlaceHolder() {
-    return tableAliasPlaceHolder;
-  }
-
-  /**
-   * Set the table alias placeholder.
-   */
-  public void setTableAliasPlaceHolder(String tableAliasPlaceHolder) {
-    this.tableAliasPlaceHolder = tableAliasPlaceHolder;
-  }
-
  /**
   * Return the close quote for quoted identifiers.
   */
@@ -524,7 +535,7 @@ public class DatabasePlatform {
  public void setForwardOnlyHintOnFindIterate(boolean forwardOnlyHintOnFindIterate) {
    this.forwardOnlyHintOnFindIterate = forwardOnlyHintOnFindIterate;
  }
-  
+
  /**
   * Return true if the ResultSet CONCUR_UPDATABLE Hint should be used on
   * createNativeSqlTree() PreparedStatements.
@@ -535,7 +546,7 @@ public class DatabasePlatform {
  public boolean isSupportsResultSetConcurrencyModeUpdatable() {
    return supportsResultSetConcurrencyModeUpdatable;
  }
-  
+
  /**
   * Set to true if the ResultSet CONCUR_UPDATABLE Hint should be used by default on createNativeSqlTree() PreparedStatements.
   */
@@ -546,7 +557,7 @@ public class DatabasePlatform {
  /**
   * Normally not needed - overridden in CockroachPlatform.
   */
-  public boolean isDdlCommitOnCreateIndex() {
+  public boolean isDdlAutoCommit() {
    return false;
  }

@@ -626,7 +637,7 @@ public class DatabasePlatform {
    if (dbName != null && !dbName.isEmpty()) {
      if (dbName.startsWith(openQuote)) {
        // trim off the open and close quotes
-        return dbName.substring(1, dbName.length()-1);
+        return dbName.substring(1, dbName.length() - 1);
      }
    }
    return dbName;
@@ -639,6 +650,14 @@ public class DatabasePlatform {
    return selectCountWithAlias;
  }

+  /**
+   * Return true if select count with subquery needs column alias (SQL Server).
+   */
+  public boolean isSelectCountWithColumnAlias() {
+    return selectCountWithColumnAlias;
+  }
+
+
  public String completeSql(String sql, Query<?> query) {
    if (query.isForUpdate()) {
      sql = withForUpdate(sql, query.getForUpdateMode());
@@ -677,6 +696,13 @@ public class DatabasePlatform {
    return persistBatchOnCascade;
  }

+  /**
+   * Return a statement to truncate a table.
+   */
+  public String truncateStatement(String table) {
+    return String.format(truncateTable, table);
+  }
+
  /**
   * Create the DB schema if it does not exist.
   */
@@ -746,7 +772,7 @@ public class DatabasePlatform {
    for (int i = 0; i < value.length(); i++) {
      char ch = value.charAt(i);
      boolean escaped = false;
-      for (char escapeChar: likeSpecialCharacters) {
+      for (char escapeChar : likeSpecialCharacters) {
        if (ch == escapeChar) {
          if (sb == null) {
            sb = new StringBuilder(value.substring(0, i));
@@ -27,15 +27,13 @@ public class DbDefaultValue {
   * The key for the NOW / current timestamp.
   */
  public static final String NOW = "now";
-  
+
  /**
   * The 'null' literal.
   */
  public static final String NULL = "null";
-  

-
-  protected Map<String, String> map = new LinkedHashMap<>();
+  protected final Map<String, String> map = new LinkedHashMap<>();

  /**
   * Set the DB now function.
@@ -82,10 +80,9 @@ public class DbDefaultValue {
    return val != null ? val : dbDefaultLiteral;
  }

-  
  /**
   * This method checks & convert the {@link DbDefault#value()} to a valid SQL literal.
-   * 
+   *
   * This is mainly to quote string literals and verify integer/dates for correctness.
   * <p>
   * Note: There are some special cases:
@@ -98,24 +95,24 @@ public class DbDefaultValue {
   *        If you need really the String "null", you have to specify <code>@DbDefault("'null'")</code>
   *        which gives you the <code>default 'null'</code> statement.</li>
   *    <li>Any statement, that begins and ends with single quote will not be checked or get quoted again.</li>
-   *    <li>A statement that begins with "$RAW:", e.g <code>@DbDefault("$RAW:N'SANDNES'")</code> will lead to 
+   *    <li>A statement that begins with "$RAW:", e.g <code>@DbDefault("$RAW:N'SANDNES'")</code> will lead to
   *        a <code>default N'SANDNES'</code> in DDL. Note that this is platform specific!</li>
   * </ul>
   */
  public static String toSqlLiteral(String defaultValue, Class<?> propertyType, int sqlType) {
    if (propertyType == null
-        || defaultValue == null 
+        || defaultValue == null
        || NULL.equals(defaultValue)
        || (defaultValue.startsWith("'") && defaultValue.endsWith("'"))
-        || (defaultValue.startsWith("$RAW:"))) {  
+        || (defaultValue.startsWith("$RAW:"))) {
      return defaultValue;
    }

    if (Boolean.class.isAssignableFrom(propertyType) || Boolean.TYPE.isAssignableFrom(propertyType)) {
      return toBooleanLiteral(defaultValue);
    }
-    
-    if (Number.class.isAssignableFrom(propertyType) 
+
+    if (Number.class.isAssignableFrom(propertyType)
        || Byte.TYPE.equals(propertyType)
        || Short.TYPE.equals(propertyType)
        || Integer.TYPE.equals(propertyType)
@@ -126,7 +123,7 @@ public class DbDefaultValue {
      Double.valueOf(defaultValue); // verify if it is a number
      return defaultValue;
    }
-   
+
    // check if it is a date/time - in all other cases return quoted defaultValue
    switch (sqlType) {
      // date
@@ -155,7 +152,7 @@ public class DbDefaultValue {
    }
    throw new IllegalArgumentException("'" + value + "' is not a valid value for boolean");
  }
-  
+
  /**
   * This adds single qoutes around the <code>value</code> and doubles single quotes.
   * "User's home" will return "'User''s home'"
@@ -175,7 +172,7 @@ public class DbDefaultValue {
    return sb.toString();

  }
-  
+
  private static String toDateLiteral(String value) {
    if (NOW.equals(value)) {
      return value; // this will get translated later
@@ -191,7 +188,7 @@ public class DbDefaultValue {
    DatatypeConverter.parseTime(value); // verify
    return toTextLiteral(value);
  }
-  
+
  private static String toDateTimeLiteral(String value) {
    if (NOW.equals(value)) {
      return value; // this will get translated later
@@ -11,12 +11,12 @@ class DbPlatformTypeLookup {
  /**
   * A map to lookup the type by name.
   */
-  private Map<String, DbType> nameLookup = new HashMap<>();
+  private final Map<String, DbType> nameLookup = new HashMap<>();

  /**
   * A map to lookup the type by JDBC int value.
   */
-  private Map<Integer, DbType> idLookup = new HashMap<>();
+  private final Map<Integer, DbType> idLookup = new HashMap<>();

  DbPlatformTypeLookup() {
    addAll();
@@ -23,10 +23,15 @@ public class DbPlatformTypeMapping {
    }
  }

-  private static DbPlatformTypeLookup lookup = new DbPlatformTypeLookup();
+  private static final DbPlatformTypeLookup lookup = new DbPlatformTypeLookup();

  private static final DbPlatformType BOOLEAN_LOGICAL = new BooleanLogicalType();

+  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")
  private static final DbPlatformType UUID_PLACEHOLDER = new DbPlatformType("uuidPlaceholder");
@@ -106,6 +111,8 @@ public class DbPlatformTypeMapping {
      put(DbType.JSONBLOB, new DbPlatformType("jsonblob"));
      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));
@@ -121,6 +128,8 @@ public class DbPlatformTypeMapping {
      put(DbType.JSONVARCHAR, JSON_VARCHAR_PLACEHOLDER);
      // default to native UUID and override on platform configure()
      put(DbType.UUID, UUID_NATIVE);
+      put(DbType.INET, INET_VARCHAR);
+      put(DbType.CIDR, CIDR_VARCHAR);
    }
  }

@@ -35,6 +35,8 @@ public enum DbType {
  ARRAY(Types.ARRAY),

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

  POINT(ExtraDbTypes.POINT),
  POLYGON(ExtraDbTypes.POLYGON),
@@ -40,6 +40,9 @@ public interface ExtraDbTypes {
   */
  int JSONBlob = 5005;

+  int INET = 5020;
+  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);
-  }
-
-}
--- a/Show More
+++ b/Show More