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

#1341 - Cascade persist with JDBC batch and BeanPersistAdapter with preUpdate() that invokes lazy loading on persisted bean ... results in OptimisticLockException
[maven-release-plugin] prepare for next development iteration
2024-04-21 10:51:47 +00:00 · 2018-03-08 14:16:30 +13:00 · 2018-03-08 14:12:32 +13:00 · 2018-03-07 20:22:38 +13:00 · 2018-03-07 20:22:25 +13:00 · 2018-03-07 20:19:48 +13:00
901 changed files with 32471 additions and 6731 deletions
@@ -10,3 +10,4 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 spaces_around_operators = true
+max_line_length = 130
@@ -13,10 +13,11 @@ ebean-profiling*.xml
 /db
 /mydb.db
 !src/test/ddl-review/*.sql
-
+profiling/

 # Intellij project files
 *.iml
 *.ipr
 *.iws
 .idea/
+*uuid.state
@@ -9,16 +9,27 @@ git:

 addons:
  postgresql: "9.6"
+#  apt:
+#    packages:
+#    - mysql-server-5.7
+#    - mysql-client-core-5.7
+#    - mysql-client-5.7

 services:
+  - docker
  - postgresql
+  - mysql

 before_script:
  - ./.travis/setup_database
+  - mysql -u root -e 'CREATE DATABASE test_ebean;'
+  - mysql -u root -e "CREATE USER 'test_ebean'@'localhost' IDENTIFIED BY 'test';"
+  - mysql -u root -e "GRANT ALL ON test_ebean.* TO 'test_ebean'@'localhost';"

 env:
  - EBEAN_DB=h2
  - EBEAN_DB=pg
+#  - EBEAN_DB=mysql

 install: true

@@ -0,0 +1,298 @@
+Overview of ebean.properties file
+=================================
+
+
+### DbMigration options
+
+You can set individual values for different platforms when generating migrations
+
+`dbmigration.platform.<PLATFORM>.databaseSequenceBatchSize`
+For DB's using sequences this is the number of sequence values prefetched.
+ 
+`dbmigration.platform.<PLATFORM>.dbuuid`
+Control, how UUID generation should work - it affects DDL which column type is generated. Possible values:
+- BINARY enforces binary UUID 
+- VARCHAR enforces varchar UUID
+- BINARY_OPTIMIZED enforces binary-optimized UUID (makes sense only with Type1 ID)
+- AUTO_BINARY use binary when platform does not support native UUID
+- AUTO_BINARY_OPTIMIZED use binary-optimized when platform does not support native UUID
+- AUTO_VARCHAR (default) use varchar when platform does not support UUID 
+
+`dbmigration.platform.<PLATFORM>.uuidStoreAsBinary`
+Same as setting dbuuid to BINARY
+
+`dbmigration.platform.<PLATFORM>.geometrySRID`
+The Geometry SRID value (default 4326).
+
+`dbmigration.platform.<PLATFORM>.idType`
+The ID type (IDENTITY, SEQUENCE, GENERATOR, EXTERNAL)
+
+`dbmigration.platform.<PLATFORM>.mapping`
+Adjust the mapping. For example `BOOLEAN=integer(32);BIT=tinyint(3)`
+
+
+`ebean.migration.applyPrefix`
+Set this to "V" to be compatible with FlywayDB.
+
+`ebean.migration.applySuffix`
+Defaults to '.sql'
+
+`ebean.migration.dbusername`
+DB user used to run the DB migration.
+
+`ebean.migration.dbpassword`
+DB password used to run the DB migration.
+
+`ebean.migration.generate`
+Set to true if the DB migration should be generated on server start.
+
+`ebean.migration.generatePendingDrop`
+The version of a pending drop that should be generated as the next migration.
+
+`ebean.migration.includeGeneratedFileComment`
+TODO
+
+`ebean.migration.metaTable`
+For running migration the DB table that holds migration execution status. Default 'db_migration'
+
+`ebean.migration.migrationPath`
+Resource path for the migration xml and sql.
+
+`ebean.migration.modelPath`
+Subdirectory the model xml files go into. Default 'model'
+
+`ebean.migration.modelSuffix`
+Suffix. Default '.model.xml' 
+
+`ebean.migration.name`
+Description text that can be appended to the version to become the ddl script file name
+ 
+`ebean.migration.patchInsertOn`
+migration versions that should be added to history without running.
+
+`ebean.migration.patchResetChecksumOn`
+migration versions that should have their checksum reset and not run.
+Use this if you get a 'Checksum mismatch' error.
+
+`ebean.migration.placeholders`
+A comma and equals delimited placeholders that are substituted in SQL scripts when running migration (used by DB Migration runner only).
+
+`ebean.migration.platform`
+The database platform to generate migration DDL for.
+
+`ebean.migration.run`
+Flag set to true means to run any outstanding migrations on startup.
+
+`ebean.migration.version`
+The migration version name (typically FlywayDb compatible). Example: 1.1.1_2
+
+
+### Ebean UUID options
+
+`ebean.uuidVersion`
+Controls, how the UUIDs are generated. Possible values
+- VERSION4 (default) generate random V4 UUIDs,
+- VERSION1 generate rfc4122 compliant Type 1 UUIDs (requires a state file)
+- VERSION1RND generate fake Type 1 UUIDs
+
+Note, that V1 UUIDs in conjunction with AUTO_BINARY_OPTIMIZED will give you the best index performance, but you MUST understand how this works to avoid collisions.
+
+`ebean.uuidStateFile`
+The state file that is Required to generate V1 UUIDs
+
+
+### DocStoreConfig
+
+`ebean.docstore.active`
+True when the Document store integration is active/on.
+
+`ebean.docstore.allowAllCertificates`
+Set to true such that the client allows connections to invalid/self signed SSL certificates.
+
+`ebean.docstore.bulkBatchSize`
+The default batch size to use for the Bulk API calls.
+
+`ebean.docstore.create`
+When true the Document store should create any document indexes that don't already exist.
+
+`ebean.docstore.dropCreate`
+When true the Document store should drop and re-create document indexes.
+
+`ebean.docstore.generateMapping`
+Set to true means Ebean will generate mapping files on startup.
+
+`ebean.docstore.mappingPath`
+Resource path for the Document store mapping files.
+
+`ebean.docstore.mappingSuffix`
+Suffix used for mapping files.
+
+`ebean.docstore.password`
+ Password credential that be used for authentication to document store.
+ 
+`ebean.docstore.pathToResources`
+Location of resources that mapping files are generated into.
+
+`ebean.docstore.persist`
+The default mode used by indexes. `DEFAULT|IGNORE|QUEUE|UPDATE`
+
+`ebean.docstore.url`
+The URL of the Document store server. For example: http://localhost:9200.
+
+`ebean.docstore.username`
+Credential that be used for authentication to document store.
+
+### Ebean Autotune
+
+`ebean.autoTune.mode`
+The autoTune mode `DEFAULT_OFF|DEFAULT_ON|DEFAULT_ONIFEMPTY`
+
+`ebean.autoTune.profiling`
+TODO
+
+`ebean.autoTune.profilingBase`
+TODO
+
+`ebean.autoTune.profilingFile`
+TODO
+
+`ebean.autoTune.profilingRate`
+TODO
+
+`ebean.autoTune.profilingUpdateFrequency`
+TODO
+
+`ebean.autoTune.queryTuning`
+TODO
+
+`ebean.autoTune.queryTuningAddVersion`
+TODO
+
+`ebean.autoTune.queryTuningFile`
+TODO
+
+`ebean.autoTune.skipGarbageCollectionOnShutdown`
+TODO
+
+`ebean.autoTune.skipProfileReportingOnShutdown`
+TODO
+
+
+### Ebean options
+`ebean.allQuotedIdentifiers`
+Quote all identifiers
+
+`ebean.asOfSysPeriod`
+Column used to support history and 'As of' queries. This column is a timestamp range or equivalent.
+
+`ebean.asOfViewSuffix`
+Suffix appended to the base table to derive the view that contains the union of the base table and the history table in order to support asOf queries.
+
+`ebean.autoCommitMode`
+Set to true if the DataSource uses autoCommit. Indicates that Ebean should use autoCommit friendly Transactions and TransactionManager.
+
+`ebean.autoReadOnlyDataSource`
+When true create a read only DataSource using readOnlyDataSourceConfig defaulting values from dataSourceConfig
+
+`ebean.autostart`
+Should the server start all
+
+`ebean.backgroundExecutorSchedulePoolSize`
+TODO
+
+`ebean.backgroundExecutorShutdownSecs`
+TODO
+
+and some more todos:
+`ebean.batch.mode`
+`ebean.batch.size`
+`ebean.changeLogAsync`
+`ebean.changeLogIncludeInserts`
+`ebean.classes`
+`ebean.collectQueryOrigins`
+`ebean.collectQueryStatsByNode`
+`ebean.currentUserProvider`
+`ebean.dataSourceJndiName`
+`ebean.dataTimeZone`
+`ebean.databaseBooleanFalse`
+`ebean.databaseBooleanTrue`
+`ebean.databasePlatform`
+`ebean.databasePlatformName`
+`ebean.databaseSequenceBatchSize`
+ebean.datasource.h2.adminpassword
+ebean.datasource.h2.adminusername
+`ebean.dbEncrypt`
+`ebean.dbOffline`
+ebean.ddl.createOnly
+ebean.ddl.generate
+ebean.ddl.header
+ebean.ddl.initSql
+ebean.ddl.run
+ebean.ddl.seedSql
+ebean.defaultDeleteMissingChildren
+ebean.defaultOrderById
+ebean.disableClasspathSearch
+ebean.disableL2Cache
+ebean.docStoreOnly
+ebean.docstore.active
+ebean.docstore.allowAllCertificates
+ebean.docstore.bulkBatchSize
+ebean.docstore.create
+ebean.docstore.dropCreate
+ebean.docstore.generateMapping
+ebean.docstore.mappingPath
+ebean.docstore.mappingSuffix
+ebean.docstore.password
+ebean.docstore.pathToResources
+ebean.docstore.persist
+ebean.docstore.url
+ebean.docstore.username
+ebean.encryptDeployManager
+ebean.encryptKeyManager
+ebean.encryptor
+ebean.explicitTransactionBeginMode
+ebean.expressionEqualsWithNullAsNoop
+ebean.expressionNativeIlike
+ebean.geometrySRID
+ebean.historyTableSuffix
+ebean.jdbcFetchSizeFindEach
+ebean.jdbcFetchSizeFindList
+ebean.jodaLocalTimeMode
+ebean.jsonDateTime
+ebean.jsonInclude
+ebean.lazyLoadBatchSize
+ebean.localTimeWithNanos
+ebean.namingConvention.schema
+ebean.namingConvention.sequenceFormat
+ebean.namingConvention.useForeignKeyPrefix
+ebean.namingconvention
+ebean.notifyL2CacheInForeground
+ebean.packages
+ebean.persistBatch
+ebean.persistBatchOnCascade
+ebean.persistBatchSize
+ebean.persistBatching
+ebean.persistenceContextScope
+ebean.profiling
+ebean.profiling.directory
+ebean.profiling.includeProfileIds
+ebean.profiling.minimumMicros
+ebean.profiling.profilesPerFile
+ebean.profiling.verbose
+ebean.queryBatchSize
+ebean.queryPlanTTLSeconds
+ebean.search.packages
+ebean.serverCachePlugin
+ebean.skipCacheAfterWrite
+ebean.slowQueryMillis
+ebean.tenant.catalogProvider
+ebean.tenant.currentTenantProvider
+ebean.tenant.mode
+ebean.tenant.partitionColumn
+ebean.tenant.schemaProvider
+ebean.updateAllPropertiesInBatch
+ebean.updateChangesOnly
+ebean.updatesDeleteMissingChildren
+ebean.useJavaxValidationNotNull
+ebean.useJtaTransactionManager
+
@@ -48,7 +48,8 @@ Reqirements
 run: `mvn clean test -Ddatasource.default=pg`

 Current status: PASS
-Tests run: 1986, Failures: 0, Errors: 0, Skipped: 16
+Tests run: 2166, Failures: 0, Errors: 0, Skipped: 25
+


 'mysql' platform
@@ -61,8 +62,8 @@ Reqirements

 run: `mvn clean test -Ddatasource.default=mysql`

-Current status: FAIL
-Tests run: 1986, Failures: 2, Errors: 4, Skipped: 16
+Current status: PASS
+Tests run: 2166, Failures: 0, Errors: 0, Skipped: 33



@@ -76,8 +77,8 @@ Reqires an installed sqlserver - e.g. https://hub.docker.com/r/microsoft/mssql-s
  
 run: `mvn clean test -Ddatasource.default=mssql`

-Current status: FAIL
-Tests run: 1986, Failures: 19, Errors: 43, Skipped: 16
+Current status: PASS
+Tests run: 2166, Failures: 0, Errors: 0, Skipped: 39



@@ -107,7 +108,7 @@ Reqires a locally installed DB2 Express-C server.
 run: `mvn clean test -Ddatasource.default=db2 -Pdb2`

 Current status: FAIL
-Tests run: 1986, Failures: 33, Errors: 26, Skipped: 16
+Tests run: 2166, Failures: 29, Errors: 58, Skipped: 30


 'sqlite' platform
@@ -9,7 +9,7 @@

  <groupId>io.ebean</groupId>
  <artifactId>ebean</artifactId>
-  <version>11.2.1</version>
+  <version>11.14.3</version>
  <packaging>jar</packaging>

  <name>ebean</name>
@@ -17,7 +17,7 @@

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

  <profiles>
@@ -72,10 +72,35 @@
  </profiles>
  <dependencies>

+    <!--
+    Projects are expected to explicit depend on version
+    of slf4j that they want to use
+    -->
    <dependency>
-      <groupId>org.jetbrains</groupId>
-      <artifactId>annotations</artifactId>
-      <version>13.0</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.25</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!--
+    Exclude snakeyaml if you desire - it is not strictly required.
+    -->
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>1.19</version>
+    </dependency>
+
+    <!--
+    Class retention Nonnull and Nullable annotations
+    to assist with IDE auto-completion with Ebean API
+    -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-jsr305</artifactId>
+      <version>1.1</version>
+      <scope>provided</scope>
    </dependency>

    <dependency>
@@ -87,49 +112,31 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-annotation</artifactId>
-      <version>3.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-datasource-api</artifactId>
-      <version>1.1</version>
+      <version>3.8</version>
    </dependency>

    <dependency>
      <groupId>org.avaje</groupId>
      <artifactId>avaje-datasource</artifactId>
-      <version>2.1.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-classpath-scanner-api</artifactId>
-      <version>2.2</version>
+      <version>3.1.1</version>
    </dependency>

    <dependency>
      <groupId>org.avaje</groupId>
      <artifactId>avaje-classpath-scanner</artifactId>
-      <version>2.2.4</version>
+      <version>3.1.1</version>
    </dependency>

    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-migration</artifactId>
-      <version>10.3.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>[1.7.1,1.7.99)</version>
+      <version>11.3.1</version>
    </dependency>

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

    <!-- Jackson core used internally by Ebean -->
@@ -193,12 +200,19 @@
      <!--<scope>test</scope>-->
    <!--</dependency>-->

-    <!--<dependency>-->
-      <!--<groupId>microsoft</groupId>-->
-      <!--<artifactId>sqlserver-jdbc</artifactId>-->
-      <!--<version>4.2</version>-->
-      <!--<scope>test</scope>-->
-    <!--</dependency>-->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-docker-run</artifactId>
+      <version>1.5.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.2.3</version>
+      <scope>test</scope>
+    </dependency>

    <dependency>
      <groupId>org.avaje</groupId>
@@ -210,7 +224,7 @@
    <dependency>
      <groupId>io.ebean</groupId>
      <artifactId>ebean-agent</artifactId>
-      <version>11.1.1</version>
+      <version>11.10.1</version>
      <scope>test</scope>
    </dependency>

@@ -219,7 +233,7 @@
    <dependency>
      <groupId>com.h2database</groupId>
      <artifactId>h2</artifactId>
-      <version>1.4.193</version>
+      <version>1.4.196</version>
      <scope>provided</scope>
    </dependency>

@@ -283,7 +297,7 @@
      <plugin>
        <groupId>io.ebean</groupId>
        <artifactId>ebean-maven-plugin</artifactId>
-        <version>11.1.1</version>
+        <version>11.10.1</version>
        <executions>
          <execution>
            <id>test</id>
@@ -316,6 +330,11 @@
              <name>datasource.default</name>
              <value>${datasource.default}</value>
            </property>
+            <property>
+              <!-- transfer dbClockDelta parameter -->
+              <name>dbClockDelta</name>
+              <value>${dbClockDelta}</value>
+            </property>
          </systemProperties>
        </configuration>
      </plugin>
@@ -0,0 +1,169 @@
+package io.ebean;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Provides finder functionality for use with "Dependency Injection style" use of Ebean.
+ * <p>
+ * Note that typically users would extend BeanRepository rather than BeanFinder.
+ * </p>
+ * <pre>{@code
+ *
+ * public class CustomerFinder extends BeanFinder<Long,Customer> {
+ *
+ *   @Inject
+ *   public CustomerFinder(EbeanServer server) {
+ *     super(Customer.class, server);
+ *   }
+ *
+ *   // ... add customer specific finders
+ * }
+ *
+ * }</pre>
+ *
+ * @param <I> The ID type
+ * @param <T> The Bean type
+ */
+public abstract class BeanFinder<I,T> {
+
+  protected final EbeanServer server;
+
+  protected final Class<T> type;
+
+  /**
+   * Create with the given bean type and EbeanServer instance.
+   *
+   * @param type The bean type
+   * @param server The EbeanServer instance typically created via Spring factory or equivalent.
+   */
+  protected BeanFinder(Class<T> type, EbeanServer server) {
+    this.type = type;
+    this.server = server;
+  }
+
+  /**
+   * Return the EbeanServer to use.
+   */
+  public EbeanServer db() {
+    return server;
+  }
+
+  /**
+   * Return the current transaction.
+   */
+  public Transaction currentTransaction() {
+    return db().currentTransaction();
+  }
+
+  /**
+   * Flush the JDBC batch on the current transaction.
+   */
+  public void flush() {
+    db().flush();
+  }
+
+  /**
+   * Return typically a different EbeanServer to the default.
+   * <p>
+   * This is equivalent to {@link Ebean#getServer(String)}
+   *
+   * @param server The name of the EbeanServer. If this is null then the default EbeanServer is
+   *               returned.
+   */
+  public EbeanServer db(String server) {
+    return Ebean.getServer(server);
+  }
+
+  /**
+   * Creates an entity reference for this ID.
+   * <p>
+   * Equivalent to {@link EbeanServer#getReference(Class, Object)}
+   */
+  @Nonnull
+  public T ref(I id) {
+    return db().getReference(type, id);
+  }
+
+  /**
+   * Retrieves an entity by ID.
+   * <p>
+   * Equivalent to {@link EbeanServer#find(Class, Object)}
+   */
+  @Nullable
+  public T findById(I id) {
+    return db().find(type, id);
+  }
+
+  /**
+   * Find an entity by ID returning an Optional.
+   */
+  @Nullable
+  public Optional<T> findByIdOrEmpty(I id) {
+    return db().find(type).setId(id).findOneOrEmpty();
+  }
+
+  /**
+   * Delete a bean by Id.
+   * <p>
+   * Equivalent to {@link EbeanServer#delete(Class, Object)}
+   */
+  public void deleteById(I id) {
+    db().delete(type, id);
+  }
+
+  /**
+   * Retrieves all entities of the given type.
+   */
+  @Nonnull
+  public List<T> findAll() {
+    return query().findList();
+  }
+
+  /**
+   * Creates an update query.
+   *
+   * <pre>{@code
+   *
+   *  int rows =
+   *      updateQuery()
+   *      .set("status", Customer.Status.ACTIVE)
+   *      .set("updtime", new Timestamp(System.currentTimeMillis()))
+   *      .where()
+   *        .gt("id", 1000)
+   *        .update();
+   *
+   * }</pre>
+   *
+   * <p>
+   * Equivalent to {@link EbeanServer#update(Class)}
+   */
+  protected UpdateQuery<T> updateQuery() {
+    return db().update(type);
+  }
+
+  /**
+   * Creates a query.
+   * <p>
+   * Equivalent to {@link EbeanServer#find(Class)}
+   */
+  protected Query<T> query() {
+    return db().find(type);
+  }
+
+  /**
+   * Creates a native sql query.
+   */
+  protected Query<T> nativeSql(String nativeSql) {
+    return db().findNative(type, nativeSql);
+  }
+
+  /**
+   * Creates a query using the ORM query language.
+   */
+  protected Query<T> query(String ormQuery) {
+    return db().createQuery(type, ormQuery);
+  }
+}
@@ -0,0 +1,178 @@
+package io.ebean;
+
+import io.ebean.bean.EntityBean;
+
+/**
+ * Provides finder functionality for use with "Dependency Injection style" use of Ebean.
+ * <p>
+ * <pre>{@code
+ *
+ * @Repository
+ * public class CustomerRepository extends BeanRepository<Long,Customer> {
+ *
+ *   @Inject
+ *   public CustomerRepository(EbeanServer server) {
+ *     super(Customer.class, server);
+ *   }
+ *
+ *   // ... add customer specific finders and persist logic
+ *
+ *   public List<Customer> findByName(String nameStart) {
+ *     return query().where()
+ *             .istartsWith("name", nameStart)
+ *             .findList();
+ *   }
+ *
+ * }
+ * }</pre>
+ *
+ * @param <I> The ID type
+ * @param <T> The Bean type
+ */
+public abstract class BeanRepository<I, T> extends BeanFinder<I, T> {
+
+  /**
+   * Create with the given bean type and EbeanServer instance.
+   * <p>
+   * Typically users would extend BeanRepository rather than BeanFinder.
+   * </p>
+   * <pre>{@code
+   *
+   *   @Inject
+   *   public CustomerRepository(EbeanServer server) {
+   *     super(Customer.class, server);
+   *   }
+   *
+   * }</pre>
+   *
+   * @param type   The bean type
+   * @param server The EbeanServer instance typically created via Spring factory or equivalent
+   */
+  protected BeanRepository(Class<T> type, EbeanServer server) {
+    super(type, server);
+  }
+
+  /**
+   * Marks the entity bean as dirty.
+   * <p>
+   * This is used so that when a bean that is otherwise unmodified is updated the version
+   * property is updated.
+   * <p>
+   * An unmodified bean that is saved or updated is normally skipped and this marks the bean as
+   * dirty so that it is not skipped.
+   * <p>
+   * <pre>{@code
+   *
+   * Customer customer = customerRepository.byId(id);
+   *
+   * // mark the bean as dirty so that a save() or update() will
+   * // increment the version property
+   *
+   * customerRepository.markAsDirty(customer);
+   * customerRepository.save(customer);
+   *
+   * }</pre>
+   *
+   * @see EbeanServer#markAsDirty(Object)
+   */
+  public void markAsDirty(T bean) {
+    db().markAsDirty(bean);
+  }
+
+  /**
+   * Mark the property as unset or 'not loaded'.
+   * <p>
+   * This would be used to specify a property that we did not wish to include in a stateless update.
+   * </p>
+   * <pre>{@code
+   *
+   *   // populate an entity bean from JSON or whatever
+   *   Customer customer = ...;
+   *
+   *   // mark the email property as 'unset' so that it is not
+   *   // included in a 'stateless update'
+   *   customerRepository.markPropertyUnset(customer, "email");
+   *
+   *   customerRepository.update(customer);
+   *
+   * }</pre>
+   *
+   * @param propertyName the name of the property on the bean to be marked as 'unset'
+   */
+  public void markPropertyUnset(T bean, String propertyName) {
+    ((EntityBean) bean)._ebean_getIntercept().setPropertyLoaded(propertyName, false);
+  }
+
+  /**
+   * Insert or update this entity depending on its state.
+   * <p>
+   * 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)
+   */
+  public void save(T bean) {
+    db().save(bean);
+  }
+
+  /**
+   * Update this entity.
+   *
+   * @see EbeanServer#update(Object)
+   */
+  public void update(T bean) {
+    db().update(bean);
+  }
+
+  /**
+   * Insert this entity.
+   *
+   * @see EbeanServer#insert(Object)
+   */
+  public void insert(T bean) {
+    db().insert(bean);
+  }
+
+  /**
+   * Delete this bean.
+   * <p>
+   * This will return true if the bean was deleted successfully or JDBC batch is being used.
+   * </p>
+   * <p>
+   * If there is no current transaction one will be created and committed for
+   * you automatically.
+   * </p>
+   * <p>
+   * If the Bean does not have a version property (or loaded version property) and
+   * the bean does not exist then this returns false indicating that nothing was
+   * deleted. Note that, if JDBC batch mode is used then this always returns true.
+   * </p>
+   *
+   * @see EbeanServer#delete(Object)
+   */
+  public boolean delete(T bean) {
+    return db().delete(bean);
+  }
+
+  /**
+   * Delete a bean permanently without soft delete.
+   * <p>
+   * This is used when the bean contains a <code>@SoftDelete</code> property and we
+   * want to perform a hard/permanent delete.
+   * </p>
+   *
+   * @see EbeanServer#deletePermanent(Object)
+   */
+  public boolean deletePermanent(T bean) {
+    return db().deletePermanent(bean);
+  }
+
+  /**
+   * Refreshes this entity from the database.
+   *
+   * @see EbeanServer#refresh(Object)
+   */
+  public void refresh(T bean) {
+    db().refresh(bean);
+  }
+}
@@ -1,6 +1,5 @@
 package io.ebean;

-import java.beans.PropertyChangeListener;
 import java.util.Map;
 import java.util.Set;

@@ -99,16 +98,6 @@ public interface BeanState {
   */
  void setReadOnly(boolean readOnly);

-  /**
-   * Add a propertyChangeListener.
-   */
-  void addPropertyChangeListener(PropertyChangeListener listener);
-
-  /**
-   * Remove a propertyChangeListener.
-   */
-  void removePropertyChangeListener(PropertyChangeListener listener);
-
  /**
   * Advanced - Used to programmatically build a partially or fully loaded
   * entity bean. First create an entity bean via
@@ -1,55 +1,91 @@
 package io.ebean;
+
 /**
- * Enum to control the different cache modes for queryCache (and maybe later) beanCache.
- * 
- * If cache is enabled, you must be careful, what you do with the returned collection.
+ * Enum to control the different cache modes for queryCache and beanCache.
+ * <h3>Bean cache</h3>
+ * <p>
+ * The bean cache is automatically used by default on <code>@Cache</code> beans for
+ * the following queries:
+ * </p>
+ * <ul>
+ * <li>findOne() by id</li>
+ * <li>findOne() by natural key(s)</li>
+ * <li>findList() by ids</li>
+ * </ul>
+ * <p>
+ * Bean caching needs to be explicitly turned on for queries that are findList() by natural keys.
+ * </p>
+ * <h3>Query cache</h3>
+ * <p>
+ * For query cache use note that you must be careful, what you do with the returned collection.
 * By default the returned collections are read only and you will get an exception if you try
 * to change them.
 * If you add ".setReadOnly(false)" to your query, you'll get a collection that is a clone from the
- * one in the cache. That means, changing does not affect the cache
- * 
+ * one in the cache. That means, changing does not affect the cache.
+ * </p>
+ *
 * @author Roland Praml, FOCONIS AG
 */
 public enum CacheMode {
+
  /**
   * Do not use cache.
   */
  OFF(false, false),
-  
+
  /**
-   * Use the cace (query & store the resut). 
+   * Use the cache and store a result when needed.
   */
-  ON(true, true), 
-  
+  ON(true, true),
+
  /**
-   * Do not read from cache, but write retrived value to cache.
-   * Use this, if you want to get the fresh value from database and a CacheMode.ON query will follow.
+   * Only used for bean caching.
+   * <p>
+   * The bean cache is automatically used by default on <code>@Cache</code> beans for
+   * the following queries:
+   * </p>
+   * <ul>
+   * <li>findOne() by id</li>
+   * <li>findOne() by natural key(s)</li>
+   * <li>findList() by ids</li>
+   * </ul>
+   * <p>
+   * Bean caching needs to be explicitly turned on for queries that are findList() by natural keys.
+   * </p>
   */
-  RECACHE(false, true),
-  
+  AUTO(true, true),
+
  /**
-   * Query the cache for value. If it is there, use it, otherwise hit database but do NOT put the value
-   * into the cache. (this mode is for completeness. There's probably no use case for this)
+   * Do not read from cache, but put beans into the cache and invalidate parts of the cache as necessary.
+   * <p>
+   * Use this on a query if you want to get the fresh value from database and put it into the cache.
   */
-  QUERY_ONLY(true,false);
-  
+  PUT(false, true),
+
+  /**
+   * GET only from the cache.
+   * <p>
+   * This mode does not put entries into the cache or invalidate parts of the cache.
+   */
+  GET(true, false);
+
  private boolean get;
  private boolean put;

-  private CacheMode(boolean get, boolean put) {
+  CacheMode(boolean get, boolean put) {
    this.get = get;
    this.put = put;
  }
-  
+
  /**
-   * Retruns <code>true</code> if value is read from cache.
+   * Return true if value is read from cache.
   */
  public boolean isGet() {
    return get;
  }
-  
+
  /**
-   * Returns <code>true</code> if value (from database) is written to cache.
+   * Return true if a newly loaded value (from database) is put into the cache.
   */
  public boolean isPut() {
    return put;
@@ -0,0 +1,27 @@
+package io.ebean;
+/**
+ * Enumeration to use with {@link Query#setCountDistinct(CountDistinctOrder)}.
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public enum CountDistinctOrder {
+  NO_ORDERING,
+  
+  /** order by attribute ascending */
+  ATTR_ASC, 
+  
+  /** order by attribute descending */
+  ATTR_DESC, 
+  
+  /** order by count ascending and attribute ascending */
+  COUNT_ASC_ATTR_ASC,
+  
+  /** order by count ascending and attribute descending */
+  COUNT_ASC_ATTR_DESC,
+  
+  /** order by count descending and attribute ascending */
+  COUNT_DESC_ATTR_ASC,
+  
+  /** order by count descending and attribute descending */
+  COUNT_DESC_ATTR_DESC,
+}
@@ -0,0 +1,33 @@
+package io.ebean;
+
+import java.io.Serializable;
+/**
+ * Holds a distinct value with it's count.
+ * (Used with {@link Query#findSingleAttributeList()} and {@link Query#setCountDistinct(CountDistinctOrder)}.)
+ * @author Roland Praml, FOCONIS AG
+ */
+public class CountedValue<A> implements Serializable {
+  private static final long serialVersionUID = -2267971668356749695L;
+
+  private final A value;
+  private final long count;
+
+  public CountedValue(A value, long count) {
+    this.value = value;
+    this.count = count;
+  }
+
+  public long getCount() {
+    return count;
+  }
+  
+  public A getValue() {
+    return value;
+  }
+  
+  @Override
+  public String toString() {
+    return count + ": " + value;
+  }
+  
+}
@@ -2,7 +2,7 @@ package io.ebean;

 import io.ebeanservice.docstore.api.DocQueryRequest;
 import io.ebeanservice.docstore.api.RawDoc;
-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nullable;

 import java.io.IOException;
 import java.util.List;
@@ -123,11 +123,8 @@ public interface DocumentStore {
   *  server.find(Order.class)
   *    .setUseDocStore(true)
   *    .where()... // perhaps add predicates
-   *    .findEach(new QueryEachConsumer<Order>() {
-   *      @Override
-   *      public void accept(Order bean) {
-   *        // process the bean
-   *      }
+   *    .findEach((Order order) -> {
+   *      // process the bean ...
   *    });
   *
   * }</pre>
@@ -151,7 +148,7 @@ public interface DocumentStore {
   *  server.find(Order.class)
   *    .setUseDocStore(true)
   *    .where()... // perhaps add predicates
-   *    .findEachWhile(new QueryEachWhileConsumer<Order>() {
+   *    .findEachWhile(new Predicate<Order>() {
   *      @Override
   *      public void accept(Order bean) {
   *        // process the bean
@@ -0,0 +1,133 @@
+package io.ebean;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+
+/**
+ * Query for performing native SQL queries that return DTO Bean's.
+ * <p>
+ * These beans are just normal classes. They must have public constructors
+ * and setters.
+ * <p>
+ * Constructors with arguments are used if the number of constructor arguments
+ * matches the number of columns in the resultSet.
+ * </p>
+ * <p>
+ * If the number of columns in the resultSet is greater than the largest constructor
+ * then the largest constructor is used for the first columns and remaining columns
+ * are mapped by setter methods.
+ * </p>
+ *
+ * <pre>{@code
+ *
+ *   // CustomerDto is just a 'bean like' class
+ *   // with public constructor(s) and public setter methods
+ *
+ *   String sql = "select id, name from customer where name like :name and status_code = :status";
+ *
+ *   List<CustomerDto> beans =
+ *     Ebean.findDto(CustomrDto.class, sql)
+ *     .setParameter("name", "Acme%")
+ *     .setParameter("status", "ACTIVE")
+ *     .findList();
+ *
+ * }</pre>
+ */
+public interface DtoQuery<T> {
+
+  /**
+   * Execute the query returning a list.
+   */
+  @Nonnull
+  List<T> findList();
+
+  /**
+   * Execute the query iterating a row at a time.
+   * <p>
+   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
+   * </p>
+   */
+  void findEach(Consumer<T> consumer);
+
+  /**
+   * Execute the query iterating a row at a time with the ability to stop consuming part way through.
+   * <p>
+   * Returning false after processing a row stops the iteration through the query results.
+   * </p>
+   * <p>
+   * This streaming type query is useful for large query execution as only 1 row needs to be held in memory.
+   * </p>
+   */
+  void findEachWhile(Predicate<T> consumer);
+
+  /**
+   * Execute the query returning a single bean.
+   */
+  @Nullable
+  T findOne();
+
+  /**
+   * Execute the query returning an optional bean.
+   */
+  @Nonnull
+  Optional<T> findOneOrEmpty();
+
+  /**
+   * The same as bind for named parameters.
+   */
+  DtoQuery<T> setParameter(String name, Object value);
+
+  /**
+   * The same as bind for positioned parameters.
+   */
+  DtoQuery<T> setParameter(int position, Object value);
+
+  /**
+   * Set the index of the first row of the results to return.
+   */
+  DtoQuery<T> setFirstRow(int firstRow);
+
+  /**
+   * Set the maximum number of query results to return.
+   */
+  DtoQuery<T> setMaxRows(int maxRows);
+
+  /**
+   * When resultSet columns are not able to be mapped to a bean property then instead of
+   * throwing effectively skip reading that column.
+   */
+  DtoQuery<T> setRelaxedMode();
+
+  /**
+   * Set a label on the query to make it easier to identify queries related to query execution statistics.
+   *
+   * @param label A label that is unique to the DTO bean type.
+   */
+  DtoQuery<T> setLabel(String label);
+
+  /**
+   * Set a timeout on this query.
+   * <p>
+   * This will typically result in a call to setQueryTimeout() on a
+   * preparedStatement. If the timeout occurs an exception will be thrown - this
+   * will be a SQLException wrapped up in a PersistenceException.
+   * </p>
+   *
+   * @param secs the query timeout limit in seconds. Zero means there is no limit.
+   */
+  DtoQuery<T> setTimeout(int secs);
+
+  /**
+   * A hint which for JDBC translates to the Statement.fetchSize().
+   * <p>
+   * Gives the JDBC driver a hint as to the number of rows that should be
+   * fetched from the database when more rows are needed for ResultSet.
+   * </p>
+   */
+  DtoQuery<T> setBufferFetchSizeHint(int bufferFetchSizeHint);
+
+}
@@ -3,18 +3,21 @@ package io.ebean;
 import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.config.ServerConfig;
+import io.ebean.plugin.Property;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
-import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;

@@ -114,6 +117,10 @@ import java.util.concurrent.ConcurrentHashMap;
 public final class Ebean {
  private static final Logger logger = LoggerFactory.getLogger(Ebean.class);

+  static {
+    EbeanVersion.getVersion(); // initalizes the version class and logs the version.
+  }
+
  /**
   * Manages creation and cache of EbeanServers.
   */
@@ -131,8 +138,7 @@ public final class Ebean {
    private final ConcurrentHashMap<String, EbeanServer> concMap = new ConcurrentHashMap<>();

    /**
-     * Cache for synchronized read, creation and put. Protected by the monitor
-     * object.
+     * Cache for synchronized read, creation and put. Protected by the monitor object.
     */
    private final HashMap<String, EbeanServer> syncMap = new HashMap<>();

@@ -146,14 +152,7 @@ public final class Ebean {
    private ServerManager() {

      try {
-        // skipDefaultServer is set by EbeanServerFactory
-        // ... when it is creating the primaryServer
-        if (PrimaryServer.isSkip()) {
-          // primary server being created by EbeanServerFactory
-          // ... so we should not try and create it here
-          logger.debug("PrimaryServer.isSkip()");
-
-        } else {
+        if (!PrimaryServer.isSkip()) {
          // look to see if there is a default server defined
          String defaultName = PrimaryServer.getDefaultServerName();
          logger.debug("defaultName:{}", defaultName);
@@ -376,7 +375,7 @@ public final class Ebean {
   * Note that this provides an try finally alternative to using {@link #executeCall(TxScope, Callable)} or
   * {@link #execute(TxScope, Runnable)}.
   * </p>
-   *
+   * <p>
   * <h3>REQUIRES_NEW example:</h3>
   * <pre>{@code
   * // Start a new transaction. If there is a current transaction
@@ -646,6 +645,65 @@ public final class Ebean {
    return serverMgr.getDefaultServer().saveAll(beans);
  }

+  /**
+   * This method checks the uniqueness of a bean. I.e. if the save will work. It will return the
+   * properties that violates an unique / primary key. This may be done in an UI save action to
+   * validate if the user has entered correct values.
+   * <p>
+   * Note: This method queries the DB for uniqueness of all indices, so do not use it in a batch update.
+   * <p>
+   * Note: This checks only the root bean!
+   * <p>
+   * <pre>{@code
+   *
+   *   // there is a unique constraint on title
+   *
+   *   Document doc = new Document();
+   *   doc.setTitle("One flew over the cuckoo's nest");
+   *   doc.setBody("clashes with doc1");
+   *
+   *   Set<Property> properties = server().checkUniqueness(doc);
+   *
+   *   if (properties.isEmpty()) {
+   *     // it is unique ... carry on
+   *
+   *   } else {
+   *     // build a user friendly message
+   *     // to return message back to user
+   *
+   *     String uniqueProperties = properties.toString();
+   *
+   *     StringBuilder msg = new StringBuilder();
+   *
+   *     properties.forEach((it)-> {
+   *       Object propertyValue = it.getVal(doc);
+   *       String propertyName = it.getName();
+   *       msg.append(" property["+propertyName+"] value["+propertyValue+"]");
+   *     });
+   *
+   *     // uniqueProperties > [title]
+   *     //       custom msg > property[title] value[One flew over the cuckoo's nest]
+   *
+   *  }
+   *
+   * }</pre>
+   *
+   * @param bean The entity bean to check uniqueness on
+   * @return a set of Properties if constraint validation was detected or empty list.
+   */
+  @Nonnull
+  public static Set<Property> checkUniqueness(Object bean) {
+    return serverMgr.getDefaultServer().checkUniqueness(bean);
+  }
+
+  /**
+   * Same as {@link #checkUniqueness(Object)}. but with given transaction.
+   */
+  @Nonnull
+  public static Set<Property> checkUniqueness(Object bean, Transaction transaction) {
+    return serverMgr.getDefaultServer().checkUniqueness(bean, transaction);
+  }
+
  /**
   * Delete the bean.
   * <p>
@@ -1058,6 +1116,21 @@ public final class Ebean {
    return serverMgr.getDefaultServer().findNative(beanType, nativeSql);
  }

+  /**
+   * Create a Query for DTO beans.
+   * <p>
+   * DTO beans are just normal bean like classes with public constructor(s) and setters.
+   * They do not need to be registered with Ebean before use.
+   * </p>
+   *
+   * @param dtoType The type of the DTO bean the rows will be mapped into.
+   * @param sql     The SQL query to execute.
+   * @param <T>     The type of the DTO bean.
+   */
+  public static <T> DtoQuery<T> findDto(Class<T> dtoType, String sql) {
+    return serverMgr.getDefaultServer().findDto(dtoType, sql);
+  }
+
  /**
   * Create an Update query to perform a bulk update.
   * <p>
@@ -4,11 +4,13 @@ import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.config.ServerConfig;
 import io.ebean.meta.MetaInfoManager;
+import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
-import org.jetbrains.annotations.Nullable;

+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.persistence.NonUniqueResultException;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
@@ -422,6 +424,19 @@ public interface EbeanServer {
   */
  <T> Update<T> createUpdate(Class<T> beanType, String ormUpdate);

+  /**
+   * Create a Query for DTO beans.
+   * <p>
+   * DTO beans are just normal bean like classes with public constructor(s) and setters.
+   * They do not need to be registered with Ebean before use.
+   * </p>
+   *
+   * @param dtoType The type of the DTO bean the rows will be mapped into.
+   * @param sql     The SQL query to execute.
+   * @param <T>     The type of the DTO bean.
+   */
+  <T> DtoQuery<T> findDto(Class<T> dtoType, String sql);
+
  /**
   * Create a SqlQuery for executing native sql
   * query statements.
@@ -732,6 +747,7 @@ public interface EbeanServer {
   * @param beanType the type of entity bean to fetch
   * @param id       the id value
   */
+  @Nullable
  <T> T find(Class<T> beanType, Object id);

  /**
@@ -775,6 +791,7 @@ public interface EbeanServer {
   * @param beanType the type of entity bean
   * @param id       the id value
   */
+  @Nonnull
  <T> T getReference(Class<T> beanType, Object id);

  /**
@@ -790,6 +807,7 @@ public interface EbeanServer {
   *
   * @see Query#findIds()
   */
+  @Nonnull
  <A, T> List<A> findIds(Query<T> query, Transaction transaction);

  /**
@@ -809,6 +827,7 @@ public interface EbeanServer {
   * @see Query#findEach(Consumer)
   * @see Query#findEachWhile(Predicate)
   */
+  @Nonnull
  <T> QueryIterator<T> findIterate(Query<T> query, Transaction transaction);

  /**
@@ -845,7 +864,7 @@ public interface EbeanServer {
   * Execute the query visiting the each bean one at a time.
   * <p>
   * Compared to findEach() this provides the ability to stop processing the query
-   * results early by returning false for the QueryEachWhileConsumer.
+   * results early by returning false for the Predicate.
   * </p>
   * <p>
   * Unlike findList() this is suitable for processing a query that will return
@@ -885,6 +904,7 @@ public interface EbeanServer {
   * It will execute the query against the history returning the versions of the bean.
   * </p>
   */
+  @Nonnull
  <T> List<Version<T>> findVersions(Query<T> query, Transaction transaction);

  /**
@@ -910,6 +930,7 @@ public interface EbeanServer {
   * @return the list of fetched beans.
   * @see Query#findList()
   */
+  @Nonnull
  <T> List<T> findList(Query<T> query, Transaction transaction);

  /**
@@ -925,6 +946,7 @@ public interface EbeanServer {
   * @return a Future object for the row count query
   * @see Query#findFutureCount()
   */
+  @Nonnull
  <T> FutureRowCount<T> findFutureCount(Query<T> query, Transaction transaction);

  /**
@@ -940,6 +962,7 @@ public interface EbeanServer {
   * @return a Future object for the list of Id's
   * @see Query#findFutureIds()
   */
+  @Nonnull
  <T> FutureIds<T> findFutureIds(Query<T> query, Transaction transaction);

  /**
@@ -956,6 +979,7 @@ public interface EbeanServer {
   * @return a Future object for the list result of the query
   * @see Query#findFutureList()
   */
+  @Nonnull
  <T> FutureList<T> findFutureList(Query<T> query, Transaction transaction);

  /**
@@ -987,6 +1011,7 @@ public interface EbeanServer {
   * @return The PagedList
   * @see Query#findPagedList()
   */
+  @Nonnull
  <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction);

  /**
@@ -1012,6 +1037,7 @@ public interface EbeanServer {
   * @return the set of fetched beans.
   * @see Query#findSet()
   */
+  @Nonnull
  <T> Set<T> findSet(Query<T> query, Transaction transaction);

  /**
@@ -1028,6 +1054,7 @@ public interface EbeanServer {
   * @return the map of fetched beans.
   * @see Query#findMap()
   */
+  @Nonnull
  <K, T> Map<K, T> findMap(Query<T> query, Transaction transaction);

  /**
@@ -1060,6 +1087,7 @@ public interface EbeanServer {
   * @return the list of values for the selected property
   * @see Query#findSingleAttributeList()
   */
+  @Nonnull
  <A, T> List<A> findSingleAttributeList(Query<T> query, Transaction transaction);

  /**
@@ -1087,21 +1115,9 @@ public interface EbeanServer {
  /**
   * Similar to findOne() but returns an Optional (rather than nullable).
   */
+  @Nonnull
  <T> Optional<T> findOneOrEmpty(Query<T> query, Transaction transaction);

-  /**
-   * Deprecated - please migrate to findOne().
-   * <p>
-   * This proceeded findOne which was introduced to better match spring data.
-   * This will be deprecated at some future point.
-   * </p>
-   */
-  @Deprecated
-  @Nullable
-  default <T> T findUnique(Query<T> query, Transaction transaction) {
-    return findOne(query, transaction);
-  }
-
  /**
   * Execute as a delete query deleting the 'root level' beans that match the predicates
   * in the query.
@@ -1143,6 +1159,7 @@ public interface EbeanServer {
   * @return the list of fetched MapBean.
   * @see SqlQuery#findList()
   */
+  @Nonnull
  List<SqlRow> findList(SqlQuery query, Transaction transaction);

  /**
@@ -1184,19 +1201,6 @@ public interface EbeanServer {
  @Nullable
  SqlRow findOne(SqlQuery query, Transaction transaction);

-  /**
-   * Deprecated - please migrate to findOne().
-   * <p>
-   * This proceeded findOne which was introduced to better match spring data.
-   * This will be deprecated at some future point.
-   * </p>
-   */
-  @Deprecated
-  @Nullable
-  default SqlRow findUnique(SqlQuery query, Transaction transaction) {
-    return findOne(query, transaction);
-  }
-
  /**
   * Either Insert or Update the bean depending on its state.
   * <p>
@@ -1470,6 +1474,61 @@ public interface EbeanServer {
   */
  int saveAll(Collection<?> beans, Transaction transaction) throws OptimisticLockException;

+  /**
+   * This method checks the uniqueness of a bean. I.e. if the save will work. It will return the
+   * properties that violates an unique / primary key. This may be done in an UI save action to
+   * validate if the user has entered correct values.
+   * <p>
+   * Note: This method queries the DB for uniqueness of all indices, so do not use it in a batch update.
+   * <p>
+   * Note: This checks only the root bean!
+   * <p>
+   * <pre>{@code
+   *
+   *   // there is a unique constraint on title
+   *
+   *   Document doc = new Document();
+   *   doc.setTitle("One flew over the cuckoo's nest");
+   *   doc.setBody("clashes with doc1");
+   *
+   *   Set<Property> properties = server().checkUniqueness(doc);
+   *
+   *   if (properties.isEmpty()) {
+   *     // it is unique ... carry on
+   *
+   *   } else {
+   *     // build a user friendly message
+   *     // to return message back to user
+   *
+   *     String uniqueProperties = properties.toString();
+   *
+   *     StringBuilder msg = new StringBuilder();
+   *
+   *     properties.forEach((it)-> {
+   *       Object propertyValue = it.getVal(doc);
+   *       String propertyName = it.getName();
+   *       msg.append(" property["+propertyName+"] value["+propertyValue+"]");
+   *     });
+   *
+   *     // uniqueProperties > [title]
+   *     //       custom msg > property[title] value[One flew over the cuckoo's nest]
+   *
+   *  }
+   *
+   * }</pre>
+   *
+   * @param bean The entity bean to check uniqueness on
+   * @return a set of Properties if constraint validation was detected or empty list.
+   */
+  @Nonnull
+  Set<Property> checkUniqueness(Object bean);
+
+  /**
+   * Same as {@link #checkUniqueness(Object)}. but with given transaction.
+   */
+  @Nonnull
+  Set<Property> checkUniqueness(Object bean, Transaction transaction);
+
  /**
   * Marks the entity bean as dirty.
   * <p>
@@ -33,6 +33,10 @@ public class EbeanServerFactory {

  private static SpiContainer container;

+  static {
+    EbeanVersion.getVersion(); // initalizes the version class and logs the version.
+  }
+
  /**
   * Initialise the container with clustering configuration.
   * <p>
@@ -65,10 +69,8 @@ public class EbeanServerFactory {

    EbeanServer server = createInternal(config);

-    if (config.isDefaultServer()) {
-      PrimaryServer.setSkip(true);
-    }
    if (config.isRegister()) {
+      PrimaryServer.setSkip(true);
      Ebean.register(server, config.isDefaultServer());
    }

@@ -0,0 +1,43 @@
+package io.ebean;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+/**
+ * Class to determine the ebean version. (
+ * @author Roland Praml, FOCONIS AG
+ *
+ */
+public class EbeanVersion {
+  private EbeanVersion() {
+    
+  }
+  private static final Logger logger = LoggerFactory.getLogger(EbeanVersion.class);
+  
+  private static String version = "unknown";
+  static {
+    try {
+      Properties prop = new Properties();
+      InputStream in = Ebean.class.getResourceAsStream("/META-INF/maven/io.ebean/ebean/pom.properties");
+      if (in != null) {
+        prop.load(in);
+        in.close();
+        version = prop.getProperty("version");
+      }
+      logger.info("ebean version: {}", version);
+    } catch (IOException e) {
+      logger.warn("Could not determine ebean version: {}", e.getMessage());
+    }
+  }
+  
+  /**
+   * Returns the ebean version (read from /META-INF/maven/io.ebean/ebean/pom.properties)
+   */
+  public static String getVersion() {
+    return version;
+  }
+  
+}
@@ -246,6 +246,11 @@ public interface ExpressionFactory {
   */
  Expression icontains(String propertyName, String value);

+  /**
+   * In expression using pairs of value objects.
+   */
+  Expression inPairs(Pairs pairs);
+
  /**
   * In - property has a value in the array of values.
   */
@@ -5,8 +5,9 @@ import io.ebean.search.MultiMatch;
 import io.ebean.search.TextCommonTerms;
 import io.ebean.search.TextQueryString;
 import io.ebean.search.TextSimple;
-import org.jetbrains.annotations.Nullable;

+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.persistence.NonUniqueResultException;
 import java.sql.Timestamp;
 import java.util.Collection;
@@ -192,6 +193,7 @@ public interface ExpressionList<T> {
   *
   * @see Query#findList()
   */
+  @Nonnull
  List<T> findList();

  /**
@@ -199,6 +201,7 @@ public interface ExpressionList<T> {
   *
   * @see Query#findIds()
   */
+  @Nonnull
  <A> List<A> findIds();

  /**
@@ -214,6 +217,7 @@ public interface ExpressionList<T> {
   *
   * @see Query#findSet()
   */
+  @Nonnull
  Set<T> findSet();

  /**
@@ -221,6 +225,7 @@ public interface ExpressionList<T> {
   *
   * @see Query#findMap()
   */
+  @Nonnull
  <K> Map<K, T> findMap();

  /**
@@ -253,8 +258,27 @@ public interface ExpressionList<T> {
   *
   * @return the list of values for the selected property
   */
+  @Nonnull
  <A> List<A> findSingleAttributeList();

+  /**
+   * Execute a query returning a single value of a single property/column.
+   * <p>
+   * <pre>{@code
+   *
+   *  String name =
+   *    Ebean.find(Customer.class)
+   *      .select("name")
+   *      .where().eq("id", 42)
+   *      .findSingleAttribute();
+   *
+   * }</pre>
+   */
+  default <A> A findSingleAttribute() {
+    List<A> list = findSingleAttributeList();
+    return !list.isEmpty() ? list.get(0) : null;
+  }
+
  /**
   * Execute the query returning a single bean or null (if no matching
   * bean is found).
@@ -272,21 +296,9 @@ public interface ExpressionList<T> {
  /**
   * Execute the query returning an optional bean.
   */
+  @Nonnull
  Optional<T> findOneOrEmpty();

-  /**
-   * Deprecated - please migrate to findOne().
-   * <p>
-   * This proceeded findOne which was introduced to better match spring data.
-   * This will be deprecated at some future point.
-   * </p>
-   */
-  @Deprecated
-  @Nullable
-  default T findUnique() {
-    return findOne();
-  }
-
  /**
   * Execute find row count query in a background thread.
   * <p>
@@ -297,6 +309,7 @@ public interface ExpressionList<T> {
   *
   * @return a Future object for the row count query
   */
+  @Nonnull
  FutureRowCount<T> findFutureCount();

  /**
@@ -309,6 +322,7 @@ public interface ExpressionList<T> {
   *
   * @return a Future object for the list of Id's
   */
+  @Nonnull
  FutureIds<T> findFutureIds();

  /**
@@ -321,6 +335,7 @@ public interface ExpressionList<T> {
   *
   * @return a Future object for the list result of the query
   */
+  @Nonnull
  FutureList<T> findFutureList();

  /**
@@ -352,6 +367,7 @@ public interface ExpressionList<T> {
   * @return The PagedList
   * @see Query#findPagedList()
   */
+  @Nonnull
  PagedList<T> findPagedList();

  /**
@@ -361,6 +377,7 @@ public interface ExpressionList<T> {
   * It will execute the query against the history returning the versions of the bean.
   * </p>
   */
+  @Nonnull
  List<Version<T>> findVersions();

  /**
@@ -370,11 +387,13 @@ public interface ExpressionList<T> {
   * It will execute the query against the history returning the versions of the bean.
   * </p>
   */
+  @Nonnull
  List<Version<T>> findVersionsBetween(Timestamp start, Timestamp end);

  /**
   * Add some filter predicate expressions to the many property.
   */
+  @Nonnull
  ExpressionList<T> filterMany(String prop);

  /**
@@ -438,28 +457,68 @@ public interface ExpressionList<T> {
  Query<T> setMapKey(String mapKey);

  /**
-   * Set to true to use the query for executing this query.
+   * Set to true when this query should use the bean cache.
+   * <p>
+   * This is now the same as setUseBeanCache(CacheMode.ON) and will be deprecated.
+   * </p>
   *
   * @see Query#setUseCache(boolean)
   */
  Query<T> setUseCache(boolean useCache);

  /**
-   * Set the {@link CacheMode} to use the query for executing this query.
+   * Set the mode to use the bean cache when executing this query.
+   *
+   * @see Query#setBeanCacheMode(CacheMode)
+   */
+  Query<T> setBeanCacheMode(CacheMode beanCacheMode);
+
+  /**
+   * Set the {@link CacheMode} to use the query cache for executing this query.
   *
   * @see Query#setUseQueryCache(boolean)
   */
  Query<T> setUseQueryCache(CacheMode useCache);

+  /**
+   * Extended version for setDistinct in conjunction with "findSingleAttributeList";
+   *
+   * <pre>{@code
+   *
+   *  List<CountedValue<Order.Status>> orderStatusCount =
+   *
+   *     Ebean.find(Order.class)
+   *      .select("status")
+   *      .where()
+   *      .gt("orderDate", LocalDate.now().minusMonths(3))
+   *
+   *      // fetch as single attribute with a COUNT
+   *      .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
+   *      .findSingleAttributeList();
+   *
+   *     for (CountedValue<Order.Status> entry : orderStatusCount) {
+   *       System.out.println(" count:" + entry.getCount()+" orderStatus:" + entry.getValue() );
+   *     }
+   *
+   *   // produces
+   *
+   *   count:3 orderStatus:NEW
+   *   count:1 orderStatus:SHIPPED
+   *   count:1 orderStatus:COMPLETE
+   *
+   * }</pre>
+   */
+  Query<T> setCountDistinct(CountDistinctOrder orderBy);
+
  /**
   * Calls {@link #setUseQueryCache(CacheMode)} with <code>ON</code> or <code>OFF</code>.
-   * 
+   *
   * @see Query#setUseQueryCache(CacheMode)
   */
  default Query<T> setUseQueryCache(boolean enabled) {
    return setUseQueryCache(enabled ? CacheMode.ON : CacheMode.OFF);
  }
-  
+
  /**
   * Set to true if this query should execute against the doc store.
   * <p>
@@ -792,6 +851,11 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> icontains(String propertyName, String value);

+  /**
+   * In expression using pairs of value objects.
+   */
+  ExpressionList<T> inPairs(Pairs pairs);
+
  /**
   * In - using a subQuery.
   */
@@ -807,6 +871,36 @@ public interface ExpressionList<T> {
   */
  ExpressionList<T> in(String propertyName, Collection<?> values);

+  /**
+   * In - using a subQuery.
+   *
+   * This is exactly the same as in() and provided due to "in" being a Kotlin keyword
+   * (and hence to avoid the slightly ugly escaping when using in() in Kotlin)
+   */
+  default ExpressionList<T> isIn(String propertyName, Query<?> subQuery) {
+    return in(propertyName, subQuery);
+  }
+
+  /**
+   * In - property has a value in the array of values.
+   *
+   * This is exactly the same as in() and provided due to "in" being a Kotlin keyword
+   * (and hence to avoid the slightly ugly escaping when using in() in Kotlin)
+   */
+  default ExpressionList<T> isIn(String propertyName, Object... values) {
+    return in(propertyName, values);
+  }
+
+  /**
+   * In - property has a value in the collection of values.
+   *
+   * This is exactly the same as in() and provided due to "in" being a Kotlin keyword
+   * (and hence to avoid the slightly ugly escaping when using in() in Kotlin)
+   */
+  default ExpressionList<T> isIn(String propertyName, Collection<?> values) {
+    return in(propertyName, values);
+  }
+
  /**
   * Not In - property has a value in the array of values.
   */
@@ -1,6 +1,7 @@
 package io.ebean;

-import org.jetbrains.annotations.Nullable;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;

 import java.util.List;

@@ -92,6 +93,20 @@ public class Finder<I, T> {
    this.serverName = serverName;
  }

+  /**
+   * Return the current transaction.
+   */
+  public Transaction currentTransaction() {
+    return db().currentTransaction();
+  }
+
+  /**
+   * Flush the JDBC batch on the current transaction.
+   */
+  public void flush() {
+    db().flush();
+  }
+
  /**
   * Return the underlying 'default' EbeanServer.
   * <p>
@@ -118,6 +133,7 @@ public class Finder<I, T> {
   * <p>
   * Equivalent to {@link EbeanServer#getReference(Class, Object)}
   */
+  @Nonnull
  public T ref(I id) {
    return db().getReference(type, id);
  }
@@ -144,10 +160,33 @@ public class Finder<I, T> {
  /**
   * Retrieves all entities of the given type.
   */
+  @Nonnull
  public List<T> all() {
    return query().findList();
  }

+  /**
+   * Creates an update query.
+   *
+   * <pre>{@code
+   *
+   *  int rows =
+   *      finder.update()
+   *      .set("status", Customer.Status.ACTIVE)
+   *      .set("updtime", new Timestamp(System.currentTimeMillis()))
+   *      .where()
+   *        .gt("id", 1000)
+   *        .update();
+   *
+   * }</pre>
+   *
+   * <p>
+   * Equivalent to {@link EbeanServer#update(Class)}
+   */
+  public UpdateQuery<T> update() {
+    return db().update(type);
+  }
+
  /**
   * Creates a query.
   * <p>
@@ -170,4 +209,5 @@ public class Finder<I, T> {
  public Query<T> query(String ormQuery) {
    return db().createQuery(type, ormQuery);
  }
+
 }
@@ -1,5 +1,6 @@
 package io.ebean;

+import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.concurrent.Future;

@@ -109,11 +110,13 @@ public interface PagedList<T> {
   *
   * }</pre>
   */
+  @Nonnull
  Future<Integer> getFutureCount();

  /**
   * Return the list of entities for this page.
   */
+  @Nonnull
  List<T> getList();

  /**
@@ -0,0 +1,222 @@
+package io.ebean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Holds a list of value object pairs.
+ * <p>
+ * This feature is to enable use of L2 cache with complex natural keys with findList() queries in cases where the
+ * IN clause is not a single property but instead a pair of properties.
+ * </p>
+ * <p>
+ * These queries can have predicates that can be translated into a list of complex natural keys such that the L2
+ * cache can be hit with these keys to obtain some or all of the beans from L2 cache rather than the DB.
+ * </p>
+ * <pre>{@code
+ *
+ *   // where a bean is annotated with a complex
+ *   // natural key made of several properties
+ *   @Cache(naturalKey = {"store","code","sku"})
+ *
+ *
+ *   Pairs pairs = new Pairs("sku", "code");
+ *   pairs.add("sj2", 1000);
+ *   pairs.add("sj2", 1001);
+ *   pairs.add("pf3", 1000);
+ *
+ *   List<OCachedNatKeyBean3> list = Ebean.find(OCachedNatKeyBean3.class)
+ *   .where()
+ *   .eq("store", "def")
+ *   .inPairs(pairs)       // IN clause with 'pairs' of values
+ *   .orderBy("sku desc")
+ *
+ *   // query expressions cover the natural key properties
+ *   // so we can choose to hit the L2 bean cache if we want
+ *   .setUseCache(true)
+ *   .findList();
+ *
+ * }</pre>
+ * <h3>Important implementation Note</h3>
+ * <p>
+ * When binding many pairs of values we want to be able to utilise a DB index (as this type of query usually means the
+ * pairs are a unique key/index or part of a unique key/index and highly selective). Currently we know we can do this
+ * on any DB that supports expression/formula based indexes.
+ * using a DB string concatenation formula
+ * </p>
+ * <p>
+ * This means, the implementation converts the list of pairs into a list of strings via concatenation and we use a
+ * DB concatenation formula to match. We see SQL like:
+ * </p>
+ * <pre>{@code sql
+ *
+ *   ...
+ *   where t0.store = ?  and (t0.sku||'-'||t0.code) in (?, ? )
+ *
+ *   // bind values like: "sj2-1000", "pf3-1000"
+ *
+ * }</pre>
+ * <p>
+ * We often create a DB expression index to match the DB concat formula like:
+ * </p>
+ * <pre>{@code sql
+ *
+ *   create index ix_name on table_name ((sku || '-' || code));
+ *
+ * }</pre>
+ */
+public class Pairs {
+
+  private final String property0;
+  private final String property1;
+
+  private final List<Entry> entries = new ArrayList<>();
+
+  /**
+   * Character between the values when combined via DB varchar concatenation.
+   */
+  private String concatSeparator = "-";
+
+  /**
+   * Optional suffix added to DB varchar concatenation formula.
+   */
+  private String concatSuffix;
+
+  /**
+   * Create with 2 property names.
+   *
+   * @param property0 The property of the first value
+   * @param property1 The property of the second value
+   */
+  public Pairs(String property0, String property1) {
+    this.property0 = property0;
+    this.property1 = property1;
+  }
+
+  /**
+   * Add a pair of value objects.
+   * <p>
+   * Both values are expected to be immutable with equals and hashCode implementations.
+   * </p>
+   *
+   * @param a Value of the first property
+   * @param b Value of the second property
+   */
+  public Pairs add(Object a, Object b) {
+    entries.add(new Entry(a, b));
+    return this;
+  }
+
+  /**
+   * Return the first property name.
+   */
+  public String getProperty0() {
+    return property0;
+  }
+
+  /**
+   * Return the second property name.
+   */
+  public String getProperty1() {
+    return property1;
+  }
+
+  /**
+   * Return all the value pairs.
+   */
+  public List<Entry> getEntries() {
+    return entries;
+  }
+
+  /**
+   * Return the separator character used with DB varchar concatenation to combine the 2 values.
+   */
+  public String getConcatSeparator() {
+    return concatSeparator;
+  }
+
+  /**
+   * Set the separator character used with DB varchar concatenation to combine the 2 values.
+   */
+  public Pairs setConcatSeparator(String concatSeparator) {
+    this.concatSeparator = concatSeparator;
+    return this;
+  }
+
+  /**
+   * Return  a suffix used with DB varchar concatenation to combine the 2 values.
+   */
+  public String getConcatSuffix() {
+    return concatSuffix;
+  }
+
+  /**
+   * Add a suffix used with DB varchar concatenation to combine the 2 values.
+   */
+  public Pairs setConcatSuffix(String concatSuffix) {
+    this.concatSuffix = concatSuffix;
+    return this;
+  }
+
+  @Override
+  public String toString() {
+    return "p0:" + property0 + " p1:" + property1 + " entries:" + entries;
+  }
+
+  /**
+   * A pair of 2 value objects.
+   * <p>
+   * Used to support inPairs() expression.
+   */
+  public static class Entry {
+
+    private final Object a;
+    private final Object b;
+
+    /**
+     * Create with values for property0 and property1 respectively.
+     *
+     * @param a Value of the first property
+     * @param b Value of the second property
+     */
+    public Entry(Object a, Object b) {
+      this.a = a;
+      this.b = b;
+    }
+
+    @Override
+    public String toString() {
+      return "{" + a + "," + b + "}";
+    }
+
+    /**
+     * Return the value for the first property.
+     */
+    public Object getA() {
+      return a;
+    }
+
+    /**
+     * Return the value for the second property.
+     */
+    public Object getB() {
+      return b;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+
+      Entry that = (Entry) o;
+      return a.equals(that.a) && b.equals(that.b);
+    }
+
+    @Override
+    public int hashCode() {
+      int result = a.hashCode();
+      result = 92821 * result + b.hashCode();
+      return result;
+    }
+  }
+}
@@ -1,6 +1,6 @@
 package io.ebean;

-import io.ebean.config.PropertyMap;
+import io.ebean.config.properties.PropertiesLoader;

 import java.util.Properties;

@@ -44,7 +44,7 @@ class PrimaryServer {
   */
  static synchronized Properties getProperties() {
    if (globalProperties == null) {
-      globalProperties = PropertyMap.defaultProperties();
+      globalProperties = PropertiesLoader.load();
    }
    if (defaultServerName == null) {
      defaultServerName = determineDefaultServerName();
@@ -59,6 +59,8 @@ class PrimaryServer {
  private static String determineDefaultServerName() {

    String defaultServerName = System.getenv("EBEAN_DB");
+    defaultServerName = System.getProperty("db", defaultServerName);
+    defaultServerName = System.getProperty("ebean_db", defaultServerName);
    if (isEmpty(defaultServerName)) {
      defaultServerName = System.getProperty("datasource.default");
      if (isEmpty(defaultServerName)) {
@@ -74,6 +76,7 @@ class PrimaryServer {
    if (defaultServerName == null) {
      defaultServerName = "db";
    }
+    System.setProperty("ebean_db", defaultServerName);
    return defaultServerName;
  }

@@ -0,0 +1,47 @@
+package io.ebean;
+
+/**
+ * A location for profiling transactions and queries.
+ * <p>
+ * Typically represents a class method in the form of class file and line of code that started
+ * the transaction or invoked the query.
+ * </p>
+ */
+public interface ProfileLocation {
+
+  /**
+   * Create and return a new ProfileLocation.
+   */
+  static ProfileLocation create() {
+    return XServiceProvider.profileLocationFactory().create();
+  }
+
+  /**
+   * Create and return a new ProfileLocation with a given lineNumber and label.
+   */
+  static ProfileLocation create(int lineNumber, String label) {
+    return XServiceProvider.profileLocationFactory().create(lineNumber, label);
+  }
+
+  /**
+   * Create and return a new ProfileLocation with a given location.
+   */
+  static ProfileLocation createAt(String location) {
+    return XServiceProvider.profileLocationFactory().createAt(location);
+  }
+
+  /**
+   * Obtain the location description.
+   */
+  String obtain();
+
+  /**
+   * Return a short version of the location description.
+   */
+  String shortDescription();
+
+  /**
+   * Add execution time.
+   */
+  void add(long executionTime);
+}
@@ -1,7 +1,7 @@
 package io.ebean;

-import org.jetbrains.annotations.Nullable;
-
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.persistence.NonUniqueResultException;
 import java.sql.Timestamp;
 import java.util.List;
@@ -236,6 +236,14 @@ public interface Query<T> {
   */
  Query<T> asDraft();

+  /**
+   * Convert the query to a DTO bean query.
+   * <p>
+   * We effectively use the underlying ORM query to build the SQL and then execute
+   * and map it into DTO beans.
+   */
+  <D> DtoQuery<D> asDto(Class<D> dtoClass);
+
  /**
   * Cancel the query execution if supported by the underlying database and
   * driver.
@@ -597,6 +605,7 @@ public interface Query<T> {
   *
   * @see EbeanServer#findIds(Query, Transaction)
   */
+  @Nonnull
  <A> List<A> findIds();

  /**
@@ -637,6 +646,7 @@ public interface Query<T> {
   *
   * }</pre>
   */
+  @Nonnull
  QueryIterator<T> findIterate();

  /**
@@ -664,8 +674,7 @@ public interface Query<T> {
   * </p>
   * <p>
   * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the QueryEachConsumer (SAM) interface which is better suited to use
-   * with Java8 closures.
+   * iterator uses the Consumer interface which is better suited to use with Java8 closures.
   * </p>
   * <pre>{@code
   *
@@ -694,8 +703,7 @@ public interface Query<T> {
   * </p>
   * <p>
   * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the QueryEachWhileConsumer (SAM) interface which is better suited to use
-   * with Java8 closures.
+   * iterator uses the Predicate (SAM) interface which is better suited to use with Java8 closures.
   * </p>
   * <pre>{@code
   *
@@ -735,6 +743,7 @@ public interface Query<T> {
   *
   * @see EbeanServer#findList(Query, Transaction)
   */
+  @Nonnull
  List<T> findList();

  /**
@@ -753,6 +762,7 @@ public interface Query<T> {
   *
   * @see EbeanServer#findSet(Query, Transaction)
   */
+  @Nonnull
  Set<T> findSet();

  /**
@@ -775,6 +785,7 @@ public interface Query<T> {
   *
   * @see EbeanServer#findMap(Query, Transaction)
   */
+  @Nonnull
  <K> Map<K, T> findMap();

  /**
@@ -807,8 +818,29 @@ public interface Query<T> {
   *
   * @return the list of values for the selected property
   */
+  @Nonnull
  <A> List<A> findSingleAttributeList();

+  /**
+   * Execute a query returning a single value of a single property/column.
+   * <p>
+   * <pre>{@code
+   *
+   *  String name =
+   *    Ebean.find(Customer.class)
+   *      .select("name")
+   *      .where().eq("id", 42)
+   *      .findSingleAttribute();
+   *
+   * }</pre>
+   */
+  <A> A findSingleAttribute();
+
+  /**
+   * Return true if this is countDistinct query.
+   */
+  boolean isCountDistinct();
+
  /**
   * Execute the query returning either a single bean or null (if no matching
   * bean is found).
@@ -855,21 +887,9 @@ public interface Query<T> {
  /**
   * Execute the query returning an optional bean.
   */
+  @Nonnull
  Optional<T> findOneOrEmpty();

-  /**
-   * Deprecated - please migrate to findOne().
-   * <p>
-   * This proceeded findOne which was introduced to better match spring data.
-   * This will be deprecated at some future point.
-   * </p>
-   */
-  @Deprecated
-  @Nullable
-  default T findUnique() {
-    return findOne();
-  }
-
  /**
   * Return versions of a @History entity bean.
   * <p>
@@ -882,6 +902,7 @@ public interface Query<T> {
   * It will execute the query against the history returning the versions of the bean.
   * </p>
   */
+  @Nonnull
  List<Version<T>> findVersions();

  /**
@@ -891,6 +912,7 @@ public interface Query<T> {
   * It will execute the query against the history returning the versions of the bean.
   * </p>
   */
+  @Nonnull
  List<Version<T>> findVersionsBetween(Timestamp start, Timestamp end);

  /**
@@ -928,6 +950,7 @@ public interface Query<T> {
   *
   * @return a Future object for the row count query
   */
+  @Nonnull
  FutureRowCount<T> findFutureCount();

  /**
@@ -940,6 +963,7 @@ public interface Query<T> {
   *
   * @return a Future object for the list of Id's
   */
+  @Nonnull
  FutureIds<T> findFutureIds();

  /**
@@ -951,6 +975,7 @@ public interface Query<T> {
   *
   * @return a Future object for the list result of the query
   */
+  @Nonnull
  FutureList<T> findFutureList();

  /**
@@ -980,6 +1005,7 @@ public interface Query<T> {
   *
   * @return The PagedList
   */
+  @Nonnull
  PagedList<T> findPagedList();

  /**
@@ -1259,6 +1285,37 @@ public interface Query<T> {
   */
  Query<T> setDistinct(boolean isDistinct);

+  /**
+   * Extended version for setDistinct in conjunction with "findSingleAttributeList";
+   *
+   * <pre>{@code
+   *
+   *  List<CountedValue<Order.Status>> orderStatusCount =
+   *
+   *     Ebean.find(Order.class)
+   *      .select("status")
+   *      .where()
+   *      .gt("orderDate", LocalDate.now().minusMonths(3))
+   *
+   *      // fetch as single attribute with a COUNT
+   *      .setCountDistinct(CountDistinctOrder.COUNT_DESC_ATTR_ASC)
+   *      .findSingleAttributeList();
+   *
+   *     for (CountedValue<Order.Status> entry : orderStatusCount) {
+   *       System.out.println(" count:" + entry.getCount()+" orderStatus:" + entry.getValue() );
+   *     }
+   *
+   *   // produces
+   *
+   *   count:3 orderStatus:NEW
+   *   count:1 orderStatus:SHIPPED
+   *   count:1 orderStatus:COMPLETE
+   *
+   * }</pre>
+   *
+   */
+  Query<T> setCountDistinct(CountDistinctOrder orderBy);
+
  /**
   * Return the first row value.
   */
@@ -1292,7 +1349,7 @@ public interface Query<T> {
   *
   * // Assuming sku is unique for products...
   *
-   * Map<?,Product> productMap =
+   * Map<String,Product> productMap =
   *     ebeanServer.find(Product.class)
   *     // use sku for keys...
   *     .setMapKey("sku")
@@ -1307,22 +1364,36 @@ public interface Query<T> {
  /**
   * Set this to false to not use the bean cache.
   * <p>
+   * This method is now superseded by {@link #setBeanCacheMode(CacheMode)}
+   * which provides more explicit options controlled bean cache use.
+   * </p>
+   * <p>
+   * This method is likely to be deprecated in the future with migration
+   * over to setUseBeanCache().
+   * </p>
+   */
+  default Query<T> setUseCache(boolean useCache) {
+    return setBeanCacheMode(useCache ? CacheMode.ON : CacheMode.OFF);
+  }
+
+  /**
+   * Set the mode to use the bean cache when executing this query.
+   * <p>
   * By default "find by id" and "find by natural key" will use the bean cache
   * when bean caching is enabled. Setting this to false means that the query
   * will not use the bean cache and instead hit the database.
   * </p>
   * <p>
-   * In the case of other queries (findList(), findEach() etc) then setting this to
-   * false beans that the if lazy loading is invoked that lazy loading will not try
-   * to use the bean cache.
+   * By default findList() with natural keys will not use the bean cache. In that
+   * case we need to explicitly use the bean cache.
   * </p>
   */
-  Query<T> setUseCache(boolean useCache);
+  Query<T> setBeanCacheMode(CacheMode beanCacheMode);

  /**
   * Set the {@link CacheMode} to use the query for executing this query.
   */
-  Query<T> setUseQueryCache(CacheMode useQueryCache);
+  Query<T> setUseQueryCache(CacheMode queryCacheMode);

  /**
   * Calls {@link #setUseQueryCache(CacheMode)} with <code>ON</code> or <code>OFF</code>.
@@ -1331,6 +1402,23 @@ 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.
+   */
+  Query<T> setProfileLocation(ProfileLocation profileLocation);
+
  /**
   * Set to true if this query should execute against the doc store.
   * <p>
@@ -1345,8 +1433,9 @@ public interface Query<T> {
  Query<T> setReadOnly(boolean readOnly);

  /**
-   * When set to true all the beans from this query are loaded into the bean
-   * cache.
+   * Will be deprecated - migrate to use setBeanCacheMode(CacheMode.RECACHE).
+   * <p>
+   * When set to true all the beans from this query are loaded into the bean cache.
   */
  Query<T> setLoadBeanCache(boolean loadBeanCache);

@@ -1391,9 +1480,12 @@ public interface Query<T> {
  String getGeneratedSql();

  /**
+   * Deprecated - migrate to forUpdate().
+   *
   * executed the select with "for update" which should lock the record
   * "on read"
   */
+  @Deprecated
  Query<T> setForUpdate(boolean forUpdate);

  /**
@@ -1437,6 +1529,11 @@ public interface Query<T> {
   */
  Class<T> getBeanType();

+  /**
+   * Return the type of query being executed.
+   */
+  QueryType getQueryType();
+
  /**
   * Set true if you want to disable lazy loading.
   * <p>
@@ -1454,4 +1551,12 @@ public interface Query<T> {
   */
  Set<String> validate();

+  /**
+   * 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);
+
 }
@@ -0,0 +1,22 @@
+package io.ebean;
+
+/**
+ * The type of the query being executed.
+ */
+public enum QueryType {
+
+  /**
+   * A find query.
+   */
+  FIND,
+
+  /**
+   * An update query.
+   */
+  UPDATE,
+
+  /**
+   * A delete query.
+   */
+  DELETE
+}
@@ -1,16 +1,5 @@
 package io.ebean;

-import io.ebean.util.CamelCaseHelper;
-
-import java.io.Serializable;
-import java.sql.ResultSet;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
 * Used to build object graphs based on a raw SQL statement (rather than
 * generated by Ebean).
@@ -1,6 +1,7 @@
 package io.ebean;

 import java.sql.ResultSet;
+import java.sql.SQLException;

 /**
 * Builds RawSql instances from a SQL string and column mappings.
@@ -21,7 +22,14 @@ public interface RawSqlBuilder {
   * resultSet.
   */
  static RawSql resultSet(ResultSet resultSet, String... propertyNames) {
-    return XServiceProvider.get().resultSet(resultSet, propertyNames);
+    return XServiceProvider.rawSql().resultSet(resultSet, propertyNames);
+  }
+
+  /**
+   * Create and return a SqlRow based on the resultSet with dbTrueValue and binaryOptimizedUUID options.
+   */
+  static SqlRow sqlRow(ResultSet resultSet, final String dbTrueValue, boolean binaryOptimizedUUID) throws SQLException {
+    return XServiceProvider.rawSql().sqlRow(resultSet, dbTrueValue, binaryOptimizedUUID);
  }

  /**
@@ -30,7 +38,7 @@ public interface RawSqlBuilder {
   * this query.
   */
  static RawSqlBuilder unparsed(String sql) {
-    return XServiceProvider.get().unparsed(sql);
+    return XServiceProvider.rawSql().unparsed(sql);
  }

  /**
@@ -47,7 +55,7 @@ public interface RawSqlBuilder {
   * </p>
   */
  static RawSqlBuilder parse(String sql) {
-    return XServiceProvider.get().parsed(sql);
+    return XServiceProvider.rawSql().parsed(sql);
  }

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

+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Optional;
@@ -43,6 +45,7 @@ public interface SqlQuery extends Serializable {
  /**
   * Execute the query returning a list.
   */
+  @Nonnull
  List<SqlRow> findList();

  /**
@@ -71,21 +74,15 @@ public interface SqlQuery extends Serializable {
   * PersistenceException.
   * </p>
   */
+  @Nullable
  SqlRow findOne();

  /**
   * Execute the query returning an optional row.
   */
+  @Nonnull
  Optional<SqlRow> findOneOrEmpty();

-  /**
-   * Deprecated - please migrate to findOne().
-   */
-  @Deprecated
-  default SqlRow findUnique() {
-    return findOne();
-  }
-
  /**
   * The same as bind for named parameters.
   */
@@ -54,6 +54,25 @@ public interface SqlUpdate {
   */
  int execute();

+  /**
+   * Return the generated key value.
+   */
+  Object getGeneratedKey();
+
+  /**
+   * Execute and return the generated key. This is effectively a short cut for:
+   *
+   * <pre>{@code
+   *
+   *   sqlUpdate.execute();
+   *   Object key = sqlUpdate.getGeneratedKey();
+   *
+   * }</pre>
+   *
+   * @return The generated key value
+   */
+  Object executeGetKey();
+
  /**
   * Return true if eBean should automatically deduce the table modification
   * information and process it.
@@ -88,6 +107,11 @@ public interface SqlUpdate {
   */
  SqlUpdate setLabel(String label);

+  /**
+   * Set to true when we want to use getGeneratedKeys with this statement.
+   */
+  SqlUpdate setGetGeneratedKeys(boolean getGeneratedKeys);
+
  /**
   * Return the sql statement.
   */
@@ -13,6 +13,23 @@ import java.sql.Connection;
 */
 public interface Transaction extends AutoCloseable {

+  /**
+   * Return the current transaction (of the default server) or null if there is
+   * no current transaction in scope.
+   * <p>
+   * This is the same as <code>Ebean.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()}.
+   * </p>
+   * @see Ebean#currentTransaction()
+   * @see EbeanServer#currentTransaction()
+   */
+  static Transaction current() {
+    return Ebean.currentTransaction();
+  }
+
  /**
   * Read Committed transaction isolation. Same as
   * java.sql.Connection.TRANSACTION_READ_COMMITTED.
@@ -42,6 +59,14 @@ public interface Transaction extends AutoCloseable {
   */
  void register(TransactionCallback callback);

+  /**
+   * Set a label on the transaction.
+   * <p>
+   * This label is used to group transaction execution times for performance metrics reporting.
+   * </p>
+   */
+  void setLabel(String label);
+
  /**
   * Return true if this transaction is read only.
   */
@@ -25,30 +25,38 @@ import java.util.concurrent.Callable;
 */
 public final class TxScope {

-  TxType type;
+  private int profileId;

-  String serverName;
+  private TxType type;

-  TxIsolation isolation;
+  private String serverName;

-  PersistBatch batch;
+  private TxIsolation isolation;

-  PersistBatch batchOnCascade;
+  private PersistBatch batch;

-  int batchSize;
+  private PersistBatch batchOnCascade;

-  boolean skipGeneratedKeys;
+  private int batchSize;

-  boolean readOnly;
+  private boolean skipGeneratedKeys;
+
+  private boolean readOnly;

  /**
   * Set this to false if the JDBC batch should not be automatically be flushed when a query is executed.
   */
-  boolean flushOnQuery = true;
+  private boolean flushOnQuery = true;

-  ArrayList<Class<? extends Throwable>> rollbackFor;
+  private boolean skipCache;

-  ArrayList<Class<? extends Throwable>> noRollbackFor;
+  private String label;
+
+  private ArrayList<Class<? extends Throwable>> rollbackFor;
+
+  private ArrayList<Class<? extends Throwable>> noRollbackFor;
+
+  private ProfileLocation profileLocation;

  /**
   * Helper method to create a TxScope with REQUIRES.
@@ -168,6 +176,66 @@ public final class TxScope {
    return this;
  }

+  /**
+   * Return the transaction profile id.
+   */
+  public int getProfileId() {
+    return profileId;
+  }
+
+  /**
+   * Set the transaction profile id.
+   */
+  public TxScope setProfileId(int profileId) {
+    this.profileId = profileId;
+    return this;
+  }
+
+  /**
+   * Return the profile location.
+   */
+  public ProfileLocation getProfileLocation() {
+    return profileLocation;
+  }
+
+  /**
+   * Set the profile location.
+   */
+  public TxScope setProfileLocation(ProfileLocation profileLocation) {
+    this.profileLocation = profileLocation;
+    return this;
+  }
+
+  /**
+   * Return true if the L2 cache should be skipped for this transaction.
+   */
+  public boolean isSkipCache() {
+    return skipCache;
+  }
+
+  /**
+   * Set to true if the transaction should skip L2 cache access.
+   */
+  public TxScope setSkipCache(boolean skipCache) {
+    this.skipCache = skipCache;
+    return this;
+  }
+
+  /**
+   * Return the label for the transaction.
+   */
+  public String getLabel() {
+    return label;
+  }
+
+  /**
+   * Set a label for the transaction.
+   */
+  public TxScope setLabel(String label) {
+    this.label = label;
+    return this;
+  }
+
  /**
   * Return the batch mode.
   */
@@ -258,6 +326,13 @@ public final class TxScope {
    return this;
  }

+  /**
+   * Return the isolation level.
+   */
+  public int getIsolationLevel() {
+    return isolation != null ? isolation.getLevel() : -1;
+  }
+
  /**
   * Return the Isolation level this transaction should run with.
   */
@@ -148,6 +148,12 @@ public interface UpdateQuery<T> {
   */
  UpdateQuery<T> setRaw(String propertyExpression, Object... values);

+  /**
+   * Set the profile location of this update query. This is used to relate query execution metrics
+   * back to a location like a specific line of code.
+   */
+  UpdateQuery<T> setProfileLocation(ProfileLocation profileLocation);
+
  /**
   * Return the query expression list to add predicates to.
   */
@@ -1,5 +1,6 @@
 package io.ebean;

+import io.ebean.service.SpiProfileLocationFactory;
 import io.ebean.service.SpiRawSqlService;

 import java.util.Iterator;
@@ -10,9 +11,11 @@ import java.util.ServiceLoader;
 */
 class XServiceProvider {

-  private static SpiRawSqlService builder = init();
+  private static SpiRawSqlService rawSqlService = initRawSql();

-  private static SpiRawSqlService init() {
+  private static SpiProfileLocationFactory profileLocationFactory = initProfileLocation();
+
+  private static SpiRawSqlService initRawSql() {

    Iterator<SpiRawSqlService> loader = ServiceLoader.load(SpiRawSqlService.class).iterator();
    if (loader.hasNext()) {
@@ -21,10 +24,27 @@ class XServiceProvider {
    throw new IllegalStateException("No service implementation found for SpiRawSqlService?");
  }

+  private static SpiProfileLocationFactory initProfileLocation() {
+
+    Iterator<SpiProfileLocationFactory> loader = ServiceLoader.load(SpiProfileLocationFactory.class).iterator();
+    if (loader.hasNext()) {
+      return loader.next();
+    }
+    throw new IllegalStateException("No service implementation found for SpiProfileLocationFactory?");
+  }
+
  /**
   * Return the RawSqlService implementation.
   */
-  static SpiRawSqlService get() {
-    return builder;
+  static SpiRawSqlService rawSql() {
+    return rawSqlService;
  }
+
+  /**
+   * Return the RawSqlService implementation.
+   */
+  static SpiProfileLocationFactory profileLocationFactory() {
+    return profileLocationFactory;
+  }
+
 }
@@ -191,6 +191,11 @@ public interface BeanCollection<E> extends Serializable {
   */
  void setModifyListening(ModifyListenMode modifyListenMode);

+  /**
+   * Return the current modify listening mode. Can be null for on newly created beans.
+   */
+  ModifyListenMode getModifyListening();
+
  /**
   * Add an object to the additions list.
   * <p>
@@ -227,6 +232,11 @@ public interface BeanCollection<E> extends Serializable {
   */
  void modifyReset();

+  /**
+   * Has been modified by an addition or removal.
+   */
+  boolean wasTouched();
+
  /**
   * Return a shallow copy of this collection that is modifiable.
   */
@@ -26,14 +26,16 @@ public final class CallStack implements Serializable {

  private final StackTraceElement[] callStack;

+  private final int hc;
+
  public CallStack(StackTraceElement[] callStack, int zeroHash, int pathHash) {
    this.callStack = callStack;
    this.zeroHash = enc(zeroHash);
    this.pathHash = enc(pathHash);
+    this.hc = computeHashCode();
  }

-  @Override
-  public int hashCode() {
+  private int computeHashCode() {
    int hc = 0;
    for (StackTraceElement aCallStack : callStack) {
      hc = 92821 * hc + aCallStack.hashCode();
@@ -41,6 +43,11 @@ public final class CallStack implements Serializable {
    return hc;
  }

+  @Override
+  public int hashCode() {
+    return hc;
+  }
+
  @Override
  public boolean equals(Object obj) {
    if (obj == this) {
@@ -1,6 +1,5 @@
 package io.ebean.bean;

-import java.beans.PropertyChangeListener;
 import java.io.Serializable;

 /**
@@ -14,8 +13,14 @@ import java.io.Serializable;
 */
 public interface EntityBean extends Serializable {

+  /**
+   * Return all the property names in defined order.
+   */
  String[] _ebean_getPropertyNames();

+  /**
+   * Return the property name at the given position.
+   */
  String _ebean_getPropertyName(int pos);

  /**
@@ -32,16 +37,6 @@ public interface EntityBean extends Serializable {
   */
  Object _ebean_newInstance();

-  /**
-   * Add a PropertyChangeListener to this bean.
-   */
-  void addPropertyChangeListener(PropertyChangeListener listener);
-
-  /**
-   * Remove a PropertyChangeListener from this bean.
-   */
-  void removePropertyChangeListener(PropertyChangeListener listener);
-
  /**
   * Generated method that sets the loaded state on all the embedded beans on
   * this entity bean by using EntityBeanIntercept.setEmbeddedLoaded(Object o);
@@ -3,15 +3,12 @@ package io.ebean.bean;
 import io.ebean.Ebean;
 import io.ebean.ValuePair;

-import java.util.Arrays;
 import javax.persistence.EntityNotFoundException;
 import javax.persistence.PersistenceException;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
@@ -34,8 +31,6 @@ public final class EntityBeanIntercept implements Serializable {

  private transient NodeUsageCollector nodeUsageCollector;

-  private transient PropertyChangeSupport pcs;
-
  private transient PersistenceContext persistenceContext;

  private transient BeanLoader beanLoader;
@@ -95,6 +90,7 @@ public final class EntityBeanIntercept implements Serializable {
  private int lazyLoadProperty = -1;

  private Object ownerId;
+  private int sortOrder;

  /**
   * Create a intercept with a given entity.
@@ -128,46 +124,6 @@ public final class EntityBeanIntercept implements Serializable {
    this.persistenceContext = persistenceContext;
  }

-  /**
-   * Add a property change listener for this entity bean.
-   */
-  public void addPropertyChangeListener(PropertyChangeListener listener) {
-    if (pcs == null) {
-      pcs = new PropertyChangeSupport(owner);
-    }
-    pcs.addPropertyChangeListener(listener);
-  }
-
-  /**
-   * Add a property change listener for this entity bean for a specific
-   * property.
-   */
-  public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) {
-    if (pcs == null) {
-      pcs = new PropertyChangeSupport(owner);
-    }
-    pcs.addPropertyChangeListener(propertyName, listener);
-  }
-
-  /**
-   * Remove a property change listener for this entity bean.
-   */
-  public void removePropertyChangeListener(PropertyChangeListener listener) {
-    if (pcs != null) {
-      pcs.removePropertyChangeListener(listener);
-    }
-  }
-
-  /**
-   * Remove a property change listener for this entity bean for a specific
-   * property.
-   */
-  public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) {
-    if (pcs != null) {
-      pcs.removePropertyChangeListener(propertyName, listener);
-    }
-  }
-
  /**
   * Turn on profile collection.
   */
@@ -573,6 +529,16 @@ public final class EntityBeanIntercept implements Serializable {
    }
  }

+  /**
+   * Set old value but force it to be set regardless if it already has a value.
+   */
+  private void setOriginalValueForce(int propertyIndex, Object value) {
+    if (origValues == null) {
+      origValues = new Object[owner._ebean_getPropertyNames().length];
+    }
+    origValues[propertyIndex] = value;
+  }
+
  /**
   * For forced update on a 'New' bean set all the loaded properties to changed.
   */
@@ -738,6 +704,9 @@ public final class EntityBeanIntercept implements Serializable {
   * Add and return a dirty property hash recursing into embedded beans.
   */
  private void addDirtyPropertyKey(StringBuilder sb) {
+    if (sortOrder > 0) {
+      sb.append("s,");
+    }
    int len = getPropertyLength();
    for (int i = 0; i < len; i++) {
      if (changedProps != null && changedProps[i]) {
@@ -891,9 +860,9 @@ public final class EntityBeanIntercept implements Serializable {
    loadedProps[propertyIndex] = true;
  }

-  private void preGetterCallback() {
+  private void preGetterCallback(int propertyIndex) {
    if (preGetterCallback != null) {
-      preGetterCallback.preGetterTrigger();
+      preGetterCallback.preGetterTrigger(propertyIndex);
    }
  }

@@ -901,14 +870,14 @@ public final class EntityBeanIntercept implements Serializable {
   * Called prior to Id property getter.
   */
  public void preGetId() {
-    preGetterCallback();
+    preGetterCallback(-1);
  }

  /**
   * Method that is called prior to a getter method on the actual entity.
   */
  public void preGetter(int propertyIndex) {
-    preGetterCallback();
+    preGetterCallback(propertyIndex);
    if (state == STATE_NEW || disableLazyLoad) {
      return;
    }
@@ -920,49 +889,17 @@ public final class EntityBeanIntercept implements Serializable {
    }
  }

-  /**
-   * Called for "enhancement" postSetter processing. This is around a PUTFIELD
-   * so no need to check the newValue afterwards.
-   */
-  public void postSetter(PropertyChangeEvent event) {
-    if (pcs != null && event != null) {
-      pcs.firePropertyChange(event);
-    }
-  }
-
-  /**
-   * Called for "subclassed" postSetter processing. Here the newValue has to be
-   * re-fetched (and passed into this method) in case there is code inside the
-   * setter that further mutates the value.
-   */
-  public void postSetter(PropertyChangeEvent event, Object newValue) {
-    if (pcs != null && event != null) {
-      if (newValue != null && newValue.equals(event.getNewValue())) {
-        pcs.firePropertyChange(event);
-      } else {
-        pcs.firePropertyChange(event.getPropertyName(), event.getOldValue(), newValue);
-      }
-    }
-  }
-
  /**
   * OneToMany and ManyToMany don't have any interception so just check for
   * PropertyChangeSupport.
   */
-  public PropertyChangeEvent preSetterMany(boolean interceptField, int propertyIndex, Object oldValue, Object newValue) {
+  public void preSetterMany(boolean interceptField, int propertyIndex, Object oldValue, Object newValue) {

    if (readOnly) {
      throw new IllegalStateException("This bean is readOnly");
    }

    setLoadedProperty(propertyIndex);
-
-    // Bean itself not considered dirty when many changed
-    if (pcs != null) {
-      return new PropertyChangeEvent(owner, getProperty(propertyIndex), oldValue, newValue);
-    } else {
-      return null;
-    }
  }

  private void setChangedPropertyValue(int propertyIndex, boolean setDirtyState, Object origValue) {
@@ -974,15 +911,19 @@ public final class EntityBeanIntercept implements Serializable {

    if (setDirtyState) {
      setOriginalValue(propertyIndex, origValue);
-      if (!dirty) {
-        dirty = true;
-        if (embeddedOwner != null) {
-          // Cascade dirty state from Embedded bean to parent bean
-          embeddedOwner._ebean_getIntercept().setEmbeddedDirty(embeddedOwnerIndex);
-        }
-        if (nodeUsageCollector != null) {
-          nodeUsageCollector.setModified();
-        }
+      setDirtyStatus();
+    }
+  }
+
+  private void setDirtyStatus() {
+    if (!dirty) {
+      dirty = true;
+      if (embeddedOwner != null) {
+        // Cascade dirty state from Embedded bean to parent bean
+        embeddedOwner._ebean_getIntercept().setEmbeddedDirty(embeddedOwnerIndex);
+      }
+      if (nodeUsageCollector != null) {
+        nodeUsageCollector.setModified();
      }
    }
  }
@@ -991,175 +932,156 @@ public final class EntityBeanIntercept implements Serializable {
   * Check to see if the values are not equal. If they are not equal then create
   * the old values for use with ConcurrencyMode.ALL.
   */
-  public PropertyChangeEvent preSetter(boolean intercept, int propertyIndex, Object oldValue, Object newValue) {
+  public void preSetter(boolean intercept, int propertyIndex, Object oldValue, Object newValue) {

    if (state == STATE_NEW) {
      setLoadedProperty(propertyIndex);
    } else if (!areEqual(oldValue, newValue)) {
      setChangedPropertyValue(propertyIndex, intercept, oldValue);
-    } else {
-      return null;
    }
-
-    return (pcs == null) ? null : new PropertyChangeEvent(owner, getProperty(propertyIndex), oldValue, newValue);
  }


  /**
   * Check for primitive boolean.
   */
-  public PropertyChangeEvent preSetter(boolean intercept, int propertyIndex, boolean oldValue, boolean newValue) {
+  public void preSetter(boolean intercept, int propertyIndex, boolean oldValue, boolean newValue) {

    if (state == STATE_NEW) {
      setLoadedProperty(propertyIndex);
    } else if (oldValue != newValue) {
      setChangedPropertyValue(propertyIndex, intercept, oldValue);
-    } else {
-      return null;
    }
-    return (pcs == null) ? null : new PropertyChangeEvent(owner, getProperty(propertyIndex), oldValue, newValue);
  }

  /**
   * Check for primitive int.
   */
-  public PropertyChangeEvent preSetter(boolean intercept, int propertyIndex, int oldValue, int newValue) {
+  public void preSetter(boolean intercept, int propertyIndex, int oldValue, int newValue) {

    if (state == STATE_NEW) {
      setLoadedProperty(propertyIndex);
    } else if (oldValue != newValue) {
      setChangedPropertyValue(propertyIndex, intercept, oldValue);
-    } else {
-      return null;
    }
-    return (pcs == null) ? null : new PropertyChangeEvent(owner, getProperty(propertyIndex), oldValue, newValue);
  }

  /**
   * long.
   */
-  public PropertyChangeEvent preSetter(boolean intercept, int propertyIndex, long oldValue, long newValue) {
+  public void preSetter(boolean intercept, int propertyIndex, long oldValue, long newValue) {

    if (state == STATE_NEW) {
      setLoadedProperty(propertyIndex);
    } else if (oldValue != newValue) {
      setChangedPropertyValue(propertyIndex, intercept, oldValue);
-    } else {
-      return null;
    }
-
-    return (pcs == null) ? null : new PropertyChangeEvent(owner, getProperty(propertyIndex), oldValue, newValue);
  }

  /**
   * double.
   */
-  public PropertyChangeEvent preSetter(boolean intercept, int propertyIndex, double oldValue, double newValue) {
+  public void preSetter(boolean intercept, int propertyIndex, double oldValue, double newValue) {

    if (state == STATE_NEW) {
      setLoadedProperty(propertyIndex);
    } else if (Double.compare(oldValue, newValue) != 0) {
      setChangedPropertyValue(propertyIndex, intercept, oldValue);
-    } else {
-      return null;
    }
-    return (pcs == null) ? null : new PropertyChangeEvent(owner, getProperty(propertyIndex), oldValue, newValue);
  }

  /**
   * float.
   */
-  public PropertyChangeEvent preSetter(boolean intercept, int propertyIndex, float oldValue, float newValue) {
+  public void preSetter(boolean intercept, int propertyIndex, float oldValue, float newValue) {

    if (state == STATE_NEW) {
      setLoadedProperty(propertyIndex);
    } else if (Float.compare(oldValue, newValue) != 0) {
      setChangedPropertyValue(propertyIndex, intercept, oldValue);
-    } else {
-      return null;
    }
-    return (pcs == null) ? null : new PropertyChangeEvent(owner, getProperty(propertyIndex), oldValue, newValue);
  }

  /**
   * short.
   */
-  public PropertyChangeEvent preSetter(boolean intercept, int propertyIndex, short oldValue, short newValue) {
+  public void preSetter(boolean intercept, int propertyIndex, short oldValue, short newValue) {

    if (state == STATE_NEW) {
      setLoadedProperty(propertyIndex);
    } else if (oldValue != newValue) {
      setChangedPropertyValue(propertyIndex, intercept, oldValue);
-    } else {
-      return null;
    }
-    return (pcs == null) ? null : new PropertyChangeEvent(owner, getProperty(propertyIndex), oldValue, newValue);
  }

  /**
   * char.
   */
-  public PropertyChangeEvent preSetter(boolean intercept, int propertyIndex, char oldValue, char newValue) {
+  public void preSetter(boolean intercept, int propertyIndex, char oldValue, char newValue) {

    if (state == STATE_NEW) {
      setLoadedProperty(propertyIndex);
    } else if (oldValue != newValue) {
      setChangedPropertyValue(propertyIndex, intercept, oldValue);
-    } else {
-      return null;
    }
-    return (pcs == null) ? null : new PropertyChangeEvent(owner, getProperty(propertyIndex), oldValue, newValue);
  }

  /**
   * byte.
   */
-  public PropertyChangeEvent preSetter(boolean intercept, int propertyIndex, byte oldValue, byte newValue) {
+  public void preSetter(boolean intercept, int propertyIndex, byte oldValue, byte newValue) {

    if (state == STATE_NEW) {
      setLoadedProperty(propertyIndex);
    } else if (oldValue != newValue) {
      setChangedPropertyValue(propertyIndex, intercept, oldValue);
-    } else {
-      return null;
    }
-    return (pcs == null) ? null : new PropertyChangeEvent(owner, getProperty(propertyIndex), oldValue, newValue);
  }

  /**
   * char[].
   */
-  public PropertyChangeEvent preSetter(boolean intercept, int propertyIndex, char[] oldValue, char[] newValue) {
+  public void preSetter(boolean intercept, int propertyIndex, char[] oldValue, char[] newValue) {

    if (state == STATE_NEW) {
      setLoadedProperty(propertyIndex);
    } else if (!Arrays.equals(oldValue, newValue)) {
      setChangedPropertyValue(propertyIndex, intercept, oldValue);
-    } else {
-      return null;
    }
-    return (pcs == null) ? null : new PropertyChangeEvent(owner, getProperty(propertyIndex), oldValue, newValue);
  }

  /**
   * byte[].
   */
-  public PropertyChangeEvent preSetter(boolean intercept, int propertyIndex, byte[] oldValue, byte[] newValue) {
+  public void preSetter(boolean intercept, int propertyIndex, byte[] oldValue, byte[] newValue) {

    if (state == STATE_NEW) {
      setLoadedProperty(propertyIndex);
    } else if (!Arrays.equals(oldValue, newValue)) {
      setChangedPropertyValue(propertyIndex, intercept, oldValue);
-    } else {
-      return null;
    }
-    return (pcs == null) ? null : new PropertyChangeEvent(owner, getProperty(propertyIndex), oldValue, newValue);
  }

  /**
-   * Explicitly set an old value.
+   * Explicitly set an old value with force (the old value is forced even it is already set).
   */
-  public void setOldValue(int propertyIndex,Object oldValue) {
-    setChangedPropertyValue(propertyIndex, true, oldValue);
+  public void setOldValue(int propertyIndex, Object oldValue) {
+    setChangedProperty(propertyIndex);
+    setOriginalValueForce(propertyIndex, oldValue);
+    setDirtyStatus();
+  }
+
+  /**
+   * Return the sort order value for an order column.
+   */
+  public int getSortOrder() {
+    return sortOrder;
+  }
+
+  /**
+   * Set the sort order value for an order column.
+   */
+  public void setSortOrder(int sortOrder) {
+    this.sortOrder = sortOrder;
  }
 }
@@ -7,7 +7,9 @@ package io.ebean.bean;
 public interface PreGetterCallback {

  /**
-   * Trigger the callback.
+   * Trigger the callback based on a getter on a property.
+   *
+   * @param propertyIndex The index of the property
   */
-  void preGetterTrigger();
+  void preGetterTrigger(int propertyIndex);
 }
@@ -1,5 +1,9 @@
 package io.ebean.cache;

+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
 /**
 * Represents part of the "L2" server side cache.
 * <p>
@@ -13,20 +17,46 @@ package io.ebean.cache;
 */
 public interface ServerCache {

+  default Map<Object, Object> getAll(Set<Object> keys) {
+
+    Map<Object, Object> map = new LinkedHashMap<>();
+    for (Object key : keys) {
+      Object value = get(key);
+      if (value != null) {
+        map.put(key, value);
+      }
+    }
+    return map;
+  }
+
  /**
   * Return the value given the key.
   */
  Object get(Object id);

+  /**
+   * Put all the values in the cache.
+   */
+  default void putAll(Map<Object, Object> keyValues) {
+    keyValues.forEach(this::put);
+  }
+
  /**
   * Put the value in the cache with a given id.
   */
-  Object put(Object id, Object value);
+  void put(Object id, Object value);
+
+  /**
+   * Remove the entries from the cache given the id values.
+   */
+  default void removeAll(Set<Object> keys) {
+    keys.forEach(this::remove);
+  }

  /**
   * Remove a entry from the cache given its id.
   */
-  Object remove(Object id);
+  void remove(Object id);

  /**
   * Clear all entries from the cache.
@@ -44,4 +44,19 @@ public interface ServerCacheManager {
   */
  void clearAll();

+  /**
+   * Clear all the local caches.
+   *
+   * 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.
+   */
+  void clearAllLocal();
+
+  /**
+   * Clear the local caches for this bean type.
+   *
+   * 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.
+   */
+  void clearLocal(Class<?> beanType);
 }
@@ -140,6 +140,11 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
  // Support for modify additions deletions etc - ManyToMany
  // ---------------------------------------------------------

+  @Override
+  public ModifyListenMode getModifyListening() {
+    return modifyListenMode;
+  }
+
  /**
   * set modifyListening to be on or off.
   */
@@ -213,7 +218,12 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
  boolean holdsModifications() {
    return modifyHolder != null && modifyHolder.hasModifications();
  }
-  
+
+  @Override
+  public boolean wasTouched() {
+    return modifyHolder != null && modifyHolder.wasTouched();
+  }
+
  /**
   * Copies all relevant properties for a clone. See {@link #getShallowCopy()}
   * @param other
@@ -28,7 +28,10 @@ class ModifyHolder<E> implements Serializable {
   */
  private Set<E> modifyAdditions = new LinkedHashSet<>();

+  private boolean touched;
+
  void reset() {
+    touched = false;
    modifyDeletions = new LinkedHashSet<>();
    modifyAdditions = new LinkedHashSet<>();
  }
@@ -50,6 +53,7 @@ class ModifyHolder<E> implements Serializable {

  void modifyAddition(E bean) {
    if (bean != null) {
+      touched = true;
      // If it is to delete then just remove the deletion
      if (!undoDeletion(bean)) {
        // Insert
@@ -65,6 +69,7 @@ class ModifyHolder<E> implements Serializable {
  @SuppressWarnings("unchecked")
  void modifyRemoval(Object bean) {
    if (bean != null) {
+      touched = true;
      // If it is to be added then just remove the addition
      if (!undoAddition(bean)) {
        modifyDeletions.add((E) bean);
@@ -80,6 +85,14 @@ class ModifyHolder<E> implements Serializable {
    return modifyDeletions;
  }

+  /**
+   * Return true if the collection was touched in some way. This is still true even if
+   * a bean was removed and then added (which is not held as a modification).
+   */
+  boolean wasTouched() {
+    return touched;
+  }
+
  /**
   * Return true if there additions or removals.
   */
@@ -0,0 +1,15 @@
+package io.ebean.config;
+
+/**
+ * Used to provide some automatic configuration early in the creation of an EbeanServer.
+ */
+public interface AutoConfigure {
+
+  /**
+   * Provide some configuration the ServerConfig prior to server creation.
+   * <p>
+   * Return true if the autoConfiguration applies to this ServerConfig.
+   */
+  void configure(ServerConfig serverConfig);
+
+}
@@ -32,6 +32,15 @@ public class AutoTuneConfig {
  public AutoTuneConfig() {
  }

+  /**
+   * Return true if we are profiling or query tuning.
+   *
+   * If we are not doing either then we don't need a CallStack.
+   */
+  public boolean isActive() {
+    return profiling || queryTuning;
+  }
+
  /**
   * Return the name of the file that holds the query tuning information.
   */
@@ -54,6 +54,22 @@ public class ClassLoadConfig {
    return isPresent("javax.validation.constraints.NotNull");
  }

+  /**
+   * Return true if javax PostConstruct annotation is present (maybe not in java9).
+   * If not we don't support PostConstruct lifecycle events.
+   */
+  public boolean isJavaxPostConstructPresent() {
+    return isPresent("javax.annotation.PostConstruct");
+  }
+
+  /**
+   * Return true if javax JAXB is present (maybe not in java9).
+   * If not we don't try to parse or support 'extra ddl'.
+   */
+  public boolean isJavaxJAXBPresent() {
+    return isPresent("javax.xml.bind.JAXBException");
+  }
+
  /**
   * Return true if Jackson annotations like JsonIgnore are present.
   */
@@ -10,22 +10,82 @@ import java.util.Properties;
 */
 public class ContainerConfig {

-  protected boolean clusterActive;
+  private boolean active;
+  private String serviceName;
+  private String namespace;
+  private String podName;
+  private int port;

-  protected Properties properties;
+  private Properties properties;
+
+  /**
+   * Return the service name.
+   */
+  public String getServiceName() {
+    return serviceName;
+  }
+
+  /**
+   * Set the service name.
+   */
+  public void setServiceName(String serviceName) {
+    this.serviceName = serviceName;
+  }
+
+  /**
+   * Return the namespace.
+   */
+  public String getNamespace() {
+    return namespace;
+  }
+
+  /**
+   * Set the namespace.
+   */
+  public void setNamespace(String namespace) {
+    this.namespace = namespace;
+  }
+
+  /**
+   * Return the pod name.
+   */
+  public String getPodName() {
+    return podName;
+  }
+
+  /**
+   * Set the pod name.
+   */
+  public void setPodName(String podName) {
+    this.podName = podName;
+  }
+
+  /**
+   * Return the port to use.
+   */
+  public int getPort() {
+    return port;
+  }
+
+  /**
+   * Set the port to use.
+   */
+  public void setPort(int port) {
+    this.port = port;
+  }

  /**
   * Return true if clustering is active.
   */
-  public boolean isClusterActive() {
-    return clusterActive;
+  public boolean isActive() {
+    return active;
  }

  /**
   * Set to true for clustering to be active.
   */
-  public void setClusterActive(boolean clusterActive) {
-    this.clusterActive = clusterActive;
+  public void setActive(boolean active) {
+    this.active = active;
  }

  /**
@@ -47,7 +107,14 @@ public class ContainerConfig {
   */
  public void loadFromProperties(Properties properties) {
    this.properties = properties;
-    this.clusterActive = getProperty(properties, "ebean.cluster.active", clusterActive);
+    this.active = getProperty(properties, "ebean.cluster.active", active);
+    this.serviceName = properties.getProperty("ebean.cluster.serviceName", serviceName);
+    this.namespace = properties.getProperty("ebean.cluster.namespace", namespace);
+    this.podName = properties.getProperty("ebean.cluster.podName", podName);
+    String portParam = properties.getProperty("ebean.cluster.port");
+    if (portParam != null) {
+      this.port = Integer.parseInt(portParam);
+    }
  }

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

+import io.ebean.EbeanVersion;
 import io.ebean.annotation.Platform;
 import io.ebean.migration.MigrationConfig;
 import io.ebean.migration.MigrationRunner;
+import io.ebean.util.StringHelper;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Map;
 import java.util.Properties;

@@ -16,6 +21,8 @@ public class DbMigrationConfig {

  protected static final Logger logger = LoggerFactory.getLogger(DbMigrationConfig.class);

+  protected MigrationConfig runnerConfig = new MigrationConfig();
+
  /**
   * The database platform to generate migration DDL for.
   */
@@ -105,6 +112,20 @@ public class DbMigrationConfig {
   */
  protected String dbPassword;

+  protected String patchInsertOn;
+
+  protected String patchResetChecksumOn;
+
+  /**
+   * Mode used to check non-null columns added via migration have a default value specified etc.
+   */
+  protected boolean strictMode = true;
+
+  /**
+   * Contains the DDL-header information.
+   */
+  protected String ddlHeader;
+
  /**
   * Return the DB platform to generate migration DDL for.
   * <p>
@@ -352,6 +373,73 @@ public class DbMigrationConfig {
    this.dbPassword = dbPassword;
  }

+  /**
+   * Return migration versions that should be added to history without running.
+   */
+  public String getPatchInsertOn() {
+    return patchInsertOn;
+  }
+
+  /**
+   * Set migration versions that should be added to history without running.
+   * <p>
+   * Value can be a string containing comma delimited list of version numbers.
+   * </p>
+   */
+  public void setPatchInsertOn(String patchInsertOn) {
+    this.patchInsertOn = patchInsertOn;
+  }
+
+  /**
+   * Return migration versions that should have their checksum reset and not run.
+   */
+  public String getPatchResetChecksumOn() {
+    return patchResetChecksumOn;
+  }
+
+  /**
+   * Returns a DDL header prepend for each DDL. E.g. for copyright headers
+   * You can use placeholders like ${version} or ${timestamp} in properties file.
+   */
+  public String getDdlHeader() {
+    return ddlHeader;
+  }
+
+  /**
+   * Set migration versions that should have their checksum reset and not run.
+   * <p>
+   * Value can be a string containing comma delimited list of version numbers.
+   * </p>
+   */
+  public void setPatchResetChecksumOn(String patchResetChecksumOn) {
+    this.patchResetChecksumOn = patchResetChecksumOn;
+  }
+
+  /**
+   * Return true if strict mode is used which includes a check that non-null columns have a default value.
+   */
+  public boolean isStrictMode() {
+    String envValue = readEnvironment("ddl.migration.strictMode");
+    if (!isEmpty(envValue)) {
+      return Boolean.parseBoolean(envValue.trim());
+    }
+    return strictMode;
+  }
+
+  /**
+   * Set to false to turn off strict mode allowing non-null columns to not have a default value.
+   */
+  public void setStrictMode(boolean strictMode) {
+    this.strictMode = strictMode;
+  }
+
+  /**
+   * Return the underlying migration runner configuration allowing for more advanced settings.
+   */
+  public MigrationConfig getRunnerConfig() {
+    return runnerConfig;
+  }
+
  /**
   * Load the settings from the PropertiesWrapper.
   */
@@ -370,18 +458,27 @@ public class DbMigrationConfig {
    generate = properties.getBoolean("migration.generate", generate);
    version = properties.get("migration.version", version);
    name = properties.get("migration.name", name);
+    patchInsertOn = properties.get("migration.patchInsertOn", patchInsertOn);
+    patchResetChecksumOn = properties.get("migration.patchResetChecksumOn", patchResetChecksumOn);

    runMigration = properties.getBoolean("migration.run", runMigration);
    metaTable = properties.get("migration.metaTable", metaTable);
    runPlaceholders = properties.get("migration.placeholders", runPlaceholders);

-    String adminUser = properties.get("datasource." + serverName + ".username", dbUsername);
-    adminUser = properties.get("datasource." + serverName + ".adminusername", adminUser);
+    //Do not set user and pass from "datasource.db.username"
+    //There is a null test in MigrationRunner::getConnection to handle this
+    //String adminUser = properties.get("datasource." + serverName + ".username", dbUsername);
+    String adminUser = properties.get("datasource." + serverName + ".adminusername", dbUsername);
    dbUsername = properties.get("migration.dbusername", adminUser);

-    String adminPwd = properties.get("datasource." + serverName + ".password", dbPassword);
-    adminPwd = properties.get("datasource." + serverName + ".adminpassword", adminPwd);
+    //String adminPwd = properties.get("datasource." + serverName + ".password", dbPassword);
+    String adminPwd = properties.get("datasource." + serverName + ".adminpassword", dbPassword);
    dbPassword = properties.get("migration.dbpassword", adminPwd);
+    ddlHeader = properties.get("ddl.header", ddlHeader);
+    if (ddlHeader != null && !ddlHeader.isEmpty()) {
+      ddlHeader = StringHelper.replaceString(ddlHeader, "${version}", EbeanVersion.getVersion());
+      ddlHeader = StringHelper.replaceString(ddlHeader, "${timestamp}", ZonedDateTime.now().format( DateTimeFormatter.ISO_INSTANT ));
+    }
  }

  /**
@@ -446,7 +543,6 @@ public class DbMigrationConfig {
   */
  public MigrationRunner createRunner(ClassLoader classLoader, Properties properties) {

-    MigrationConfig runnerConfig = new MigrationConfig();
    runnerConfig.setMetaTable(metaTable);
    runnerConfig.setApplySuffix(applySuffix);
    runnerConfig.setMigrationPath(migrationPath);
@@ -455,6 +551,12 @@ public class DbMigrationConfig {
    runnerConfig.setDbUsername(getDbUsername());
    runnerConfig.setDbPassword(getDbPassword());
    runnerConfig.setClassLoader(classLoader);
+    if (patchInsertOn != null) {
+      runnerConfig.setPatchInsertOn(patchInsertOn);
+    }
+    if (patchResetChecksumOn != null) {
+      runnerConfig.setPatchResetChecksumOn(patchResetChecksumOn);
+    }
    if (properties != null) {
      runnerConfig.load(properties);
    }
@@ -12,7 +12,7 @@ public interface EncryptKeyManager {
   * This gives the EncryptKeyManager the opportunity to get keys etc.
   * </p>
   */
-  default void initialise() {};
+  default void initialise() {}

  /**
   * Return the key used to encrypt and decrypt a property mapping to the given
@@ -0,0 +1,148 @@
+package io.ebean.config;
+
+/**
+ * Configuration for transaction profiling.
+ */
+public class ProfilingConfig {
+
+  /**
+   * When true transaction profiling is enabled.
+   */
+  private boolean enabled;
+
+  /**
+   * Set true for verbose mode.
+   */
+  private boolean verbose;
+
+  /**
+   * The minimum transaction execution time to be included in profiling.
+   */
+  private long minimumMicros;
+
+  /**
+   * A specific set of profileIds to include in profiling.
+   */
+  private int[] includeProfileIds = {};
+
+  /**
+   * The number of profiles to write per file.
+   */
+  private long profilesPerFile = 1000;
+
+  private String directory = "profiling";
+
+  /**
+   * Return true if transaction profiling is enabled.
+   */
+  public boolean isEnabled() {
+    return enabled;
+  }
+
+  /**
+   * Set to true to enable transaction profiling.
+   */
+  public void setEnabled(boolean enabled) {
+    this.enabled = enabled;
+  }
+
+  /**
+   * Return true if verbose mode is used.
+   */
+  public boolean isVerbose() {
+    return verbose;
+  }
+
+  /**
+   * Set to true to use verbose mode.
+   */
+  public void setVerbose(boolean verbose) {
+    this.verbose = verbose;
+  }
+
+  /**
+   * Return the minimum transaction execution to be included in profiling.
+   */
+  public long getMinimumMicros() {
+    return minimumMicros;
+  }
+
+  /**
+   * Set the minimum transaction execution to be included in profiling.
+   */
+  public void setMinimumMicros(long minimumMicros) {
+    this.minimumMicros = minimumMicros;
+  }
+
+  /**
+   * Return the specific set of profileIds to include in profiling.
+   * When not set all transactions with profileIds are included.
+   */
+  public int[] getIncludeProfileIds() {
+    return includeProfileIds;
+  }
+
+  /**
+   * Set a specific set of profileIds to include in profiling.
+   * When not set all transactions with profileIds are included.
+   */
+  public void setIncludeProfileIds(int[] includeProfileIds) {
+    this.includeProfileIds = includeProfileIds;
+  }
+
+  /**
+   * Return the number of profiles to write to a single file.
+   */
+  public long getProfilesPerFile() {
+    return profilesPerFile;
+  }
+
+  /**
+   * Set the number of profiles to write to a single file.
+   */
+  public void setProfilesPerFile(long profilesPerFile) {
+    this.profilesPerFile = profilesPerFile;
+  }
+
+  /**
+   * Return the directory profiling files are put into.
+   */
+  public String getDirectory() {
+    return directory;
+  }
+
+  /**
+   * Set the directory profiling files are put into.
+   */
+  public void setDirectory(String directory) {
+    this.directory = directory;
+  }
+
+  /**
+   * Load setting from properties.
+   */
+  public void loadSettings(PropertiesWrapper p, String name) {
+
+    enabled = p.getBoolean("profiling", enabled);
+    verbose = p.getBoolean("profiling.verbose", verbose);
+
+    directory = p.get("profiling.directory", directory);
+    profilesPerFile = p.getLong("profiling.profilesPerFile", profilesPerFile);
+    minimumMicros = p.getLong("profiling.minimumMicros", minimumMicros);
+
+    String includeIds = p.get("profiling.includeProfileIds");
+    if (includeIds != null) {
+      includeProfileIds = parseIds(includeIds);
+    }
+  }
+
+  private int[] parseIds(String includeIds) {
+
+    String[] ids = includeIds.split(",");
+    int[] vals = new int[ids.length];
+    for (int i = 0; i < ids.length; i++) {
+      vals[i] = Integer.parseInt(ids[i]);
+    }
+    return vals;
+  }
+}
@@ -10,16 +10,13 @@ public class PropertiesWrapper {

  protected final String serverName;

-  protected final PropertyMap propertyMap;
-
  /**
   * Construct with a prefix, serverName and properties.
   */
  public PropertiesWrapper(String prefix, String serverName, Properties properties) {
    this.serverName = serverName;
    this.prefix = prefix;
-    this.propertyMap = PropertyMapLoader.load(null, properties);
-    this.properties = propertyMap.asProperties();
+    this.properties = properties;
  }

  /**
@@ -29,27 +26,6 @@ public class PropertiesWrapper {
    this(null, null, properties);
  }

-  /**
-   * Internal copy constructor when changing prefix.
-   */
-  protected PropertiesWrapper(String prefix, String serverName, PropertyMap propertyMap, Properties properties) {
-    this.serverName = serverName;
-    this.prefix = prefix;
-    this.propertyMap = propertyMap;
-    this.properties = properties;
-  }
-
-  /**
-   * Return a PropertiesWrapper instance with a different prefix but same underlying properties.
-   * <p/>
-   * Used when wanting to use "datasource" as the prefix rather than "ebean".
-   * <p/>
-   * The returning instance should only be used in a read only fashion.
-   */
-  public PropertiesWrapper withPrefix(String prefix) {
-    return new PropertiesWrapper(prefix, serverName, propertyMap, properties);
-  }
-
  /**
   * Return the serverName (optional).
   */
@@ -57,16 +33,6 @@ public class PropertiesWrapper {
    return serverName;
  }

-  /**
-   * Return as Properties with lower case keys and after evaluation and additional properties loading has occurred.
-   * <p>
-   * Ebean has historically ignored the case of keys hence returning the Properties with all the keys lower cased.
-   * </p>
-   */
-  public Properties asPropertiesLowerCase() {
-    return properties;
-  }
-
  /**
   * Get a property with no default value.
   */
@@ -90,17 +56,21 @@ public class PropertiesWrapper {

    String value = null;
    if (serverName != null && prefix != null) {
-      value = propertyMap.get(prefix + "." + serverName + "." + key, null);
+      value = internalGet(prefix + "." + serverName + "." + key);
    }
    if (value == null && prefix != null) {
-      value = propertyMap.get(prefix + "." + key, null);
+      value = internalGet(prefix + "." + key);
    }
    if (value == null) {
-      value = propertyMap.get(key, null);
+      value = internalGet(key);
    }
    return value == null ? defaultValue : value;
  }

+  private String internalGet(String key) {
+    return properties.getProperty(key);
+  }
+
  /**
   * Return a double property value.
   */
@@ -1,178 +0,0 @@
-package io.ebean.config;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * Helper used to evaluate expressions such as ${CATALINA_HOME}.
- * <p>
- * The expressions can contain environment variables, system properties or JNDI
- * properties. JNDI expressions take the form ${jndi:propertyName} where you
- * substitute propertyName with the name of the jndi property you wish to
- * evaluate.
- * </p>
- */
-final class PropertyExpression {
-
-  private static final Logger logger = LoggerFactory.getLogger(PropertyExpression.class);
-
-  /**
-   * Prefix for looking up JNDI Environment variable.
-   */
-  private static final String JAVA_COMP_ENV = "java:comp/env/";
-
-  /**
-   * Used to detect the start of an expression.
-   */
-  private static final String START = "${";
-
-  /**
-   * Used to detect the end of an expression.
-   */
-  private static final String END = "}";
-
-  /**
-   * Specify the PropertyHolder.
-   */
-  private PropertyExpression() {
-  }
-
-  /**
-   * Return the property value evaluating and replacing any expressions such as
-   * ${CATALINA_HOME}.
-   */
-  static String eval(String val, PropertyMap map) {
-    if (val == null) {
-      return null;
-    }
-    int sp = val.indexOf(START);
-    if (sp > -1) {
-      int ep = val.indexOf(END, sp + 1);
-      if (ep > -1) {
-        return eval(val, sp, ep, map);
-      }
-    }
-    return val;
-  }
-
-  /**
-   * Convert the expression using JNDI, Environment variables, System Properties
-   * or existing an property in SystemProperties itself.
-   */
-  private static String evaluateExpression(String exp, PropertyMap map) {
-
-    if (isJndiExpression(exp)) {
-      // JNDI property lookup...
-      String val = getJndiProperty(exp);
-      if (val != null) {
-        return val;
-      }
-    }
-
-    // check Environment Variables first
-    String val = System.getenv(exp);
-    if (val == null) {
-      // then check system properties
-      val = System.getProperty(exp);
-    }
-    if (val == null && map != null) {
-      // then check PropertyMap
-      val = map.get(exp);
-    }
-
-    if (val != null) {
-      return val;
-
-    } else {
-      // unable to evaluate yet... but maybe later based on the order
-      // in which properties are being set/loaded. You can use
-      // GlobalProperties.evaluateExpressions() to get any unresolved
-      // expressions to be evaluated
-      logger.debug("Unable to evaluate expression [{}]", exp);
-      return null;
-    }
-  }
-
-  private static String eval(String val, int sp, int ep, PropertyMap map) {
-
-    StringBuilder sb = new StringBuilder();
-    sb.append(val.substring(0, sp));
-
-    String cal = evalExpression(val, sp, ep, map);
-    sb.append(cal);
-
-    eval(val, ep + 1, sb, map);
-
-    return sb.toString();
-  }
-
-  private static void eval(String val, int startPos, StringBuilder sb, PropertyMap map) {
-    if (startPos < val.length()) {
-      int sp = val.indexOf(START, startPos);
-      if (sp > -1) {
-        // append what is between the last token and the new one (if startPos ==
-        // sp nothing gets added)
-        sb.append(val.substring(startPos, sp));
-        int ep = val.indexOf(END, sp + 1);
-        if (ep > -1) {
-          String cal = evalExpression(val, sp, ep, map);
-          sb.append(cal);
-          eval(val, ep + 1, sb, map);
-          return;
-        }
-      }
-    }
-    // append what is left...
-    sb.append(val.substring(startPos));
-  }
-
-  private static String evalExpression(String val, int sp, int ep, PropertyMap map) {
-    // trim off start and end ${ and }
-    String exp = val.substring(sp + START.length(), ep);
-
-    // evaluate the variable
-    String evaled = evaluateExpression(exp, map);
-    if (evaled != null) {
-      return evaled;
-    } else {
-      // unable to evaluate at this stage (maybe later)
-      return START + exp + END;
-    }
-  }
-
-  private static boolean isJndiExpression(String exp) {
-    return exp.startsWith("JNDI:") || exp.startsWith("jndi:");
-  }
-
-  /**
-   * Returns null if JNDI is not setup or if the property is not found.
-   *
-   * @param key the key of the JNDI Environment property including a JNDI: prefix.
-   */
-  private static String getJndiProperty(String key) {
-
-    try {
-      // remove the JNDI: prefix
-      key = key.substring(5);
-
-      return (String) getJndiObject(key);
-
-    } catch (NamingException ex) {
-      return null;
-    }
-  }
-
-  /**
-   * Similar to getProperty but throws NamingException if JNDI is not setup or
-   * if the property is not found.
-   */
-  private static Object getJndiObject(String key) throws NamingException {
-
-    InitialContext ctx = new InitialContext();
-    return ctx.lookup(JAVA_COMP_ENV + key);
-  }
-
-}
@@ -1,168 +0,0 @@
-package io.ebean.config;
-
-import java.io.Serializable;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-
-/**
- * A map like structure of properties.
- * <p/>
- * Handles evaluation of expressions like ${home} and provides convenience methods for int, long and boolean.
- */
-public final class PropertyMap implements Serializable {
-
-  private static final long serialVersionUID = 1L;
-
-  private final LinkedHashMap<String, String> map = new LinkedHashMap<>();
-
-  /**
-   * Return properties loaded from test-ebean.properties.
-   */
-  public static Properties testProperties() {
-    PropertyMap propertyMap = PropertyMapLoader.loadTestProperties();
-    return (propertyMap == null) ? new Properties() : propertyMap.asProperties();
-  }
-
-  public static Properties defaultProperties() {
-    PropertyMap propertyMap = PropertyMapLoader.loadGlobalProperties();
-    return (propertyMap == null) ? new Properties() : propertyMap.asProperties();
-  }
-
-  public static boolean loadTestProperties() {
-    String disable = System.getProperty("disableTestProperties");
-    return (disable == null || !disable.equalsIgnoreCase("true"));
-  }
-
-  @Override
-  public String toString() {
-    return map.toString();
-  }
-
-  /**
-   * Return as standard Properties.
-   */
-  public Properties asProperties() {
-    Properties properties = new Properties();
-    for (Entry<String, String> e : entrySet()) {
-      properties.put(e.getKey(), e.getValue());
-    }
-    return properties;
-  }
-
-  /**
-   * Go through all the properties and evaluate any expressions that have not
-   * been resolved.
-   */
-  public void evaluateProperties() {
-
-    for (Entry<String, String> e : entrySet()) {
-      String key = e.getKey();
-      String val = e.getValue();
-      String eval = eval(val);
-      if (eval != null && !eval.equals(val)) {
-        put(key, eval);
-      }
-    }
-  }
-
-  /**
-   * Returns the value with expressions like ${home} evaluated using system properties and environment variables.
-   */
-  public synchronized String eval(String val) {
-    return PropertyExpression.eval(val, this);
-  }
-
-  /**
-   * Return the boolean property value with a given default.
-   */
-  public synchronized boolean getBoolean(String key, boolean defaultValue) {
-    String value = get(key);
-    if (value == null) {
-      return defaultValue;
-    } else {
-      return Boolean.parseBoolean(value);
-    }
-  }
-
-  /**
-   * Return the int property value with a given default.
-   */
-  public synchronized int getInt(String key, int defaultValue) {
-    String value = get(key);
-    if (value == null) {
-      return defaultValue;
-    } else {
-      return Integer.parseInt(value);
-    }
-  }
-
-  /**
-   * Return the long property value with a given default.
-   */
-  public synchronized long getLong(String key, long defaultValue) {
-    String value = get(key);
-    if (value == null) {
-      return defaultValue;
-    } else {
-      return Long.parseLong(value);
-    }
-  }
-
-  /**
-   * Return the string property value with a given default.
-   */
-  public synchronized String get(String key, String defaultValue) {
-    String value = map.get(key.toLowerCase());
-    return value == null ? defaultValue : value;
-  }
-
-  /**
-   * Return the property value returning null if there is no value defined.
-   */
-  public synchronized String get(String key) {
-    return map.get(key.toLowerCase());
-  }
-
-  /**
-   * Put all evaluating any expressions in the values.
-   */
-  public synchronized void putEvalAll(Map<String, String> keyValueMap) {
-
-    for (Map.Entry<String, String> entry : keyValueMap.entrySet()) {
-      putEval(entry.getKey(), entry.getValue());
-    }
-  }
-
-  /**
-   * Put a single key value evaluating any expressions in the value.
-   */
-  public synchronized String putEval(String key, String value) {
-    value = PropertyExpression.eval(value, this);
-    return map.put(key.toLowerCase(), value);
-  }
-
-  /**
-   * Put a single key value with no expression evaluation.
-   */
-  public synchronized String put(String key, String value) {
-    return map.put(key.toLowerCase(), value);
-  }
-
-  /**
-   * Remove an entry.
-   */
-  public synchronized String remove(String key) {
-    return map.remove(key.toLowerCase());
-  }
-
-  /**
-   * Return the entries.
-   */
-  public synchronized Set<Entry<String, String>> entrySet() {
-    return map.entrySet();
-  }
-
-}
@@ -1,163 +0,0 @@
-package io.ebean.config;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * Helper used to load the ebean.properties into a PropertyMap.
- */
-final class PropertyMapLoader {
-
-  private static final Logger logger = LoggerFactory.getLogger(PropertyMapLoader.class);
-
-  private static final Pattern OTHER_PROPS_REPLACE = Pattern.compile("\\", Pattern.LITERAL);
-
-  /**
-   * Load the <code>test-ebean.properties</code>.
-   */
-  public static PropertyMap loadTestProperties() {
-    if (!PropertyMap.loadTestProperties()) {
-      return new PropertyMap();
-    }
-    return load(null, "test-ebean.properties");
-  }
-
-  /**
-   * Load the ebean.properties (and test-ebean.properties if present).
-   */
-  public static PropertyMap loadGlobalProperties() {
-
-    boolean loadTestProperties = false;
-    String fileName = System.getenv("EBEAN_PROPS_FILE");
-    if (fileName == null) {
-      fileName = System.getProperty("ebean.props.file");
-      if (fileName == null) {
-        loadTestProperties = PropertyMap.loadTestProperties();
-        fileName = "ebean.properties";
-      }
-    }
-
-    PropertyMap map = load(null, fileName);
-    if (loadTestProperties) {
-      // load test properties if present in classpath
-      map = load(map, "test-ebean.properties");
-    }
-    return map;
-  }
-
-  /**
-   * Load the file returning the property map.
-   *
-   * @param p        an existing property map to load into.
-   * @param fileName the name of the properties file to load.
-   */
-  public static PropertyMap load(PropertyMap p, String fileName) {
-
-    InputStream is = findInputStream(fileName);
-    if (is == null) {
-      return p;
-    } else {
-      return load(p, is);
-    }
-  }
-
-  /**
-   * Load the InputStream returning the property map.
-   *
-   * @param p  an existing property map to load into.
-   * @param in the InputStream of the properties file to load.
-   */
-  public static PropertyMap load(PropertyMap p, InputStream in) {
-
-    Properties props = new Properties();
-    try {
-      props.load(in);
-      in.close();
-      return load(p, props);
-
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  public static PropertyMap load(PropertyMap p, Properties props) {
-
-    if (p == null) {
-      p = new PropertyMap();
-    }
-
-    // put values in initially without any evaluation
-    for (Map.Entry<Object, Object> entry : props.entrySet()) {
-      String key = ((String) entry.getKey()).toLowerCase();
-      String val = ((String) entry.getValue());
-      if (val != null) {
-        val = val.trim();
-      }
-      p.put(key, val);
-    }
-
-    p.evaluateProperties();
-
-    String otherProps = p.remove("load.properties");
-    if (otherProps == null) {
-      otherProps = p.remove("load.properties.override");
-    }
-    if (otherProps != null) {
-      otherProps = OTHER_PROPS_REPLACE.matcher(otherProps).replaceAll(Matcher.quoteReplacement("/"));
-      InputStream is = findInputStream(otherProps);
-      if (is != null) {
-        logger.debug("loading properties from {}", otherProps);
-        load(p, is);
-      } else {
-        logger.error("load.properties " + otherProps + " not found.");
-      }
-    }
-
-    return p;
-  }
-
-  /**
-   * Find the input stream given the file name.
-   */
-  private static InputStream findInputStream(String fileName) {
-
-    if (fileName == null) {
-      throw new NullPointerException("fileName is null?");
-    }
-
-    try {
-      File f = new File(fileName);
-
-      if (f.exists()) {
-        logger.debug("{} found in file system", fileName);
-        return new FileInputStream(f);
-      } else {
-        InputStream in = findInClassPath(fileName);
-        if (in != null) {
-          logger.debug("{} found in classpath", fileName);
-        }
-        return in;
-      }
-
-    } catch (FileNotFoundException ex) {
-      // already made the check so this
-      // should never be thrown
-      throw new RuntimeException(ex);
-    }
-  }
-
-  private static InputStream findInClassPath(String fileName) {
-    return Thread.currentThread().getContextClassLoader().getResourceAsStream(fileName);
-  }
-
-}
@@ -12,6 +12,8 @@ import io.ebean.cache.ServerCachePlugin;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbEncrypt;
 import io.ebean.config.dbplatform.DbType;
+import io.ebean.config.dbplatform.IdType;
+import io.ebean.config.properties.PropertiesLoader;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanPersistController;
 import io.ebean.event.BeanPersistListener;
@@ -32,6 +34,7 @@ import org.avaje.datasource.DataSourceConfig;

 import javax.sql.DataSource;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -180,6 +183,11 @@ public class ServerConfig {
   */
  private DatabasePlatform databasePlatform;

+  /**
+   * The preferred IdType (to override the default Platform type).
+   */
+  private IdType idType;
+
  /**
   * For DB's using sequences this is the number of sequence values prefetched.
   */
@@ -272,11 +280,29 @@ public class ServerConfig {
   */
  private DataSource dataSource;

+  /**
+   * The read only data source (can be null).
+   */
+  private DataSource readOnlyDataSource;
+
  /**
   * The data source config.
   */
  private DataSourceConfig dataSourceConfig = new DataSourceConfig();

+  /**
+   * When true create a read only DataSource using readOnlyDataSourceConfig defaulting values from dataSourceConfig.
+   * I believe this will default to true in some future release (as it has a nice performance benefit).
+   * <p>
+   * autoReadOnlyDataSource is an unfortunate name for this config option but I haven't come up with a better one.
+   */
+  private boolean autoReadOnlyDataSource;
+
+  /**
+   * Optional configuration for a read only data source.
+   */
+  private DataSourceConfig readOnlyDataSourceConfig = new DataSourceConfig();
+
  /**
   * The db migration config (migration resource path etc).
   */
@@ -346,6 +372,16 @@ public class ServerConfig {
   */
  private DbTypeConfig dbTypeConfig = new DbTypeConfig();

+  /**
+   * The UUID version to use.
+   */
+  private UuidVersion uuidVersion = UuidVersion.VERSION4;
+
+  /**
+   * The UUID state file (for Version 1 UUIDs).
+   */
+  private String uuidStateFile = "ebean-uuid.state";
+
  private List<IdGenerator> idGenerators = new ArrayList<>();
  private List<BeanFindController> findControllers = new ArrayList<>();
  private List<BeanPersistController> persistControllers = new ArrayList<>();
@@ -367,6 +403,8 @@ public class ServerConfig {

  private ChangeLogRegister changeLogRegister;

+  private boolean changeLogAsync = true;
+
  private ReadAuditLogger readAuditLogger;

  private ReadAuditPrepare readAuditPrepare;
@@ -432,11 +470,29 @@ public class ServerConfig {

  private String jodaLocalTimeMode;

+  /**
+   * Time to live for query plans - defaults to 5 minutes.
+   */
+  private int queryPlanTTLSeconds = 60 * 5;
+
  /**
   * Set to true to globally disable L2 caching (typically for performance testing).
   */
  private boolean disableL2Cache;

+
+  /**
+   * Should the javax.validation.constraints.NotNull enforce a notNull column in DB.
+   * If set to false, use io.ebean.annotation.NotNull or Column(nullable=true).
+   */
+  private boolean useJavaxValidationNotNull = true;
+
+  /**
+   * Generally we want to perform L2 cache notification in the background and not impact
+   * the performance of executing transactions.
+   */
+  private boolean notifyL2CacheInForeground;
+
  /**
   * The time in millis used to determine when a query is alerted for being slow.
   */
@@ -447,6 +503,13 @@ public class ServerConfig {
   */
  private SlowQueryListener slowQueryListener;

+  private ProfilingConfig profilingConfig = new ProfilingConfig();
+
+  /**
+   * Controls the default order by id setting of queries. See {@link Query#orderById(boolean)}
+   */
+  private boolean defaultOrderById = false;
+
  /**
   * Construct a Server Configuration for programmatically creating an EbeanServer.
   */
@@ -482,6 +545,21 @@ public class ServerConfig {
    this.slowQueryListener = slowQueryListener;
  }

+
+  /**
+   * Sets the default orderById setting for queries.
+   */
+  public void setDefaultOrderById(boolean defaultOrderById) {
+    this.defaultOrderById = defaultOrderById;
+  }
+
+  /**
+   * Returns the default orderById setting for queries.
+   */
+  public boolean isDefaultOrderById() {
+    return defaultOrderById;
+  }
+
  /**
   * Put a service object into configuration such that it can be passed to a plugin.
   * <p>
@@ -969,6 +1047,20 @@ public class ServerConfig {
    this.changeLogIncludeInserts = changeLogIncludeInserts;
  }

+  /**
+   * Return true (default) if the changelog should be written async.
+   */
+  public boolean isChangeLogAsync() {
+    return changeLogAsync;
+  }
+
+  /**
+   * Sets if the changelog should be written async (default = true).
+   */
+  public void setChangeLogAsync(boolean changeLogAsync) {
+    this.changeLogAsync = changeLogAsync;
+  }
+
  /**
   * Return the ReadAuditLogger to use.
   */
@@ -1004,6 +1096,20 @@ public class ServerConfig {
    this.readAuditPrepare = readAuditPrepare;
  }

+  /**
+   * Return the configuration for profiling.
+   */
+  public ProfilingConfig getProfilingConfig() {
+    return profilingConfig;
+  }
+
+  /**
+   * Set the configuration for profiling.
+   */
+  public void setProfilingConfig(ProfilingConfig profilingConfig) {
+    this.profilingConfig = profilingConfig;
+  }
+
  /**
   * Return the DB migration configuration.
   */
@@ -1403,6 +1509,28 @@ public class ServerConfig {
    this.dataSource = dataSource;
  }

+  /**
+   * Return the read only DataSource.
+   */
+  public DataSource getReadOnlyDataSource() {
+    return readOnlyDataSource;
+  }
+
+  /**
+   * Set the read only DataSource.
+   * <p>
+   * Note that the DataSource is expected to use AutoCommit true mode avoiding the need
+   * for explicit commit (or rollback).
+   * </p>
+   * <p>
+   * This read only DataSource will be used for implicit query only transactions. It is not
+   * used if the transaction is created explicitly or if the query is an update or delete query.
+   * </p>
+   */
+  public void setReadOnlyDataSource(DataSource readOnlyDataSource) {
+    this.readOnlyDataSource = readOnlyDataSource;
+  }
+
  /**
   * Return the configuration to build a DataSource using Ebean's own DataSource
   * implementation.
@@ -1419,6 +1547,42 @@ public class ServerConfig {
    this.dataSourceConfig = dataSourceConfig;
  }

+  /**
+   * Return true if Ebean should create a DataSource for use with implicit read only transactions.
+   */
+  public boolean isAutoReadOnlyDataSource() {
+    return autoReadOnlyDataSource;
+  }
+
+  /**
+   * Set to true if Ebean should create a DataSource for use with implicit read only transactions.
+   */
+  public void setAutoReadOnlyDataSource(boolean autoReadOnlyDataSource) {
+    this.autoReadOnlyDataSource = autoReadOnlyDataSource;
+  }
+
+  /**
+   * Return the configuration for the read only DataSource.
+   * <p>
+   * This is only used if autoReadOnlyDataSource is true.
+   * </p>
+   * <p>
+   * The driver, url, username and password default to the configuration for the main DataSource if they are not
+   * set on this configuration. This means there is actually no need to set any configuration here and we only
+   * set configuration for url, username and password etc if it is different from the main DataSource.
+   * </p>
+   */
+  public DataSourceConfig getReadOnlyDataSourceConfig() {
+    return readOnlyDataSourceConfig;
+  }
+
+  /**
+   * Set the configuration for the read only DataSource.
+   */
+  public void setReadOnlyDataSourceConfig(DataSourceConfig readOnlyDataSourceConfig) {
+    this.readOnlyDataSourceConfig = readOnlyDataSourceConfig;
+  }
+
  /**
   * Return the JNDI name of the DataSource to use.
   */
@@ -1601,6 +1765,20 @@ public class ServerConfig {
    this.databasePlatform = databasePlatform;
  }

+  /**
+   * Return the preferred DB platform IdType.
+   */
+  public IdType getIdType() {
+    return idType;
+  }
+
+  /**
+   * Set the preferred DB platform IdType.
+   */
+  public void setIdType(IdType idType) {
+    this.idType = idType;
+  }
+
  /**
   * Return the EncryptKeyManager.
   */
@@ -1722,6 +1900,34 @@ public class ServerConfig {
    this.dbTypeConfig.setDbUuid(dbUuid);
  }

+  /**
+   * Returns the UUID version mode.
+   */
+  public UuidVersion getUuidVersion() {
+    return uuidVersion;
+  }
+
+  /**
+   * Sets the UUID version mode.
+   */
+  public void setUuidVersion(UuidVersion uuidVersion) {
+    this.uuidVersion = uuidVersion;
+  }
+
+  /**
+   * Return the UUID state file.
+   */
+  public String getUuidStateFile() {
+    return uuidStateFile;
+  }
+
+  /**
+   * Set the UUID state file.
+   */
+  public void setUuidStateFile(String uuidStateFile) {
+    this.uuidStateFile = uuidStateFile;
+  }
+
  /**
   * Return true if LocalTime should be persisted with nanos precision.
   */
@@ -2436,7 +2642,8 @@ public class ServerConfig {
   * Load settings from ebean.properties.
   */
  public void loadFromProperties() {
-    loadFromProperties(PropertyMap.defaultProperties());
+    this.properties = PropertiesLoader.load();
+    configureFromProperties();
  }

  /**
@@ -2444,24 +2651,41 @@ public class ServerConfig {
   */
  public void loadFromProperties(Properties properties) {
    // keep the properties used for configuration so that these are available for plugins
-    this.properties = properties;
+    this.properties = PropertiesLoader.eval(properties);
+    configureFromProperties();
+  }
+
+  /**
+   * Load the settings from the given properties
+   */
+  private void configureFromProperties() {
+    autoConfiguration();
    PropertiesWrapper p = new PropertiesWrapper("ebean", name, properties);
    loadSettings(p);
  }

  /**
+   * Use a 'plugin' to provide automatic configuration. Intended for automatic testing
+   * configuration with Docker containers via ebean-test-config.
+   */
+  private void autoConfiguration() {
+    for (AutoConfigure autoConfigure : serviceLoad(AutoConfigure.class)) {
+      autoConfigure.configure(this);
+    }
+  }
+
+  /**
+   * Deprecated - this does nothing now, we always try to read test configuration.
+   * <p>
   * Load settings from test-ebean.properties and do nothing if the properties is not found.
   * <p>
   * This is typically used when test-ebean.properties is put into the test class path and used
   * to configure Ebean for running tests.
   * </p>
   */
+  @Deprecated
  public void loadTestProperties() {
-    Properties properties = PropertyMap.testProperties();
-    if (!properties.isEmpty()) {
-      PropertiesWrapper p = new PropertiesWrapper("ebean", name, properties);
-      loadSettings(p);
-    }
+    // do nothing now ... as we always try to read test configuration and that should only
  }

  /**
@@ -2508,6 +2732,7 @@ public class ServerConfig {
   */
  protected void loadDataSourceSettings(PropertiesWrapper p) {
    dataSourceConfig.loadSettings(p.properties, name);
+    readOnlyDataSourceConfig.loadSettings(p.properties, name);
  }

  /**
@@ -2529,6 +2754,7 @@ public class ServerConfig {
   */
  protected void loadSettings(PropertiesWrapper p) {

+    profilingConfig.loadSettings(p, name);
    migrationConfig.loadSettings(p, name);

    boolean quotedIdentifiers = p.getBoolean("allQuotedIdentifiers", allQuotedIdentifiers);
@@ -2560,12 +2786,16 @@ public class ServerConfig {
      dbTypeConfig.setGeometrySRID(srid);
    }

+    queryPlanTTLSeconds = p.getInt("queryPlanTTLSeconds", queryPlanTTLSeconds);
    slowQueryMillis = p.getLong("slowQueryMillis", slowQueryMillis);
    docStoreOnly = p.getBoolean("docStoreOnly", docStoreOnly);
    disableL2Cache = p.getBoolean("disableL2Cache", disableL2Cache);
+    notifyL2CacheInForeground = p.getBoolean("notifyL2CacheInForeground", notifyL2CacheInForeground);
    explicitTransactionBeginMode = p.getBoolean("explicitTransactionBeginMode", explicitTransactionBeginMode);
    autoCommitMode = p.getBoolean("autoCommitMode", autoCommitMode);
    useJtaTransactionManager = p.getBoolean("useJtaTransactionManager", useJtaTransactionManager);
+    useJavaxValidationNotNull = p.getBoolean("useJavaxValidationNotNull", useJavaxValidationNotNull);
+    autoReadOnlyDataSource = p.getBoolean("autoReadOnlyDataSource", autoReadOnlyDataSource);

    backgroundExecutorSchedulePoolSize = p.getInt("backgroundExecutorSchedulePoolSize", backgroundExecutorSchedulePoolSize);
    backgroundExecutorShutdownSecs = p.getInt("backgroundExecutorShutdownSecs", backgroundExecutorShutdownSecs);
@@ -2598,6 +2828,7 @@ public class ServerConfig {
      throw new IllegalArgumentException("Property 'batch.mode' or 'persistBatching' is being set but no longer used. Please change to use 'persistBatchMode'");
    }

+    idType = p.getEnum(IdType.class, "idType", idType);
    persistBatch = p.getEnum(PersistBatch.class, "persistBatch", persistBatch);
    persistBatchOnCascade = p.getEnum(PersistBatch.class, "persistBatchOnCascade", persistBatchOnCascade);

@@ -2606,6 +2837,7 @@ public class ServerConfig {

    persistenceContextScope = PersistenceContextScope.valueOf(p.get("persistenceContextScope", "TRANSACTION"));

+    changeLogAsync = p.getBoolean("changeLogAsync", changeLogAsync);
    changeLogIncludeInserts = p.getBoolean("changeLogIncludeInserts", changeLogIncludeInserts);
    expressionEqualsWithNullAsNoop = p.getBoolean("expressionEqualsWithNullAsNoop", expressionEqualsWithNullAsNoop);
    expressionNativeIlike = p.getBoolean("expressionNativeIlike", expressionNativeIlike);
@@ -2621,6 +2853,7 @@ public class ServerConfig {
    databaseBooleanTrue = p.get("databaseBooleanTrue", databaseBooleanTrue);
    databaseBooleanFalse = p.get("databaseBooleanFalse", databaseBooleanFalse);
    databasePlatformName = p.get("databasePlatformName", databasePlatformName);
+    defaultOrderById = p.getBoolean("defaultOrderById", defaultOrderById);

    DbUuid dbUuid = p.getEnum(DbUuid.class, "dbuuid", null);
    if (dbUuid != null) {
@@ -2629,6 +2862,10 @@ public class ServerConfig {
    if (p.getBoolean("uuidStoreAsBinary", false)) {
      dbTypeConfig.setDbUuid(DbUuid.BINARY);
    }
+
+    uuidVersion = p.getEnum(UuidVersion.class, "uuidVersion", uuidVersion);
+    uuidStateFile = p.get("uuidStateFile", uuidStateFile);
+
    localTimeWithNanos = p.getBoolean("localTimeWithNanos", localTimeWithNanos);
    jodaLocalTimeMode = p.get("jodaLocalTimeMode", jodaLocalTimeMode);

@@ -2649,6 +2886,22 @@ public class ServerConfig {
    ddlInitSql = p.get("ddl.initSql", ddlInitSql);
    ddlSeedSql = p.get("ddl.seedSql", ddlSeedSql);

+    // read tenant-configuration from config:
+    // tenant.mode = NONE | DB | SCHEMA | CATALOG | PARTITION
+    String mode = p.get("tenant.mode");
+    if (mode != null) {
+      for (TenantMode value : TenantMode.values()) {
+        if (value.name().equalsIgnoreCase(mode)) {
+          tenantMode = value;
+          break;
+        }
+      }
+    }
+
+    currentTenantProvider = createInstance(p, CurrentTenantProvider.class, "tenant.currentTenantProvider", currentTenantProvider);
+    tenantCatalogProvider = createInstance(p, TenantCatalogProvider.class, "tenant.catalogProvider", tenantCatalogProvider);
+    tenantSchemaProvider = createInstance(p, TenantSchemaProvider.class, "tenant.schemaProvider", tenantSchemaProvider);
+    tenantPartitionColumn = p.get("tenant.partitionColumn", tenantPartitionColumn);
    classes = getClasses(p);
  }

@@ -2689,16 +2942,16 @@ public class ServerConfig {

  private List<String> getSearchJarsPackages(String searchPackages) {

-    List<String> hitList = new ArrayList<>();
-
    if (searchPackages != null) {
-
      String[] entries = StringHelper.splitNames(searchPackages);
-      for (String entry : entries) {
-        hitList.add(entry);
-      }
+
+      List<String> hitList = new ArrayList<>(entries.length);
+      Collections.addAll(hitList, entries);
+
+      return hitList;
+    } else {
+      return new ArrayList<>();
    }
-    return hitList;
  }

  /**
@@ -2781,6 +3034,58 @@ public class ServerConfig {
    this.disableL2Cache = disableL2Cache;
  }

+  /**
+   * Returns if we use javax.validation.constraints.NotNull
+   */
+  public boolean isUseJavaxValidationNotNull() {
+    return useJavaxValidationNotNull;
+  }
+
+  /**
+   * Controls if Ebean should ignore <code>&x64;javax.validation.contstraints.NotNull</code>
+   * with respect to generating a <code>NOT NULL</code> column.
+   * <p>
+   * Normally when Ebean sees javax NotNull annotation it means that column is defined as NOT NULL.
+   * Set this to <code>false</code> and the javax NotNull annotation is effectively ignored (and
+   * we instead use Ebean's own NotNull annotation or JPA Column(nullable=false) annotation.
+   */
+  public void setUseJavaxValidationNotNull(boolean useJavaxValidationNotNull) {
+    this.useJavaxValidationNotNull = useJavaxValidationNotNull;
+  }
+
+  /**
+   * Return true if L2 cache notification should run in the foreground.
+   */
+  public boolean isNotifyL2CacheInForeground() {
+    return notifyL2CacheInForeground;
+  }
+
+  /**
+   * Set this to true to run L2 cache notification in the foreground.
+   * <p>
+   * In general we don't want to do that as when we use a distributed cache (like Ignite, Hazelcast etc)
+   * we are making network calls and we prefer to do this in background and not impact the response time
+   * of the executing transaction.
+   * </p>
+   */
+  public void setNotifyL2CacheInForeground(boolean notifyL2CacheInForeground) {
+    this.notifyL2CacheInForeground = notifyL2CacheInForeground;
+  }
+
+  /**
+   * Return the query plan time to live.
+   */
+  public int getQueryPlanTTLSeconds() {
+    return queryPlanTTLSeconds;
+  }
+
+  /**
+   * Set the query plan time to live.
+   */
+  public void setQueryPlanTTLSeconds(int queryPlanTTLSeconds) {
+    this.queryPlanTTLSeconds = queryPlanTTLSeconds;
+  }
+
  /**
   * Run the DB migration against the DataSource.
   */
@@ -2797,32 +3102,45 @@ public class ServerConfig {
   */
  public enum DbUuid {

+
    /**
     * Store using native UUID in H2 and Postgres and otherwise fallback to VARCHAR(40).
     */
-    AUTO_VARCHAR(true, false),
+    AUTO_VARCHAR(true, false, false),

    /**
     * Store using native UUID in H2 and Postgres and otherwise fallback to BINARY(16).
     */
-    AUTO_BINARY(true, true),
+    AUTO_BINARY(true, true, false),
+
+    /**
+     * Store using native UUID in H2 and Postgres and otherwise fallback to BINARY(16) with optimized packing.
+     */
+    AUTO_BINARY_OPTIMIZED(true, true, true),

    /**
     * Store using DB VARCHAR(40).
     */
-    VARCHAR(false, false),
+    VARCHAR(false, false, false),

    /**
     * Store using DB BINARY(16).
     */
-    BINARY(false, true);
+    BINARY(false, true, false),
+
+    /**
+     * Store using DB BINARY(16).
+     */
+    BINARY_OPTIMIZED(false, true, true);

    boolean nativeType;
    boolean binary;
+    boolean binaryOptimized;

-    DbUuid(boolean nativeType, boolean binary) {
+    DbUuid(boolean nativeType, boolean binary, boolean binaryOptimized) {
      this.nativeType = nativeType;
      this.binary = binary;
+      this.binaryOptimized = binaryOptimized;
    }

    /**
@@ -2838,5 +3156,18 @@ public class ServerConfig {
    public boolean useBinary() {
      return binary;
    }
+
+    /**
+     * Return true, if optimized packing should be used.
+     */
+    public boolean useBinaryOptimized() {
+      return binaryOptimized;
+    }
+  }
+
+  public enum UuidVersion {
+    VERSION4,
+    VERSION1,
+    VERSION1RND
  }
 }
@@ -16,5 +16,5 @@ public interface TenantDataSourceProvider {
  /**
   * Shutdown all the DataSources.
   */
-  default void shutdown(boolean deregisterDriver) {};
+  default void shutdown(boolean deregisterDriver) {}
 }
@@ -8,32 +8,40 @@ public enum TenantMode {
  /**
   * No multi-tenancy.
   */
-  NONE(false),
+  NONE(false, true),

  /**
   * Each Tenant has their own Database (javax.sql.DataSource)
   */
-  DB(true),
+  DB(true, false),

  /**
   * Each Tenant has their own Database schema.
   */
-  SCHEMA(true),
+  SCHEMA(true, false),

  /**
   * Each Tenant has their own Database but with in connection pool
   */
-  CATALOG(true),
+  CATALOG(true, false),

  /**
   * Tenants share tables but have a discriminator/partition column that partitions the data.
   */
-  PARTITION(false);
+  PARTITION(false, true),

+  /**
+   * Each Tenant has their own Database (javax.sql.DataSource), and there is also one master-database
+   * (that holds configuration e.g.)
+   */
+  DB_WITH_MASTER(true, true);
+  
  boolean dynamicDataSource;
+  boolean ddlEnabled;

-  TenantMode(boolean dynamicDataSource) {
+  TenantMode(boolean dynamicDataSource, boolean ddlEnabled) {
    this.dynamicDataSource = dynamicDataSource;
+    this.ddlEnabled = ddlEnabled;
  }

  /**
@@ -42,4 +50,12 @@ public enum TenantMode {
  public boolean isDynamicDataSource() {
    return dynamicDataSource;
  }
+  
+  /**
+   * Returns true, if DDL is enabled.
+   */
+  public boolean isDdlEnabled() {
+    return ddlEnabled;
+  }
+ 
 }
@@ -6,6 +6,8 @@ import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebean.config.CustomDbTypeMapping;
 import io.ebean.config.DbTypeConfig;
+import io.ebean.config.ServerConfig;
+import io.ebean.util.JdbcClose;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -61,6 +63,8 @@ public class DatabasePlatform {
   */
  protected String closeQuote = "\"";

+  protected String concatOperator = "||";
+
  /**
   * When set to true all db column names and table names use quoted identifiers.
   */
@@ -96,6 +100,10 @@ public class DatabasePlatform {
   */
  protected DbIdentity dbIdentity = new DbIdentity();

+  protected boolean sequenceBatchMode = true;
+
+  protected int sequenceBatchSize = 20;
+
  /**
   * The history support for this database platform.
   */
@@ -138,9 +146,25 @@ public class DatabasePlatform {
  private static final char BACK_TICK = '`';

  /**
-   * The like clause. Can be overridden to disable default escape character.
+   * The non-escaped like clause (to stop slash being escaped on some platforms).
+   * Used for the 'raw like' expression but not for startsWith, endsWith and contains expressions.
   */
-  protected String likeClause = "like ?";
+  protected String likeClauseRaw = "like ? escape''";
+
+  /**
+   * Escaped like clause for startsWith, endsWith and contains.
+   */
+  protected String likeClauseEscaped = "like ? escape'|'";
+
+  /**
+   * Escape character used for startsWith, endsWith and contains.
+   */
+  protected char likeEscapeChar = '|';
+
+  /**
+   * Characters escaped for startsWith, endsWith and contains.
+   */
+  protected char[] likeSpecialCharacters = { '%', '_', '|' };

  protected DbEncrypt dbEncrypt;

@@ -175,8 +199,6 @@ public class DatabasePlatform {

  protected SqlExceptionTranslator exceptionTranslator = new SqlCodeTranslator();

-  protected char[] specialLikeCharacters = { '%', '_' };
-
  /**
   * Instantiates a new database platform.
   */
@@ -190,10 +212,19 @@ public class DatabasePlatform {
    return exceptionTranslator.translate(message, e);
  }

+  /**
+   * Configure the platform given the server configuration.
+   */
+  public void configure(ServerConfig config) {
+    this.sequenceBatchSize = config.getDatabaseSequenceBatchSize();
+    configureIdType(config.getIdType());
+    configure(config.getDbTypeConfig(), config.isAllQuotedIdentifiers());
+  }
+
  /**
   * Configure UUID Storage etc based on ServerConfig settings.
   */
-  public void configure(DbTypeConfig config, boolean allQuotedIdentifiers) {
+  protected void configure(DbTypeConfig config, boolean allQuotedIdentifiers) {
    this.allQuotedIdentifiers = allQuotedIdentifiers;
    addGeoTypes(config.getGeometrySRID());
    configureIdType(config.getIdType());
@@ -227,7 +258,7 @@ public class DatabasePlatform {
   * Return true if this matches the given platform.
   */
  public boolean isPlatform(Platform platform) {
-    return this.platform.equals(platform);
+    return this.platform == platform;
  }

  /**
@@ -247,6 +278,20 @@ 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.
   */
@@ -288,10 +333,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 seqName   the name of the sequence
-   * @param batchSize the number of sequences that should be loaded
   */
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
    return null;
  }

@@ -390,8 +435,6 @@ public class DatabasePlatform {

  /**
   * Return the close quote for quoted identifiers.
-   *
-   * @return the close quote
   */
  public String getCloseQuote() {
    return closeQuote;
@@ -399,17 +442,20 @@ public class DatabasePlatform {

  /**
   * Return the open quote for quoted identifiers.
-   *
-   * @return the open quote
   */
  public String getOpenQuote() {
    return openQuote;
  }

+  /**
+   * Return the DB concat operator.
+   */
+  public String getConcatOperator() {
+    return concatOperator;
+  }
+
  /**
   * Return the JDBC type used to store booleans.
-   *
-   * @return the boolean db type
   */
  public int getBooleanDbType() {
    return booleanDbType;
@@ -569,6 +615,14 @@ public class DatabasePlatform {
    return sql;
  }

+  /**
+   * For update hint on the FROM clause (SQL server only).
+   */
+  public String fromForUpdate(Query.ForUpdate forUpdateMode) {
+    // return null except for sql server
+    return null;
+  }
+
  protected String withForUpdate(String sql, Query.ForUpdate forUpdateMode) {
    // silently assume the database does not support the "for update" clause.
    logger.info("it seems your database does not support the 'for update' clause");
@@ -580,8 +634,8 @@ public class DatabasePlatform {
   * <p>
   * This may include an escape clause to disable a default escape character.
   */
-  public String getLikeClause() {
-    return likeClause;
+  public String getLikeClause(boolean rawLikeExpression) {
+    return rawLikeExpression ? likeClauseRaw : likeClauseEscaped;
  }

  /**
@@ -601,18 +655,7 @@ public class DatabasePlatform {
    try {
      return tables.next();
    } finally {
-      close(tables);
-    }
-  }
-
-  /**
-   * Close the resultSet.
-   */
-  protected void close(ResultSet resultSet) {
-    try {
-      resultSet.close();
-    } catch (SQLException e) {
-      logger.error("Error closing resultSet", e);
+      JdbcClose.close(tables);
    }
  }

@@ -624,7 +667,7 @@ public class DatabasePlatform {
    for (int i = 0; i < value.length(); i++) {
      char ch = value.charAt(i);
      boolean escaped = false;
-      for (char escapeChar: specialLikeCharacters) {
+      for (char escapeChar: likeSpecialCharacters) {
        if (ch == escapeChar) {
          if (sb == null) {
            sb = new StringBuilder(value.substring(0, i));
@@ -646,6 +689,6 @@ public class DatabasePlatform {
  }

  protected void escapeLikeCharacter(char ch, StringBuilder sb) {
-    sb.append('\\').append(ch);
+    sb.append(likeEscapeChar).append(ch);
  }
 }
@@ -126,27 +126,33 @@ public class DbPlatformType implements ExtraDbTypes {

    StringBuilder sb = new StringBuilder();
    sb.append(name);
-
    if (canHaveLength || !strict) {
-      // see if there is a precision/scale to add (or not)
-      int len = deployLength != 0 ? deployLength : defaultLength;
-      if (len == Integer.MAX_VALUE) {
-        sb.append("(max)"); // TODO: this is sqlserver specific
-      } else if (len > 0) {
-        sb.append("(");
-        sb.append(len);
-        int scale = deployScale != 0 ? deployScale : defaultScale;
-        if (scale > 0) {
-          sb.append(",");
-          sb.append(scale);
-        }
-        sb.append(")");
-      }
+      renderLengthScale(deployLength, deployScale, sb);
    }

    return sb.toString();
  }

+  /**
+   * Render the length and scale part of the column definition.
+   */
+  protected void renderLengthScale(int deployLength, int deployScale, StringBuilder sb) {
+    // see if there is a precision/scale to add (or not)
+    int len = deployLength != 0 ? deployLength : defaultLength;
+    if (len == Integer.MAX_VALUE) {
+      sb.append("(max)"); // TODO: this is sqlserver specific
+    } else if (len > 0) {
+      sb.append("(");
+      sb.append(len);
+      int scale = deployScale != 0 ? deployScale : defaultScale;
+      if (scale > 0) {
+        sb.append(",");
+        sb.append(scale);
+      }
+      sb.append(")");
+    }
+  }
+
  /**
   * Create a copy of the type with a new default length.
   */
@@ -10,8 +10,23 @@ import java.util.Map;
 */
 public class DbPlatformTypeMapping {

+  /**
+   * Boolean type used for logical model.
+   */
+  private static class BooleanLogicalType extends DbPlatformType {
+    BooleanLogicalType() {
+      super("boolean", false);
+    }
+    @Override
+    protected void renderLengthScale(int deployLength, int deployScale, StringBuilder sb) {
+      // do not have length - even if platform boolean type does like integer(1)
+    }
+  }
+
  private static DbPlatformTypeLookup lookup = new DbPlatformTypeLookup();

+  private static final DbPlatformType BOOLEAN_LOGICAL = new BooleanLogicalType();
+
  private static final DbPlatformType UUID_NATIVE = new DbPlatformType("uuid", false);
  @SuppressWarnings("unused")
  private static final DbPlatformType UUID_PLACEHOLDER = new DbPlatformType("uuidPlaceholder");
@@ -51,7 +66,7 @@ public class DbPlatformTypeMapping {
   */
  private void loadDefaults(boolean logicalTypes) {

-    put(DbType.BOOLEAN);
+    put(DbType.BOOLEAN, BOOLEAN_LOGICAL);
    put(DbType.BIT);
    put(DbType.INTEGER);
    put(DbType.BIGINT);
@@ -0,0 +1,57 @@
+package io.ebean.config.dbplatform;
+
+import io.ebean.BackgroundExecutor;
+
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Database sequence based IdGenerator using Sequence Step 1 but batch fetch many sequence values.
+ */
+public abstract class SequenceBatchIdGenerator extends SequenceIdGenerator {
+
+  /**
+   * Construct where batchSize is the sequence step size.
+   *
+   */
+  public SequenceBatchIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+    super(be, ds, seqName, batchSize);
+  }
+
+  /**
+   * If allocateSize is large load some sequences in a background thread.
+   * <p>
+   * For example, when inserting a bean with a cascade on a OneToMany with many
+   * beans Ebean can call this to ensure .
+   * </p>
+   */
+  @Override
+  public void preAllocateIds(int requestSize) {
+    if (allocationSize > 1 && requestSize > allocationSize) {
+      // only bother if allocateSize is bigger than
+      // the normal loading batchSize
+      if (requestSize > 100) {
+        // max out at 100 for now
+        requestSize = 100;
+      }
+      loadInBackground(requestSize);
+    }
+  }
+
+  /**
+   * Add the next set of Ids as the next value plus all the following numbers up to the step size.
+   */
+  @Override
+  protected List<Long> readIds(ResultSet resultSet, int loadSize) throws SQLException {
+
+    List<Long> newIds = new ArrayList<>(loadSize);
+    while (resultSet.next()) {
+      newIds.add(resultSet.getLong(1));
+    }
+    return newIds;
+  }
+
+}
@@ -2,6 +2,7 @@ package io.ebean.config.dbplatform;

 import io.ebean.BackgroundExecutor;
 import io.ebean.Transaction;
+import io.ebean.util.JdbcClose;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -12,13 +13,15 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;

 /**
 * Database sequence based IdGenerator.
 */
 public abstract class SequenceIdGenerator implements PlatformIdGenerator {

-  private static final Logger logger = LoggerFactory.getLogger(SequenceIdGenerator.class);
+  protected static final Logger logger = LoggerFactory.getLogger("io.ebean.SEQ");

  /**
   * Used to synchronise the idList access.
@@ -41,18 +44,18 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {

  protected final ArrayList<Long> idList = new ArrayList<>(50);

-  protected final int batchSize;
+  protected final int allocationSize;

-  protected int currentlyBackgroundLoading;
+  protected boolean currentlyBackgroundLoading;

  /**
   * Construct given a dataSource and sql to return the next sequence value.
   */
-  public SequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+  protected SequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int allocationSize) {
    this.backgroundExecutor = be;
    this.dataSource = ds;
    this.seqName = seqName;
-    this.batchSize = batchSize;
+    this.allocationSize = allocationSize;
  }

  public abstract String getSql(int batchSize);
@@ -81,26 +84,8 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
   * </p>
   */
  @Override
-  public void preAllocateIds(int allocateSize) {
-    if (batchSize > 1 && allocateSize > batchSize) {
-      // only bother if allocateSize is bigger than
-      // the normal loading batchSize
-      if (allocateSize > 100) {
-        // max out at 100 for now
-        allocateSize = 100;
-      }
-      loadLargeAllocation(allocateSize);
-    }
-  }
-
-  /**
-   * Called by preAllocateIds when we know that a large number of Id's is going
-   * to be needed shortly.
-   */
-  protected void loadLargeAllocation(final int allocateSize) {
-    // preAllocateIds was called with a relatively large batchSize
-    // so we will just go ahead and load those anyway in background
-    backgroundExecutor.execute(() -> loadMoreIds(allocateSize, null));
+  public void preAllocateIds(int requestSize) {
+    // do nothing by default
  }

  /**
@@ -113,80 +98,80 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
  public Object nextId(Transaction t) {
    synchronized (monitor) {

-      if (idList.isEmpty()) {
-        loadMoreIds(batchSize, t);
-      }
-      Long nextId = idList.remove(0);
-
-      if (batchSize > 1) {
-        if (idList.size() <= batchSize / 2) {
-          loadBatchInBackground();
-        }
+      int size = idList.size();
+      if (size > 0) {
+        maybeLoadMoreInBackground(size);
+      } else {
+        loadMore(allocationSize);
      }

-      return nextId;
+      return idList.remove(0);
    }
  }

-  /**
-   * Load another batch of Id's using a background thread.
-   */
-  protected void loadBatchInBackground() {
-
-    // single threaded processing...
-    synchronized (backgroundLoadMonitor) {
-
-      if (currentlyBackgroundLoading > 0) {
-        // skip as already background loading
-        logger.debug("... skip background sequence load (another load in progress)");
-        return;
+  private void maybeLoadMoreInBackground(int currentSize) {
+    if (allocationSize > 1) {
+      if (currentSize <= allocationSize / 2) {
+        loadInBackground(allocationSize);
      }
-
-      currentlyBackgroundLoading = batchSize;
-
-      backgroundExecutor.execute(() -> {
-        loadMoreIds(batchSize, null);
-        synchronized (backgroundLoadMonitor) {
-          currentlyBackgroundLoading = 0;
-        }
-      });
    }
  }

-  protected void loadMoreIds(final int numberToLoad, Transaction t) {
-
-    ArrayList<Long> newIds = getMoreIds(numberToLoad, t);
-
-    if (logger.isDebugEnabled()) {
-      logger.debug("... seq:" + seqName + " loaded:" + numberToLoad + " ids:" + newIds);
-    }
-
+  private void loadMore(int requestSize) {
+    List<Long> newIds = getMoreIds(requestSize);
    synchronized (monitor) {
      idList.addAll(newIds);
    }
  }

+  /**
+   * Load another batch of Id's using a background thread.
+   */
+  protected void loadInBackground(final int requestSize) {
+
+    // single threaded processing...
+    synchronized (backgroundLoadMonitor) {
+      if (currentlyBackgroundLoading) {
+        // skip as already background loading
+        logger.debug("... skip background sequence load (another load in progress)");
+        return;
+      }
+
+      currentlyBackgroundLoading = true;
+
+      backgroundExecutor.execute(() -> {
+        loadMore(requestSize);
+        synchronized (backgroundLoadMonitor) {
+          currentlyBackgroundLoading = false;
+        }
+      });
+    }
+  }
+
+  /**
+   * Read the resultSet returning the list of Id values.
+   */
+  protected abstract List<Long> readIds(ResultSet resultSet, int loadSize) throws SQLException;
+
  /**
   * Get more Id's by executing a query and reading the Id's returned.
   */
-  protected ArrayList<Long> getMoreIds(int loadSize, Transaction t) {
+  protected List<Long> getMoreIds(int requestSize) {

-    String sql = getSql(loadSize);
+    String sql = getSql(requestSize);

-    ArrayList<Long> newIds = new ArrayList<>(loadSize);
-
-    boolean useTxnConnection = t != null;
-
-    Connection c = null;
-    PreparedStatement pstmt = null;
-    ResultSet rset = null;
+    Connection connection = null;
+    PreparedStatement statement = null;
+    ResultSet resultSet = null;
    try {
-      c = useTxnConnection ? t.getConnection() : dataSource.getConnection();
+      connection = dataSource.getConnection();

-      pstmt = c.prepareStatement(sql);
-      rset = pstmt.executeQuery();
-      while (rset.next()) {
-        newIds.add(rset.getLong(1));
+      statement = connection.prepareStatement(sql);
+      resultSet = statement.executeQuery();
+
+      List<Long> newIds = readIds(resultSet, requestSize);
+      if (logger.isTraceEnabled()) {
+        logger.trace("seq:{} loaded:{} sql:{}", seqName, newIds.size(), sql);
      }
      if (newIds.isEmpty()) {
        throw new PersistenceException("Always expecting more than 1 row from " + sql);
@@ -197,46 +182,24 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
    } catch (SQLException e) {
      if (e.getMessage().contains("Database is already closed")) {
        String msg = "Error getting SEQ when DB shutting down " + e.getMessage();
-        logger.info(msg);
+        logger.error(msg);
        System.out.println(msg);
-        return newIds;
+        return Collections.emptyList();
      } else {
        throw new PersistenceException("Error getting sequence nextval", e);
      }
    } finally {
-      if (useTxnConnection) {
-        closeResources(null, pstmt, rset);
-      } else {
-        closeResources(c, pstmt, rset);
-      }
+      closeResources(connection, statement, resultSet);
    }
  }

  /**
   * Close the JDBC resources.
   */
-  protected void closeResources(Connection c, PreparedStatement pstmt, ResultSet rset) {
-    try {
-      if (rset != null) {
-        rset.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing ResultSet", e);
-    }
-    try {
-      if (pstmt != null) {
-        pstmt.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing PreparedStatement", e);
-    }
-    try {
-      if (c != null) {
-        c.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing Connection", e);
-    }
+  private void closeResources(Connection connection, PreparedStatement statement, ResultSet resultSet) {
+    JdbcClose.close(resultSet);
+    JdbcClose.close(statement);
+    JdbcClose.close(connection);
  }

 }
@@ -0,0 +1,39 @@
+package io.ebean.config.dbplatform;
+
+import io.ebean.BackgroundExecutor;
+
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Database sequence based IdGenerator using Sequence Step (e.g. step 50).
+ */
+public abstract class SequenceStepIdGenerator extends SequenceIdGenerator {
+
+  /**
+   * Construct with stepSize (typically 50).
+   */
+  protected SequenceStepIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int stepSize) {
+    super(be, ds, seqName, stepSize);
+  }
+
+  /**
+   * Add the next set of Ids as the next value plus all the following numbers up to the step size.
+   */
+  @Override
+  protected List<Long> readIds(ResultSet resultSet, int ignoreRequestSize) throws SQLException {
+
+    List<Long> newIds = new ArrayList<>(allocationSize);
+    if (resultSet.next()) {
+      long start = resultSet.getLong(1);
+      for (int i = 0; i < allocationSize; i++) {
+        newIds.add(start + i);
+      }
+    }
+    return newIds;
+  }
+
+}
@@ -1,6 +1,7 @@
 package io.ebean.config.dbplatform;

 import io.ebean.Transaction;
+import io.ebean.util.JdbcClose;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -82,27 +83,9 @@ public class SimpleSequenceIdGenerator implements PlatformIdGenerator {
  }

  private void closeResources(ResultSet rset, PreparedStatement pstmt, Connection c) {
-    try {
-      if (rset != null) {
-        rset.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing ResultSet", e);
-    }
-    try {
-      if (pstmt != null) {
-        pstmt.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing PreparedStatement", e);
-    }
-    try {
-      if (c != null) {
-        c.close();
-      }
-    } catch (SQLException e) {
-      logger.error("Error closing Connection", e);
-    }
+    JdbcClose.close(rset);
+    JdbcClose.close(pstmt);
+    JdbcClose.close(c);
  }

 }
@@ -34,6 +34,10 @@ public class SqlCodeTranslator implements SqlExceptionTranslator {
  public PersistenceException translate(String message, SQLException e) {

    DataErrorType errorType = map.get(e.getSQLState());
+    if (errorType == null) {
+      // fall back to error code
+      errorType = map.get(String.valueOf(e.getErrorCode()));
+    }
    if (errorType != null) {
      switch (errorType) {
        case AcquireLock:
@@ -51,10 +51,9 @@ public class DB2Platform extends DatabasePlatform {
   * sequence values.
   */
  @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be,
-                                                       DataSource ds, String seqName, int batchSize) {
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {

-    return new DB2SequenceIdGenerator(be, ds, seqName, batchSize);
+    return new DB2SequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
  }

 }
@@ -1,14 +1,14 @@
 package io.ebean.config.dbplatform.db2;

 import io.ebean.BackgroundExecutor;
-import io.ebean.config.dbplatform.SequenceIdGenerator;
+import io.ebean.config.dbplatform.SequenceBatchIdGenerator;

 import javax.sql.DataSource;

 /**
 * DB2 specific sequence Id Generator.
 */
-public class DB2SequenceIdGenerator extends SequenceIdGenerator {
+public class DB2SequenceIdGenerator extends SequenceBatchIdGenerator {

  private final String baseSql;
  private final String unionBaseSql;
@@ -46,10 +46,8 @@ public class H2Platform extends DatabasePlatform {
   * sequence values.
   */
  @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds,
-                                                       String seqName, int batchSize) {
-
-    return new H2SequenceIdGenerator(be, ds, seqName, batchSize);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+    return new H2SequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
  }

  @Override
@@ -1,14 +1,14 @@
 package io.ebean.config.dbplatform.h2;

 import io.ebean.BackgroundExecutor;
-import io.ebean.config.dbplatform.SequenceIdGenerator;
+import io.ebean.config.dbplatform.SequenceBatchIdGenerator;

 import javax.sql.DataSource;

 /**
 * H2 specific sequence Id Generator.
 */
-public class H2SequenceIdGenerator extends SequenceIdGenerator {
+public class H2SequenceIdGenerator extends SequenceBatchIdGenerator {

  private final String baseSql;
  private final String unionBaseSql;
@@ -31,9 +31,8 @@ public class HsqldbPlatform extends DatabasePlatform {
  }

  @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
-
-    return new H2SequenceIdGenerator(be, ds, seqName, batchSize);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+    return new H2SequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
  }

 }
@@ -1,16 +1,13 @@
 package io.ebean.config.dbplatform.mysql;

-import io.ebean.BackgroundExecutor;
 import io.ebean.Query;
 import io.ebean.annotation.Platform;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
-import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.SqlErrorCodes;

-import javax.sql.DataSource;
 import java.sql.Types;

 /**
@@ -38,22 +35,30 @@ public class MySqlPlatform extends DatabasePlatform {
    this.dbIdentity.setSupportsGetGeneratedKeys(true);
    this.dbIdentity.setSupportsIdentity(true);
    this.dbIdentity.setSupportsSequence(false);
+    
+    this.dbDefaultValue.setNow("now(6)"); // must have same precision as TIMESTAMP
+    this.dbDefaultValue.setFalse("0");
+    this.dbDefaultValue.setTrue("1");
+

    this.exceptionTranslator =
      new SqlErrorCodes()
        .addAcquireLock("1205")
-        .addDuplicateKey("1062")
-        .addDataIntegrity("630","839","840","893","1169","1215","1216","1217","1364","1451","1452","1557","23000")
+        .addDuplicateKey("1062", "1169")
+        .addDataIntegrity("630", "839", "840", "893", "1215", "1216", "1217", "1364", "1451", "1452", "1557")
        .build();

    this.openQuote = "`";
    this.closeQuote = "`";
+    // use pipe for escaping as it depends if mysql runs in no_backslash_escapes or not.
+    this.likeClauseRaw = "like binary ? escape ''";
+    this.likeClauseEscaped = "like binary ? escape '|'";

    this.forwardOnlyHintOnFindIterate = true;
    this.booleanDbType = Types.BIT;

-    dbTypeMap.put(DbType.BIT, new DbPlatformType("tinyint(1) default 0"));
-    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("tinyint(1) default 0"));
+    dbTypeMap.put(DbType.BIT, new DbPlatformType("tinyint(1)"));
+    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("tinyint(1)"));
    dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("datetime(6)"));
    dbTypeMap.put(DbType.CLOB, new MySqlClob());
    dbTypeMap.put(DbType.BLOB, new MySqlBlob());
@@ -61,19 +66,10 @@ public class MySqlPlatform extends DatabasePlatform {
    dbTypeMap.put(DbType.VARBINARY, new DbPlatformType("varbinary", 255));
  }

-  /**
-   * Return null in case there is a sequence annotation.
-   */
-  @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be,
-                                                       DataSource ds, String seqName, int batchSize) {
-
-    return null;
-  }
-
  @Override
  protected String withForUpdate(String sql, Query.ForUpdate forUpdateMode) {
    // NOWAIT and SKIP LOCKED currently not supported with MySQL
    return sql + " for update";
  }
+
 }
@@ -10,12 +10,13 @@ import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
 import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.RownumSqlLimiter;
+import io.ebean.config.dbplatform.SqlErrorCodes;

 import javax.sql.DataSource;
 import java.sql.Types;

 /**
- * Oracle10 and greater specific platform.
+ * Oracle specific platform.
 */
 public class OraclePlatform extends DatabasePlatform {

@@ -29,19 +30,30 @@ public class OraclePlatform extends DatabasePlatform {
    this.basicSqlLimiter = new BasicSqlAnsiLimiter();
    this.historySupport = new OracleDbHistorySupport();

-    // Not using getGeneratedKeys as instead we will
-    // batch load sequences which enables JDBC batch execution
-    dbIdentity.setSupportsGetGeneratedKeys(false);
    dbIdentity.setIdType(IdType.SEQUENCE);
    dbIdentity.setSupportsSequence(true);
+    dbIdentity.setSupportsIdentity(true);
+    dbIdentity.setSupportsGetGeneratedKeys(true);
+
+    this.dbDefaultValue.setFalse("0");
+    this.dbDefaultValue.setTrue("1");
+    this.dbDefaultValue.setNow("current_timestamp");

    this.treatEmptyStringsAsNull = true;
+    this.likeClauseRaw = "like ?";
+
+    this.exceptionTranslator =
+      new SqlErrorCodes()
+        //.addAcquireLock("")
+        .addDuplicateKey("1")
+        .addDataIntegrity("2291")
+        .build();

    this.openQuote = "\"";
    this.closeQuote = "\"";

    booleanDbType = Types.INTEGER;
-    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("number(1) default 0"));
+    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("number(1)"));

    dbTypeMap.put(DbType.INTEGER, new DbPlatformType("number", 10));
    dbTypeMap.put(DbType.BIGINT, new DbPlatformType("number", 19));
@@ -62,9 +74,8 @@ public class OraclePlatform extends DatabasePlatform {
  }

  @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
-
-    return new OracleSequenceIdGenerator(be, ds, seqName, batchSize);
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+    return new OracleSequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
  }

  @Override
@@ -78,4 +89,5 @@ public class OraclePlatform extends DatabasePlatform {
        return sql + " for update";
    }
  }
+
 }
@@ -1,14 +1,14 @@
 package io.ebean.config.dbplatform.oracle;

 import io.ebean.BackgroundExecutor;
-import io.ebean.config.dbplatform.SequenceIdGenerator;
+import io.ebean.config.dbplatform.SequenceBatchIdGenerator;

 import javax.sql.DataSource;

 /**
 * Oracle specific sequence Id Generator.
 */
-public class OracleSequenceIdGenerator extends SequenceIdGenerator {
+public class OracleSequenceIdGenerator extends SequenceBatchIdGenerator {

  private final String baseSql;

@@ -39,6 +39,8 @@ public class PostgresPlatform extends DatabasePlatform {
    this.dbIdentity.setSupportsGetGeneratedKeys(true);
    this.dbIdentity.setSupportsSequence(true);

+    this.dbDefaultValue.setNow("current_timestamp");
+
    this.exceptionTranslator =
      new SqlErrorCodes()
        .addAcquireLock("55P03")
@@ -90,9 +92,9 @@ public class PostgresPlatform extends DatabasePlatform {
   * Create a Postgres specific sequence IdGenerator.
   */
  @Override
-  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, String seqName, int batchSize) {
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {

-    return new PostgresSequenceIdGenerator(be, ds, seqName, batchSize);
+    return new PostgresSequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
  }

  @Override
@@ -1,14 +1,14 @@
 package io.ebean.config.dbplatform.postgres;

 import io.ebean.BackgroundExecutor;
-import io.ebean.config.dbplatform.SequenceIdGenerator;
+import io.ebean.config.dbplatform.SequenceBatchIdGenerator;

 import javax.sql.DataSource;

 /**
 * Postgres specific sequence Id Generator.
 */
-public class PostgresSequenceIdGenerator extends SequenceIdGenerator {
+public class PostgresSequenceIdGenerator extends SequenceBatchIdGenerator {

  private final String baseSql;

@@ -27,7 +27,7 @@ public class SqlAnywherePlatform extends DatabasePlatform {
    this.dbIdentity.setSelectLastInsertedIdTemplate("select @@IDENTITY as X");
    this.dbIdentity.setSupportsIdentity(true);

-    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("bit default 0"));
+    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("bit"));
    dbTypeMap.put(DbType.BIGINT, new DbPlatformType("numeric", 19));
    dbTypeMap.put(DbType.REAL, new DbPlatformType("float(16)"));
    dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("float(32)"));
@@ -19,12 +19,21 @@ public class SQLitePlatform extends DatabasePlatform {
    this.dbIdentity.setSelectLastInsertedIdTemplate("select last_insert_rowid()");

    this.booleanDbType = Types.INTEGER;
+    this.likeClauseRaw = "like ?";
+    this.likeClauseEscaped = "like ?";
+    this.dbDefaultValue.setFalse("0");
+    this.dbDefaultValue.setTrue("1");
+    this.dbDefaultValue.setNow("CURRENT_TIMESTAMP");

-    dbTypeMap.put(DbType.BIT, new DbPlatformType("int default 0"));
-    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("int default 0"));
+    dbTypeMap.put(DbType.BIT, new DbPlatformType("int"));
+    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("int"));
    dbTypeMap.put(DbType.BIGINT, new DbPlatformType("integer"));
    dbTypeMap.put(DbType.SMALLINT, new DbPlatformType("integer"));
+  }

+  @Override
+  protected void escapeLikeCharacter(char ch, StringBuilder sb) {
+    sb.append(ch);
  }

 }
@@ -13,7 +13,7 @@ public class SqlServerBasicSqlLimiter implements BasicSqlLimiter {
    StringBuilder sb = new StringBuilder(50 + dbSql.length());
    sb.append(dbSql);
    if (!dbSql.toLowerCase().contains("order by")) {
-      sb.append(" order by 1 ");
+      sb.append(" order by 1");
    }
    sb.append(" ").append("offset");
    sb.append(" ").append(firstRow).append(" rows");
@@ -1,13 +1,18 @@
 package io.ebean.config.dbplatform.sqlserver;

+import io.ebean.BackgroundExecutor;
+import io.ebean.Query;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
+import io.ebean.config.ServerConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
 import io.ebean.config.dbplatform.IdType;
+import io.ebean.config.dbplatform.PlatformIdGenerator;
 import io.ebean.config.dbplatform.SqlErrorCodes;

+import javax.sql.DataSource;
 import java.sql.Types;

 /**
@@ -18,8 +23,8 @@ public class SqlServerPlatform extends DatabasePlatform {
  public SqlServerPlatform() {
    super();
    this.platform = Platform.SQLSERVER;
-    // effectively disable persistBatchOnCascade mode for SQL Server
-    // due to lack of support for getGeneratedKeys in batch mode
+    // disable persistBatchOnCascade mode for
+    // SQL Server unless we are using sequences
    this.persistBatchOnCascade = PersistBatch.NONE;
    this.idInExpandedForm = true;
    this.selectCountWithAlias = true;
@@ -29,21 +34,27 @@ public class SqlServerPlatform extends DatabasePlatform {
    this.dbIdentity.setIdType(IdType.IDENTITY);
    this.dbIdentity.setSupportsGetGeneratedKeys(true);
    this.dbIdentity.setSupportsIdentity(true);
+    this.dbIdentity.setSupportsSequence(true);
+    this.sequenceBatchMode = false;

    this.exceptionTranslator =
      new SqlErrorCodes()
        .addAcquireLock("1222")
        .addDuplicateKey("2601", "2627")
-        .addDataIntegrity("544", "8114", "8115")
+        .addDataIntegrity("544", "547", "8114", "8115")
        .build();

    this.openQuote = "[";
    this.closeQuote = "]";
-    this.specialLikeCharacters = new char[]{'%', '_', '['};
-    this.likeClause = "like ? COLLATE Latin1_General_BIN";
+    this.likeSpecialCharacters = new char[]{'%', '_', '['};
+    this.likeClauseRaw = "like ? collate Latin1_General_BIN";
+    this.likeClauseEscaped = "like ? collate Latin1_General_BIN";

    booleanDbType = Types.INTEGER;
-    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("bit default 0"));
+    this.dbDefaultValue.setFalse("0");
+    this.dbDefaultValue.setTrue("1");
+    this.dbDefaultValue.setNow("SYSUTCDATETIME()");
+    dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("bit"));

    dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false));
    dbTypeMap.put(DbType.BIGINT, new DbPlatformType("numeric", 19));
@@ -66,8 +77,45 @@ public class SqlServerPlatform extends DatabasePlatform {

  }

+  @Override
+  public void configure(ServerConfig config) {
+    super.configure(config);
+    if (dbIdentity.getIdType() == IdType.SEQUENCE) {
+      this.persistBatchOnCascade = PersistBatch.ALL;
+    }
+  }
+
  @Override
  protected void escapeLikeCharacter(char ch, StringBuilder sb) {
    sb.append('[').append(ch).append(']');
  }
+
+  /**
+   * Create a Postgres specific sequence IdGenerator.
+   */
+  @Override
+  public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
+    return new SqlServerStepSequence(be, ds, seqName, stepSize);
+  }
+
+  /**
+   * For update is part of the FROM clause on the base table for sql server.
+   */
+  @Override
+  public String fromForUpdate(Query.ForUpdate forUpdateMode) {
+    switch (forUpdateMode) {
+      case SKIPLOCKED:
+        return "with (updlock,readpast)";
+      case NOWAIT:
+        return "with (updlock,nowait)";
+      default:
+        return "with (updlock)";
+    }
+  }
+
+  @Override
+  protected String withForUpdate(String sql, Query.ForUpdate forUpdateMode) {
+    // for update are hints on from clause of base table
+    return sql;
+  }
 }
@@ -0,0 +1,24 @@
+package io.ebean.config.dbplatform.sqlserver;
+
+import io.ebean.BackgroundExecutor;
+import io.ebean.config.dbplatform.SequenceStepIdGenerator;
+
+import javax.sql.DataSource;
+
+public class SqlServerStepSequence extends SequenceStepIdGenerator {
+
+  private final String nextSql;
+
+  /**
+   * Construct where batchSize is the sequence step size.
+   */
+  public SqlServerStepSequence(BackgroundExecutor be, DataSource ds, String seqName, int stepSize) {
+    super(be, ds, seqName, stepSize);
+    this.nextSql = "select next value for "+seqName;
+  }
+
+  @Override
+  public String getSql(int batchSize) {
+    return nextSql;
+  }
+}
@@ -0,0 +1,97 @@
+package io.ebean.config.properties;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+/**
+ * Manages the underlying map of properties we are gathering.
+ */
+class LoadContext {
+
+	private static final Logger log = LoggerFactory.getLogger(LoadContext.class);
+
+  /**
+   * Map we are loading the properties into.
+   */
+	private final Map<String, String> map = new LinkedHashMap<>();
+
+  /**
+   * Names of resources/files that were loaded.
+   */
+	private final Set<String> loadedResources = new LinkedHashSet<>();
+
+  /**
+   * Return the input stream (maybe null) for the given source.
+   */
+	InputStream resource(String resourcePath, Loader.Source source) {
+
+    InputStream is = null;
+    if (source == Loader.Source.RESOURCE) {
+      is = getClass().getResourceAsStream("/" + resourcePath);
+      if (is != null) {
+        loadedResources.add(resourcePath);
+      }
+    } else {
+      File file = new File(resourcePath);
+      if (file.exists()) {
+        try {
+          is = new FileInputStream(file);
+          loadedResources.add("file:"+resourcePath);
+        } catch (FileNotFoundException e) {
+          throw new IllegalStateException(e);
+        }
+      }
+    }
+
+		return is;
+	}
+
+  /**
+   * Add a property entry.
+   */
+	void put(String key, String val) {
+	  if (val != null) {
+	    val = val.trim();
+    }
+		map.put(key, val);
+	}
+
+  /**
+   * Evaluate all the expressions and return as a Properties object.
+   */
+	Properties eval() {
+
+		log.info("loaded properties from {}", loadedResources);
+
+		Properties properties = new Properties();
+
+		for (Map.Entry<String, String> entry : map.entrySet()) {
+			String key = entry.getKey();
+			String value = PropertyEval.eval(entry.getValue());
+			properties.setProperty(key, value);
+		}
+
+		return properties;
+	}
+
+  /**
+   * Read the special properties that can point to an external properties source.
+   */
+  String indirectLocation() {
+    String indirectLocation = map.get("load.properties");
+    if (indirectLocation == null) {
+      indirectLocation = map.get("load.properties.override");
+    }
+    return indirectLocation;
+  }
+}
@@ -0,0 +1,170 @@
+package io.ebean.config.properties;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.Properties;
+
+/**
+ * Loads the configuration from known/expected locations.
+ * <p>
+ * Defines the loading order of resources and files.
+ * </p>
+ */
+class Loader {
+
+	private static final Logger log = LoggerFactory.getLogger(Loader.class);
+
+	enum Source {
+	  RESOURCE,
+    FILE
+  }
+
+  private final LoadContext loadContext = new LoadContext();
+
+  private YamlLoader yamlLoader;
+
+	Loader() {
+    String skipYaml = System.getProperty("ebeanSkipYaml");
+    if (!"true".equals(skipYaml)) {
+      try {
+        Class<?> exists = Class.forName("org.yaml.snakeyaml.Yaml");
+        if (exists != null) {
+          yamlLoader = new YamlLoader(loadContext);
+        }
+      } catch (Exception e) {
+        // ignored
+      }
+    }
+  }
+
+  /**
+   * Load the configuration with the expected ordering.
+   */
+	void load() {
+
+    loadMain(Source.RESOURCE);
+    // external file configuration overrides the resources configuration
+    loadMain(Source.FILE);
+
+		loadViaSystemProperty();
+		loadViaIndirection();
+
+		// test configuration (if found) overrides main configuration
+    // we should only find these resources when running tests
+		loadTest();
+	}
+
+  /**
+   * Load test configuration.
+   */
+  private void loadTest() {
+    loadProperties("application-test.properties", Source.RESOURCE);
+    loadYaml("application-test.yml", Source.RESOURCE);
+    loadProperties("test-ebean.properties", Source.RESOURCE);
+  }
+
+  /**
+   * Load configuration defined by a <em>load.properties</em> entry in properties file.
+   */
+  private void loadViaIndirection() {
+
+    String location = loadContext.indirectLocation();
+    if (location != null) {
+      location = PropertyEval.eval(location);
+      loadWithExtensionCheck(location);
+    }
+  }
+
+  /**
+   * Load the main configuration for the given source.
+   */
+  private void loadMain(Source source) {
+    loadYaml("application.yml", source);
+    loadProperties("application.properties", source);
+    loadProperties("ebean.properties", source);
+  }
+
+  private void loadViaSystemProperty() {
+	  String fileName = System.getenv("EBEAN_PROPS_FILE");
+    if (fileName == null) {
+      fileName = System.getProperty("ebean.props.file");
+      if (fileName != null) {
+        loadWithExtensionCheck(fileName);
+      }
+    }
+  }
+
+  void loadWithExtensionCheck(String fileName) {
+    if (fileName.endsWith("yml")) {
+      loadYaml(fileName, Source.FILE);
+    } else if (fileName.endsWith("properties")) {
+      loadProperties(fileName, Source.FILE);
+    } else {
+      throw new IllegalArgumentException("Expecting only yml or properties file but got [" + fileName + "]");
+    }
+  }
+
+  /**
+   * Evaluate all the configuration entries and return as properties.
+   */
+  Properties eval() {
+		return loadContext.eval();
+	}
+
+	void loadYaml(String resourcePath, Source source) {
+		if (yamlLoader != null) {
+		  try {
+			  yamlLoader.load(resource(resourcePath, source));
+      } catch (Exception e) {
+        log.warn("Failed to read yml from:" + resourcePath, e);
+      }
+		}
+	}
+
+	void loadProperties(String resourcePath, Source source) {
+		InputStream is = resource(resourcePath, source);
+		if (is != null) {
+			loadProperties(is);
+		}
+	}
+
+	private InputStream resource(String resourcePath, Source source) {
+		return loadContext.resource(resourcePath, source);
+	}
+
+	private void loadProperties(InputStream is) {
+
+		if (is != null) {
+			try {
+				Properties properties = new Properties();
+				properties.load(is);
+				put(properties);
+			} catch (IOException e) {
+				throw new RuntimeException("Failed to load properties?", e);
+			} finally {
+				close(is);
+			}
+		}
+	}
+
+	private void put(Properties properties) {
+		Enumeration<?> enumeration = properties.propertyNames();
+		while (enumeration.hasMoreElements()) {
+			String key = (String) enumeration.nextElement();
+			String property = properties.getProperty(key);
+			loadContext.put(key, property);
+		}
+	}
+
+	private void close(InputStream is) {
+		try {
+			is.close();
+		} catch (IOException e) {
+			log.warn("Error closing input stream for properties", e);
+		}
+	}
+}
@@ -0,0 +1,85 @@
+package io.ebean.config.properties;
+
+import java.util.Enumeration;
+import java.util.Properties;
+
+/**
+ * Loads and evaluates properties and yml configuration.
+ */
+public class PropertiesLoader {
+
+  private static Properties properties;
+
+  /**
+   * Provides properties by reading known locations.
+   * <p>
+   * <h3>Main configuration</h3>
+   * <p>
+   * <p>Firstly loads from main resources</p>
+   * <pre>
+   *   - application.properties
+   *   - application.yml
+   *   - ebean.properties
+   * </pre>
+   * <p>
+   * <p>Then loads from local files</p>
+   * <pre>
+   *   - application.properties
+   *   - application.yml
+   *   - ebean.properties
+   * </pre>
+   * <p>
+   * <p>Then loads from environment variable <em>EBEAN_PROPS_FILE</em></p>
+   * <p>Then loads from system property <em>ebean.props.file</em></p>
+   * <p>Then loads from <em>load.properties</em></p>
+   * <p>
+   * <h3>Test configuration</h3>
+   * <p>
+   * Once the main configuration is read it will try to read common test configuration.
+   * This will only be successful if the test resources are available (i.e. running tests).
+   * </p>
+   * <p>Loads from test resources</p>
+   * <pre>
+   *   - application-test.properties
+   *   - application-test.yml
+   *   - test-ebean.properties
+   * </pre>
+   */
+  public static synchronized Properties load() {
+
+    if (properties == null) {
+      Loader loader = new Loader();
+      loader.load();
+      properties = loader.eval();
+    }
+
+    return properties;
+  }
+
+  /**
+   * Set (override) a configuration property.
+   *
+   * This is expected to be only called by test configuration logic
+   * (ala automatic test configuration via ebean-test-config).
+   */
+  public static synchronized void setProperty(String key, String value) {
+    load();
+    properties.setProperty(key, value);
+  }
+
+  /**
+   * Return a copy of the properties with 'eval' run on all the values.
+   * This resolves expressions like ${HOME} etc.
+   */
+  public static Properties eval(Properties properties) {
+    Properties evalCopy = new Properties();
+
+    Enumeration<?> names = properties.propertyNames();
+    while (names.hasMoreElements()) {
+      String name = (String)names.nextElement();
+      String value = PropertyEval.eval(properties.getProperty(name));
+      evalCopy.setProperty(name, value);
+    }
+    return evalCopy;
+  }
+}
@@ -0,0 +1,202 @@
+package io.ebean.config.properties;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * Helper used to evaluate expressions such as ${CATALINA_HOME}.
+ * <p>
+ * The expressions can contain environment variables, system properties or JNDI
+ * properties. JNDI expressions take the form ${jndi:propertyName} where you
+ * substitute propertyName with the name of the jndi property you wish to
+ * evaluate.
+ * </p>
+ */
+final class PropertyEval {
+
+	/**
+	 * Prefix for looking up JNDI Environment variable.
+	 */
+	private static final String JAVA_COMP_ENV = "java:comp/env/";
+
+	/**
+	 * Used to detect the start of an expression.
+	 */
+	private static final String START = "${";
+
+	/**
+	 * Used to detect the end of an expression.
+	 */
+	private static final String END = "}";
+
+	/**
+	 * Specify the PropertyHolder.
+	 */
+	private PropertyEval() {
+	}
+
+	/**
+	 * Return the property value evaluating and replacing any expressions such as
+	 * ${CATALINA_HOME}.
+	 */
+	static String eval(String val) {
+		if (val == null) {
+			return null;
+		}
+		int sp = val.indexOf(START);
+		if (sp > -1) {
+			int ep = val.indexOf(END, sp + 1);
+			if (ep > -1) {
+				return eval(val, sp, ep);
+			}
+		}
+		return val;
+	}
+
+	/**
+	 * Convert the expression using JNDI, Environment variables, System Properties
+	 * or existing an property in SystemProperties itself.
+	 */
+	private static String evaluateExpression(String exp) {
+
+		if (isJndiExpression(exp)) {
+			// JNDI property lookup...
+			String val = getJndiProperty(exp);
+			if (val != null) {
+				return val;
+			}
+		}
+		String val = System.getProperty(exp);
+		if (val == null) {
+			val = System.getenv(exp);
+		}
+		return val;
+	}
+
+	private static String eval(String val, int sp, int ep) {
+
+		return new EvalBuffer(val, sp, ep).process();
+	}
+
+
+	private static boolean isJndiExpression(String exp) {
+		return exp.startsWith("JNDI:") || exp.startsWith("jndi:");
+	}
+
+	/**
+	 * Returns null if JNDI is not setup or if the property is not found.
+	 *
+	 * @param key the key of the JNDI Environment property including a JNDI: prefix.
+	 */
+	private static String getJndiProperty(String key) {
+
+		try {
+			// remove the JNDI: prefix
+			key = key.substring(5);
+			return (String) getJndiObject(key);
+		} catch (NamingException ex) {
+			return null;
+		}
+	}
+
+	/**
+	 * Similar to getProperty but throws NamingException if JNDI is not setup or
+	 * if the property is not found.
+	 */
+	private static Object getJndiObject(String key) throws NamingException {
+
+		InitialContext ctx = new InitialContext();
+		return ctx.lookup(JAVA_COMP_ENV + key);
+	}
+
+
+	private static class EvalBuffer {
+
+		private final StringBuilder buf = new StringBuilder();
+		private final String original;
+		private int position;
+		private int start;
+		private int end;
+
+		private String expression;
+		private String defaultValue;
+
+		EvalBuffer(String val, int start, int ep) {
+			this.original = val;
+			this.start = start;
+			this.end = ep;
+			this.position = 0;
+			moveToStart();
+		}
+
+		void moveToStart() {
+			if (start > position) {
+				buf.append(original.substring(position, start));
+				position = start;
+			}
+		}
+
+		void parseForDefault() {
+			int colonPos = original.lastIndexOf(':', end);
+			if (colonPos > start) {
+				expression = original.substring(start + START.length(), colonPos);
+				defaultValue = original.substring(colonPos + 1, end);
+			} else {
+				expression = original.substring(start + START.length(), end);
+			}
+		}
+
+		void evaluate() {
+			String eval = evaluateExpression(expression);
+			if (eval != null) {
+				buf.append(eval);
+			} else {
+				if (defaultValue != null) {
+					buf.append(defaultValue);
+				} else {
+					buf.append(START).append(expression).append(END);
+				}
+			}
+		}
+
+		String end() {
+			if (end < original.length() - 1) {
+				buf.append(original.substring(end + 1));
+			}
+			return buf.toString();
+		}
+
+		boolean next() {
+			if (end < original.length()) {
+				int startPos = original.indexOf(START, end + 1);
+				if (startPos > -1) {
+					int endPos = original.indexOf(END, startPos + 1);
+					if (endPos > -1) {
+						if (startPos > end + 1) {
+							buf.append(original.substring(end + 1, startPos));
+						}
+						this.start = startPos;
+						this.end = endPos;
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+
+		private void evalNext() {
+			parseForDefault();
+			evaluate();
+		}
+
+		String process() {
+			evalNext();
+			while (next()) {
+				evalNext();
+			}
+			return end();
+		}
+
+	}
+
+}
@@ -0,0 +1,58 @@
+package io.ebean.config.properties;
+
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.InputStream;
+import java.util.Map;
+
+/**
+ * Loads configuration from Yml into the load context.
+ * <p>
+ * Note that this ignores 'lists' so just reads 'maps' and scalar values.
+ * </p>
+ */
+class YamlLoader {
+
+  private final Yaml yaml = new Yaml();
+
+  private final LoadContext loadContext;
+
+  YamlLoader(LoadContext loadContext) {
+    this.loadContext = loadContext;
+  }
+
+  @SuppressWarnings("unchecked")
+  void load(InputStream is) {
+    if (is != null) {
+      for (Object map : yaml.loadAll(is)) {
+        loadMap((Map<String, Object>)map, null);
+      }
+    }
+  }
+
+  @SuppressWarnings("unchecked")
+  void loadMap(Map<String, Object> map, String path) {
+
+    for (Map.Entry<String, Object> entry : map.entrySet()) {
+      String key = entry.getKey();
+      if (path != null) {
+        key = path + "." + key;
+      }
+      Object val = entry.getValue();
+      if (val instanceof Map) {
+        loadMap((Map<String, Object>) val, key);
+      } else  {
+        addScalar(key, val);
+      }
+    }
+  }
+
+  private void addScalar(String key, Object val) {
+    if (val instanceof String) {
+      loadContext.put(key, (String) val);
+    } else if (val instanceof Number || val instanceof Boolean) {
+      loadContext.put(key, val.toString());
+    }
+  }
+
+}
@@ -83,6 +83,16 @@ public interface DbMigration {
   */
  void setPlatform(DatabasePlatform databasePlatform);

+  /**
+   * Set to false to turn off strict mode.
+   * <p>
+   * Strict mode checks that a column changed to non-null on an existing table via DB migration has a default
+   * value specified. Set this to false if that isn't the case but it is known that all the existing rows have
+   * a value specified (there are no existing null values for the column).
+   * </p>
+   */
+  void setStrictMode(boolean strictMode);
+
  /**
   * Add an additional platform to write the migration DDL.
   * <p>
@@ -92,6 +102,14 @@ public interface DbMigration {
   */
  void addPlatform(Platform platform, String prefix);

+  /**
+   * Add an additional databasePlatform to write the migration DDL.
+   * <p>
+   * Use this when you want to add preconfigured database platforms.
+   * </p>
+   */
+  void addDatabasePlatform(DatabasePlatform databasePlatform, String prefix);
+
  /**
   * Generate the next migration xml file and associated apply and rollback sql scripts.
   * <p>
@@ -101,7 +119,6 @@ public interface DbMigration {
   * <pre>{@code
   *
   *   DbMigration migration = DbMigration.create();
-   *
   *   migration.setPlatform(Platform.POSTGRES);
   *
   *   migration.generateMigration();
@@ -0,0 +1,26 @@
+package io.ebean.event;
+
+import io.ebean.EbeanServer;
+import io.ebean.Transaction;
+
+/**
+ * A request to delete a bean by Id value.
+ */
+public interface BeanDeleteIdRequest {
+
+  /**
+   * Return the server processing the request.
+   */
+  EbeanServer getEbeanServer();
+
+  /**
+   * Return the Transaction associated with this request.
+   */
+  Transaction getTransaction();
+
+  /**
+   * Returns the Id value of the bean being deleted.
+   */
+  Object getId();
+
+}
@@ -87,4 +87,11 @@ public abstract class BeanPersistAdapter implements BeanPersistController {
  public void postSoftDelete(BeanPersistRequest<?> request) {
  }

+  /**
+   * Does nothing by default.
+   */
+  @Override
+  public void preDelete(BeanDeleteIdRequest request) {
+
+  }
 }
@@ -92,6 +92,11 @@ public interface BeanPersistController {
   */
  boolean preSoftDelete(BeanPersistRequest<?> request);

+  /**
+   * Prior to a delete by id perform some action.
+   */
+  void preDelete(BeanDeleteIdRequest request);
+
  /**
   * Called after the insert was performed.
   */
@@ -24,4 +24,13 @@ public interface BeanQueryRequest<T> {
   */
  Query<T> getQuery();

+  /**
+   * Return true if multi-value binding using Array or Table Values is supported.
+   */
+  boolean isMultiValueIdSupported();
+
+  /**
+   * Return true if multi-value binding is supported for this value type.
+   */
+  boolean isMultiValueSupported(Class<?> valueType);
 }
@@ -8,37 +8,43 @@ public class BeanChange {
  /**
   * The underling base table name.
   */
-  private final String type;
+  private String type;

  /**
   * The tenantId value.
   */
-  private final Object tenantId;
+  private Object tenantId;

  /**
   * The id value.
   */
-  private final Object id;
+  private Object id;

  /**
   * The INSERT, UPDATE or DELETE change type.
   */
-  private final ChangeType event;
+  private ChangeType event;

  /**
   * The time the bean change was created.
   */
-  private final long eventTime;
+  private long eventTime;

  /**
   * The change in JSON form.
   */
-  private final String data;
+  private String data;

  /**
   * The change in JSON form.
   */
-  private final String oldData;
+  private String oldData;
+
+  /**
+   * Constructor for JSON tools.
+   */
+  public BeanChange() {
+  }

  /**
   * Construct with change as JSON.
@@ -1,17 +0,0 @@
-package io.ebean.meta;
-
-import java.util.List;
-
-public interface MetaBeanInfo {
-
-  /**
-   * Collect the current query plan statistics return the non-empty statistics.
-   */
-  List<MetaQueryPlanStatistic> collectQueryPlanStatistics(boolean reset);
-
-  /**
-   * Collect the current query plan statistics return all the statistics (include query plans that haven't had query executions).
-   */
-  List<MetaQueryPlanStatistic> collectAllQueryPlanStatistics(boolean reset);
-
-}
@@ -8,17 +8,17 @@ import java.util.List;
 public interface MetaInfoManager {

  /**
-   * Return the MetaBeanInfo for a bean type.
+   * Collect and return the transaction execution metrics.
   */
-  MetaBeanInfo getMetaBeanInfo(Class<?> beanClass);
+  List<MetaTimedMetric> collectTransactionStatistics(boolean reset);

  /**
-   * Return all the MetaBeanInfo.
+   * Collect query plan statistics (new, will migrate ORM query stats over to this).
   */
-  List<MetaBeanInfo> getMetaBeanInfoList();
+  List<MetaQueryMetric> collectQueryStatistics(boolean reset);

  /**
-   * Collect and return the query plan statistics for all the beans.
+   * Collect and return the non-empty query plan statistics for all the beans.
   * <p>
   * Note that this excludes the query plan statistics where there has been no
   * executions (since the last collection with reset).
@@ -0,0 +1,23 @@
+package io.ebean.meta;
+
+/**
+ * Query execution metrics.
+ */
+public interface MetaQueryMetric extends MetaTimedMetric {
+
+  /**
+   * The type of entity or DTO bean.
+   */
+  Class<?> getType();
+
+  /**
+   * The label for the query (can be null).
+   */
+  String getLabel();
+
+  /**
+   * The actual SQL of the query.
+   */
+  String getSql();
+
+}
@@ -1,5 +1,7 @@
 package io.ebean.meta;

+import io.ebean.ProfileLocation;
+
 import java.util.List;

 /**
@@ -14,6 +16,11 @@ public interface MetaQueryPlanStatistic {
   */
  Class<?> getBeanType();

+  /**
+   * Return the profile location.
+   */
+  ProfileLocation getProfileLocation();
+
  /**
   * Return true if this query plan was tuned by AutoTune.
   */
@@ -0,0 +1,50 @@
+package io.ebean.meta;
+
+
+/**
+ * Timed execution statistics.
+ */
+public interface MetaTimedMetric {
+
+  /**
+   * Return the metric name.
+   */
+  String getName();
+
+  /**
+   * Return the metric location if defined.
+   */
+  String getLocation();
+
+  /**
+   * Return the time the counters started from.
+   */
+  long getStartTime();
+
+  /**
+   * Return the total count.
+   */
+  long getCount();
+
+  /**
+   * Return the total execution time in micros.
+   */
+  long getTotal();
+
+  /**
+   * Return the max execution time in micros.
+   */
+  long getMax();
+
+  /**
+   * Return the mean execution time in micros.
+   */
+  long getMean();
+
+  /**
+   * Return the total beans or rows processed or loaded.
+   *
+   * This will be 0 if the metric isn't a query plan (like transaction execution statistics).
+   */
+  long getBeanCount();
+}
@@ -20,6 +20,11 @@ public interface BeanType<T> {
   */
  String getName();

+  /**
+   * Return the profileId of the bean type.
+   */
+  short getProfileId();
+
  /**
   * Return the full name of the bean type.
   */
@@ -47,4 +47,9 @@ public interface SpiServer extends EbeanServer {
   */
  DataSource getDataSource();

+  /**
+   * Return the associated read only DataSource for this EbeanServer instance (can be null).
+   */
+  DataSource getReadOnlyDataSource();
+
 }
@@ -0,0 +1,24 @@
+package io.ebean.service;
+
+import io.ebean.ProfileLocation;
+
+/**
+ * Factory for creating profile locations.
+ */
+public interface SpiProfileLocationFactory {
+
+  /**
+   * Create a profile location.
+   */
+  ProfileLocation create();
+
+  /**
+   * Create a profile location with a line number.
+   */
+  ProfileLocation create(int lineNumber, String label);
+
+  /**
+   * Create a known location.
+   */
+  ProfileLocation createAt(String location);
+}
--- a/Show More
+++ b/Show More