[maven-release-plugin] prepare release ebean-parent-12.9.2

When the value is null and not changed then is was null before and should not be treated as dirty. Hence only check for dirty when value != null in BeanDescriptor 3182

.gitignore

@@ -1,6 +1,4 @@
 *.autofetch
-*create-all.sql
-*drop-all.sql
 *.orig
 .classpath
 .project
@@ -12,7 +10,6 @@ ebean-autotune.xml
 ebean-profiling*.xml
 /db
 /mydb.db
-!src/test/ddl-review/*.sql
 profiling/
 
 # Intellij project files
@@ -20,4 +17,4 @@ profiling/
 *.ipr
 *.iws
 .idea/
-*uuid.state
+*uuid.state

CONFIGURATION.md

@@ -293,6 +293,6 @@ ebean.tenant.schemaProvider
 ebean.updateAllPropertiesInBatch
 ebean.updateChangesOnly
 ebean.updatesDeleteMissingChildren
-ebean.useJavaxValidationNotNull
+ebean.useValidationNotNull
 ebean.useJtaTransactionManager
 

ebean-api/pom.xml

@@ -4,16 +4,13 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 
+  <name>ebean api</name>
+  <description>ebean api</description>
   <artifactId>ebean-api</artifactId>
 
-  <properties>
-    <jackson-core.version>2.11.3</jackson-core.version>
-    <jackson-databind.version>2.11.3</jackson-databind.version>
-  </properties>
-
   <dependencies>
 
     <!--
@@ -23,14 +20,14 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
+      <version>1.7.30</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-config</artifactId>
-      <version>1.1</version>
+      <version>1.3</version>
     </dependency>
 
     <!--
@@ -53,7 +50,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>6.13</version>
+      <version>7.0</version>
     </dependency>
 
     <dependency>
@@ -64,21 +61,15 @@
 
     <dependency>
       <groupId>io.ebean</groupId>
-      <artifactId>ebean-datasource</artifactId>
-      <version>6.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-migration</artifactId>
-      <version>12.1.4</version>
+      <artifactId>ebean-datasource-api</artifactId>
+      <version>${ebean-datasource.version}</version>
     </dependency>
 
     <!-- Jackson core used internally by Ebean -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${jackson-core.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
@@ -86,7 +77,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson-databind.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
@@ -106,14 +97,6 @@
       <optional>true</optional>
     </dependency>
 
-    <!-- provided scope to read validation annotations Size etc -->
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-      <version>1.1.0.Final</version>
-      <optional>true</optional>
-    </dependency>
-
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>

ebean-api/src/main/java/io/ebean/BackgroundExecutor.java

@@ -1,33 +1,43 @@
 package io.ebean;
 
 import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
 /**
- * Background thread pool service for executing of tasks asynchronously.
+ * Background executor service for executing of tasks asynchronously.
  * <p>
- * This service is used internally by Ebean for executing background tasks such
- * as the {@link Query#findFutureList()} and also for executing background tasks
- * periodically.
- * </p>
+ * This service can be used to execute tasks in the background.
  * <p>
- * This service has been made available so you can use it for your application
- * code if you want. It can be useful for some server caching implementations
- * (background population and trimming of the cache etc).
- * </p>
- *
- * @author rbygrave
+ * This service is managed by Ebean and will perform a clean shutdown
+ * waiting for background tasks to complete with a default 30 second
+ * timeout. Shutdown occurs prior to DataSource shutdown.
+ * <p>
+ * This also propagates MDC context from the current thread to the
+ * background task if defined.
  */
 public interface BackgroundExecutor {
 
   /**
-   * Execute a task in the background.
+   * Execute a callable task in the background returning the Future.
    */
-  void execute(Runnable r);
+  <T> Future<T> submit(Callable<T> task);
 
   /**
+   * Execute a runnable task in the background returning the Future.
+   */
+  Future<?> submit(Runnable task);
+
+  /**
+   * Execute a task in the background. Effectively the same as
+   * {@link BackgroundExecutor#submit(Runnable)} but returns void.
+   */
+  void execute(Runnable task);
+
+  /**
+   * Deprecated - migrate to scheduleWithFixedDelay().
    * Execute a task periodically with a fixed delay between each execution.
    * <p>
    * For example, execute a runnable every minute.
@@ -36,27 +46,64 @@ public interface BackgroundExecutor {
    * That is, this method has the same behaviour characteristics as
    * {@link ScheduledExecutorService#scheduleWithFixedDelay(Runnable, long, long, TimeUnit)}
    */
-  void executePeriodically(Runnable r, long delay, TimeUnit unit);
+  @Deprecated
+  void executePeriodically(Runnable task, long delay, TimeUnit unit);
 
   /**
+   * Deprecated - migrate to scheduleWithFixedDelay().
    * Execute a task periodically additionally with an initial delay different from delay.
    */
-  void executePeriodically(Runnable r, long initialDelay, long delay, TimeUnit unit);
+  @Deprecated
+  void executePeriodically(Runnable task, long initialDelay, long delay, TimeUnit unit);
+
+  /**
+   * Execute a task periodically with a given delay.
+   *
+   * @param task         the task to execute
+   * @param initialDelay the time to delay first execution
+   * @param delay        the delay between the termination of one
+   *                     execution and the commencement of the next
+   * @param unit         the time unit of the initialDelay and delay parameters
+   * @return a ScheduledFuture representing pending completion of
+   * the series of repeated tasks.  The future's {@link
+   * Future#get() get()} method will never return normally,
+   * and will throw an exception upon task cancellation or
+   * abnormal termination of a task execution.
+   */
+  ScheduledFuture<?> scheduleWithFixedDelay(Runnable task, long initialDelay, long delay, TimeUnit unit);
+
+  /**
+   * Execute a task periodically with a given period.
+   *
+   * <p>If any execution of this task takes longer than its period, then
+   * subsequent executions may start late, but will not concurrently
+   * execute.
+   *
+   * @param task         the task to execute
+   * @param initialDelay the time to delay first execution
+   * @param period       the period between successive executions
+   * @param unit         the time unit of the initialDelay and period parameters
+   * @return a ScheduledFuture representing pending completion of
+   * the series of repeated tasks.  The future's {@link
+   * Future#get() get()} method will never return normally,
+   * and will throw an exception upon task cancellation or
+   * abnormal termination of a task execution.
+   */
+  ScheduledFuture<?> scheduleAtFixedRate(Runnable task, long initialDelay, long period, TimeUnit unit);
 
   /**
    * Schedules a Runnable for one-shot action that becomes enabled after the given delay.
    *
    * @return a ScheduledFuture representing pending completion of the task and
-   *         whose get() method will return null upon completion
+   * whose get() method will return null upon completion
    */
-  ScheduledFuture<?> schedule(Runnable r, long delay, TimeUnit unit);
+  ScheduledFuture<?> schedule(Runnable task, long delay, TimeUnit unit);
 
   /**
    * Schedules a Callable for one-shot action that becomes enabled after the given delay.
    *
    * @return a ScheduledFuture that can be used to extract result or cancel
    */
-  <V> ScheduledFuture<V> schedule(Callable<V> c, long delay, TimeUnit unit);
-
+  <V> ScheduledFuture<V> schedule(Callable<V> task, long delay, TimeUnit unit);
 
 }

ebean-api/src/main/java/io/ebean/BeanFinder.java

@@ -14,7 +14,7 @@ import java.util.Optional;
  *
  * public class CustomerFinder extends BeanFinder<Long,Customer> {
  *
- *   ＠Inject
+ *   @Inject
  *   public CustomerFinder(Database database) {
  *     super(Customer.class, database);
  *   }

ebean-api/src/main/java/io/ebean/BeanRepository.java

@@ -9,10 +9,10 @@ import java.util.Collection;
  * <p>
  * <pre>{@code
  *
- * ＠Repository
+ * @Repository
  * public class CustomerRepository extends BeanRepository<Long,Customer> {
  *
- *   ＠Inject
+ *   @Inject
  *   public CustomerRepository(Database server) {
  *     super(Customer.class, server);
  *   }

ebean-api/src/main/java/io/ebean/DB.java

@@ -70,6 +70,13 @@ public final class DB {
   private DB() {
   }
 
+  /**
+   * Backdoor for registering a mock implementation of Database as the default database.
+   */
+  protected static Database mock(String name, Database server, boolean defaultServer) {
+    return context.mock(name, server, defaultServer);
+  }
+
   /**
    * Return the default database.
    */

ebean-api/src/main/java/io/ebean/Database.java

@@ -14,6 +14,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.persistence.OptimisticLockException;
 import javax.persistence.PersistenceException;
+import javax.sql.DataSource;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -121,6 +122,16 @@ public interface Database {
    */
   AutoTune getAutoTune();
 
+  /**
+   * Return the associated DataSource for this Database instance.
+   */
+  DataSource getDataSource();
+
+  /**
+   * Return the associated read only DataSource for this Database instance (can be null).
+   */
+  DataSource getReadOnlyDataSource();
+
   /**
    * Return the name. This is used with {@link DB#byName(String)} to get a
    * Database that was registered with the DB singleton.
@@ -886,7 +897,7 @@ public interface Database {
    * <pre>{@code
    *   public class Order { ...
    *
-   *     ＠OneToMany(cascade=CascadeType.ALL, mappedBy="order")
+   *     @OneToMany(cascade=CascadeType.ALL, mappedBy="order")
    * 	   List<OrderDetail> details;
    * 	   ...
    *   }

ebean-api/src/main/java/io/ebean/DatabaseFactory.java

@@ -31,8 +31,9 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public class DatabaseFactory {
 
-  private static final ReentrantLock lock = new ReentrantLock(false);
+  private static final ReentrantLock lock = new ReentrantLock();
   private static SpiContainer container;
+  private static String defaultServerName;
 
   static {
     EbeanVersion.getVersion();
@@ -76,6 +77,12 @@ public class DatabaseFactory {
       }
       Database server = createInternal(config);
       if (config.isRegister()) {
+        if (config.isDefaultServer()) {
+          if (defaultServerName != null && !defaultServerName.equals(config.getName())) {
+            throw new IllegalStateException("Registering [" + config.getName() + "] as the default server but [" + defaultServerName + "] is already registered as the default");
+          }
+          defaultServerName = config.getName();
+        }
         DbPrimary.setSkip(true);
         DbContext.getInstance().register(server, config.isDefaultServer());
       }

ebean-api/src/main/java/io/ebean/DbContext.java

@@ -27,7 +27,7 @@ final class DbContext {
 
   private final HashMap<String, Database> syncMap = new HashMap<>();
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   /**
    * The 'default' Database.

ebean-api/src/main/java/io/ebean/DbPrimary.java

@@ -12,7 +12,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 class DbPrimary {
 
-  private static final ReentrantLock lock = new ReentrantLock(false);
+  private static final ReentrantLock lock = new ReentrantLock();
   private static String defaultServerName;
   private static boolean skip;
 

ebean-api/src/main/java/io/ebean/DocumentStore.java

@@ -2,8 +2,8 @@ package io.ebean;
 
 import io.ebean.docstore.DocQueryContext;
 import io.ebean.docstore.RawDoc;
-import javax.annotation.Nullable;
 
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -149,7 +149,7 @@ public interface DocumentStore {
    *    .setUseDocStore(true)
    *    .where()... // perhaps add predicates
    *    .findEachWhile(new Predicate<Order>() {
-   *      ＠Override
+   *      @Override
    *      public void accept(Order bean) {
    *        // process the bean
    *

ebean-api/src/main/java/io/ebean/DtoQuery.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 /**
  * Query for performing native SQL queries that return DTO Bean's.
@@ -45,6 +46,26 @@ public interface DtoQuery<T> {
   @Nonnull
   List<T> findList();
 
+  /**
+   * Execute the query iterating a row at a time.
+   * <p>
+   * Note that the QueryIterator holds resources related to the underlying
+   * resultSet and potentially connection and MUST be closed. We should use
+   * QueryIterator in a <em>try with resource block</em>.
+   */
+  @Nonnull
+  QueryIterator<T> findIterate();
+
+  /**
+   * Execute the query returning a Stream.
+   * <p>
+   * Note that the Stream holds resources related to the underlying
+   * resultSet and potentially connection and MUST be closed. We should use
+   * the Stream in a <em>try with resource block</em>.
+   */
+  @Nonnull
+  Stream<T> findStream();
+
   /**
    * Execute the query iterating a row at a time.
    * <p>
@@ -53,6 +74,17 @@ public interface DtoQuery<T> {
    */
   void findEach(Consumer<T> consumer);
 
+  /**
+   * Execute the query iterating the results and batching them for the consumer.
+   * <p>
+   * This runs like findEach streaming results from the database but just collects the results
+   * into batches to pass to the consumer.
+   *
+   * @param batch    The number of dto beans to collect before given them to the consumer
+   * @param consumer The consumer to process the batch of DTO beans
+   */
+  void findEach(int batch, Consumer<List<T>> consumer);
+
   /**
    * Execute the query iterating a row at a time with the ability to stop consuming part way through.
    * <p>

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

@@ -346,7 +346,7 @@ public final class Ebean {
    * <pre>{@code
    *   public class Order { ...
    *
-   *     ＠OneToMany(cascade=CascadeType.ALL, mappedBy="order")
+   *     @OneToMany(cascade=CascadeType.ALL, mappedBy="order")
    * 	   List<OrderDetail> details;
    * 	   ...
    *   }

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

@@ -2,13 +2,6 @@ package io.ebean;
 
 import io.ebean.config.ContainerConfig;
 import io.ebean.config.ServerConfig;
-import io.ebean.service.SpiContainer;
-import io.ebean.service.SpiContainerFactory;
-
-import javax.persistence.PersistenceException;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.ServiceLoader;
 
 /**
  * Deprecated - please migrate to DatabaseFactory.

ebean-api/src/main/java/io/ebean/ExpressionFactory.java

@@ -200,7 +200,7 @@ public interface ExpressionFactory {
   Expression gtOrNull(String propertyName, Object value);
 
   /**
-   * Greater than or Equal to OR Null <code> >= or null </code>
+   * Greater than or Equal to OR Null ({@code >= or null })
    * <p>
    * A convenient expression combining GE and Is Null.  Most often useful for range
    * expressions where the top range value is nullable.
@@ -227,7 +227,7 @@ public interface ExpressionFactory {
   Expression ltOrNull(String propertyName, Object value);
 
   /**
-   * Less Than or Equal to OR Null <code> <= or null </code>
+   * Less Than or Equal to OR Null ({@code <= or null })
    * <p>
    * A convenient expression combining LE and Is Null.  Most often useful for range
    * expressions where the bottom range value is nullable.

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

@@ -169,6 +169,28 @@ public interface ExpressionList<T> {
    */
   UpdateQuery<T> asUpdate();
 
+  /**
+   * Execute the query with the given lock type and WAIT.
+   * <p>
+   * Note that <code>forUpdate()</code> is the same as
+   * <code>withLock(LockType.UPDATE)</code>.
+   * <p>
+   * Provides us with the ability to explicitly use Postgres
+   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
+   */
+  Query<T> withLock(Query.LockType lockType);
+
+  /**
+   * Execute the query with the given lock type and lock wait.
+   * <p>
+   * Note that <code>forUpdateNoWait()</code> is the same as
+   * <code>withLock(LockType.UPDATE, LockWait.NOWAIT)</code>.
+   * <p>
+   * Provides us with the ability to explicitly use Postgres
+   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
+   */
+  Query<T> withLock(Query.LockType lockType, Query.LockWait lockWait);
+
   /**
    * Execute using "for update" clause which results in the DB locking the record.
    */
@@ -285,6 +307,13 @@ public interface ExpressionList<T> {
    */
   void findEach(Consumer<T> consumer);
 
+  /**
+   * Execute findEach with a batch consumer.
+   *
+   * @see Query#findEach(int, Consumer)
+   */
+  void findEach(int batch, Consumer<List<T>> consumer);
+
   /**
    * Execute the query processing the beans one at a time with the ability to
    * stop processing before reading all the beans.
@@ -887,7 +916,7 @@ public interface ExpressionList<T> {
   ExpressionList<T> gtOrNull(String propertyName, Object value);
 
   /**
-   * Greater Than or Equal to OR Null - <code> >= or null </code>.
+   * Greater Than or Equal to OR Null - ({@code >= or null }).
    */
   ExpressionList<T> geOrNull(String propertyName, Object value);
 
@@ -908,7 +937,7 @@ public interface ExpressionList<T> {
   ExpressionList<T> ltOrNull(String propertyName, Object value);
 
   /**
-   * Less Than or Equal to OR Null - <code> <= or null </code>.
+   * Less Than or Equal to OR Null - ({@code <= or null }).
    */
   ExpressionList<T> leOrNull(String propertyName, Object value);
 
@@ -1642,7 +1671,7 @@ public interface ExpressionList<T> {
   ExpressionList<T> endAnd();
 
   /**
-   * End a AND junction - synonym for endJunction().
+   * End a OR junction - synonym for endJunction().
    */
   ExpressionList<T> endOr();
 

ebean-api/src/main/java/io/ebean/ExtendedServer.java

@@ -159,6 +159,13 @@ public interface ExtendedServer {
    */
   <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction);
 
+  /**
+   * Execute findEach with batch consumer.
+   *
+   * @see Query#findEach(int, Consumer)
+   */
+  <T> void findEach(Query<T> query, int batch, Consumer<List<T>> consumer, Transaction t);
+
   /**
    * Execute the query visiting the each bean one at a time.
    * <p>

ebean-api/src/main/java/io/ebean/FetchConfig.java

@@ -3,30 +3,13 @@ package io.ebean;
 import java.io.Serializable;
 
 /**
- * Defines the configuration options for a "query fetch" or a
- * "lazy loading fetch". This gives you the ability to use multiple smaller
- * queries to populate an object graph as opposed to a single large query.
- * <p>
- * The primary goal is to provide efficient ways of loading complex object
- * graphs avoiding SQL Cartesian product and issues around populating object
- * graphs that have multiple *ToMany relationships.
- * </p>
- * <p>
- * It also provides the ability to control the lazy loading queries (batch size,
- * selected properties and fetches) to avoid N+1 queries etc.
- * <p>
- * There can also be cases loading across a single OneToMany where 2 SQL queries
- * using Ebean FetchConfig.query() can be more efficient than one SQL query.
- * When the "One" side is wide (lots of columns) and the cardinality difference
- * is high (a lot of "Many" beans per "One" bean) then this can be more
- * efficient loaded as 2 SQL queries.
- * </p>
+ * Defines how a relationship is fetched via either normal SQL join,
+ * a eager secondary query, via lazy loading or via eagerly hitting L2 cache.
  * <p>
  * <pre>{@code
  * // Normal fetch join results in a single SQL query
  * List<Order> list = DB.find(Order.class).fetch("details").findList();
  *
- * // Find Orders join details using a single SQL query
  * }</pre>
  * <p>
  * Example: Using a "query join" instead of a "fetch join" we instead use 2 SQL queries
@@ -37,103 +20,13 @@ import java.io.Serializable;
  * // This will use 2 SQL queries to build this object graph
  * List<Order> list =
  *     DB.find(Order.class)
- *         .fetch("details", new FetchConfig().query())
+ *         .fetch("details", FetchConfig.ofQuery())
  *         .findList();
  *
  * // query 1) find order
  * // query 2) find orderDetails where order.id in (?,?...) // first 100 order id's
  *
  * }</pre>
- * <p>
- * Example: Using 2 "query joins"
- * </p>
- * <p>
- * <pre>{@code
- *
- * // This will use 3 SQL queries to build this object graph
- * List<Order> list =
- *     DB.find(Order.class)
- *         .fetch("details", new FetchConfig().query())
- *         .fetch("customer", new FetchConfig().queryFirst(5))
- *         .findList();
- *
- * // query 1) find order
- * // query 2) find orderDetails where order.id in (?,?...) // first 100 order id's
- * // query 3) find customer where id in (?,?,?,?,?) // first 5 customers
- *
- * }</pre>
- * <p>
- * Example: Using "query joins" and partial objects
- * </p>
- * <p>
- *
- * <pre>{@code
- * // This will use 3 SQL queries to build this object graph
- * List<Order> list =
- *     DB.find(Order.class)
- *         .select("status, shipDate")
- *         .fetch("details", "quantity, price", new FetchConfig().query())
- *         .fetch("details.product", "sku, name")
- *         .fetch("customer", "name", new FetchConfig().queryFirst(5))
- *         .fetch("customer.contacts")
- *         .fetch("customer.shippingAddress")
- *         .findList();
- *
- * // query 1) find order (status, shipDate)
- * // query 2) find orderDetail (quantity, price) fetch product (sku, name) where
- * // order.id in (?,? ...)
- * // query 3) find customer (name) fetch contacts (*) fetch shippingAddress (*)
- * // where id in (?,?,?,?,?)
- *
- * // Note: the fetch of "details.product" is automatically included into the
- * // fetch of "details"
- * //
- * // Note: the fetch of "customer.contacts" and "customer.shippingAddress"
- * // are automatically included in the fetch of "customer"
- * }</pre>
- * <p>
- * You can use query() and lazy together on a single join. The query is executed
- * immediately and the lazy defines the batch size to use for further lazy
- * loading (if lazy loading is invoked).
- * </p>
- * <p>
- * <pre>{@code
- *
- * List<Order> list =
- *     DB.find(Order.class)
- *         .fetch("customer", new FetchConfig().query(10).lazy(5))
- *         .findList();
- *
- * // query 1) find order
- * // query 2) find customer where id in (?,?,?,?,?,?,?,?,?,?) // first 10 customers
- * // .. then if lazy loading of customers is invoked
- * // .. use a batch size of 5 to load the customers
- *
- * }</pre>
- * <p>
- * <p>
- * Example of controlling the lazy loading query:
- * </p>
- * <p>
- * This gives us the ability to optimise the lazy loading query for a given use
- * case.
- * </p>
- * <p>
- * <pre>{@code
- *
- * List<Order> list = DB.find(Order.class)
- *   .fetch("customer","name", new FetchConfig().lazy(5))
- *   .fetch("customer.contacts","contactName, phone, email")
- *   .fetch("customer.shippingAddress")
- *   .where().eq("status",Order.Status.NEW)
- *   .findList();
- *
- * // query 1) find order where status = Order.Status.NEW
- * //
- * // .. if lazy loading of customers is invoked
- * // .. use a batch size of 5 to load the customers
- *
- * }</pre>
  *
  * @author mario
  * @author rbygrave
@@ -142,149 +35,209 @@ public class FetchConfig implements Serializable {
 
   private static final long serialVersionUID = 1L;
 
-  private int lazyBatchSize = -1;
+  private static final int JOIN_MODE = 0;
+  private static final int QUERY_MODE = 1;
+  private static final int LAZY_MODE = 2;
+  private static final int CACHE_MODE = 3;
 
-  private int queryBatchSize = -1;
-
-  private boolean queryAll;
-
-  private boolean cache;
+  private int mode;
+  private int batchSize;
+  private int hashCode;
 
   /**
-   * Construct the fetch configuration object.
+   * Deprecated - migrate to one of the static factory methods like {@link FetchConfig#ofQuery()}
+   * <p>
+   * Construct using default JOIN mode.
    */
+  @Deprecated
   public FetchConfig() {
+    //this.mode = JOIN_MODE;
+    this.batchSize = 100;
+    this.hashCode = 1000;
+  }
+
+  private FetchConfig(int mode, int batchSize) {
+    this.mode = mode;
+    this.batchSize = batchSize;
+    this.hashCode = mode + 10 * batchSize;
   }
 
   /**
-   * Specify that this path should be lazy loaded using the default batch load
-   * size.
+   * Return FetchConfig to eagerly fetch the relationship using L2 cache.
+   * <p>
+   * Any cache misses will be loaded by secondary query to the database.
    */
+  public static FetchConfig ofCache() {
+    return new FetchConfig(CACHE_MODE, 100);
+  }
+
+  /**
+   * Return FetchConfig to eagerly fetch the relationship using a secondary query.
+   */
+  public static FetchConfig ofQuery() {
+    return new FetchConfig(QUERY_MODE, 100);
+  }
+
+  /**
+   * Return FetchConfig to eagerly fetch the relationship using a secondary with a given batch size.
+   */
+  public static FetchConfig ofQuery(int batchSize) {
+    return new FetchConfig(QUERY_MODE, batchSize);
+  }
+
+  /**
+   * Return FetchConfig to lazily load the relationship.
+   */
+  public static FetchConfig ofLazy() {
+    return new FetchConfig(LAZY_MODE, 0);
+  }
+
+  /**
+   * Return FetchConfig to lazily load the relationship specifying the batch size.
+   */
+  public static FetchConfig ofLazy(int batchSize) {
+    return new FetchConfig(LAZY_MODE, batchSize);
+  }
+
+  /**
+   * Return FetchConfig to fetch the relationship using SQL join.
+   */
+  public static FetchConfig ofDefault() {
+    return new FetchConfig(JOIN_MODE, 100);
+  }
+
+  /**
+   * We want to migrate away from mutating FetchConfig to a fully immutable FetchConfig.
+   */
+  private FetchConfig mutate(int mode, int batchSize) {
+    if (batchSize < 0) {
+      throw new IllegalArgumentException("batch size " + batchSize + " must be > 0");
+    }
+    this.mode = mode;
+    this.batchSize = batchSize;
+    this.hashCode = mode + 10 * batchSize;
+    return this;
+  }
+
+  /**
+   * Deprecated - migrate to FetchConfig.ofLazy().
+   */
+  @Deprecated
   public FetchConfig lazy() {
-    this.lazyBatchSize = 0;
-    this.queryAll = false;
-    return this;
+    return mutate(LAZY_MODE, 0);
   }
 
   /**
-   * Specify that this path should be lazy loaded with a specified batch size.
-   *
-   * @param lazyBatchSize the batch size for lazy loading
+   * Deprecated - migrate to FetchConfig.ofLazy(batchSize).
    */
-  public FetchConfig lazy(int lazyBatchSize) {
-    this.lazyBatchSize = lazyBatchSize;
-    this.queryAll = false;
-    return this;
+  @Deprecated
+  public FetchConfig lazy(int batchSize) {
+    return mutate(LAZY_MODE, batchSize);
   }
 
   /**
+   * Deprecated - migrate to FetchConfig.ofQuery().
+   * <p>
    * Eagerly fetch the beans in this path as a separate query (rather than as
    * part of the main query).
    * <p>
    * This will use the default batch size for separate query which is 100.
-   * </p>
    */
+  @Deprecated
   public FetchConfig query() {
-    this.queryBatchSize = 0;
-    this.queryAll = true;
-    return this;
-  }
-
-  /**
-   * Eagerly fetch the beans fetching the beans from the L2 bean cache
-   * and using the DB for beans not in the cache.
-   */
-  public FetchConfig cache() {
-    this.cache = true;
-    this.queryBatchSize = 0;
-    this.queryAll = true;
-    return this;
+    return mutate(QUERY_MODE, 100);
   }
 
   /**
+   * Deprecated - migrate to FetchConfig.ofQuery(batchSize).
+   * <p>
    * Eagerly fetch the beans in this path as a separate query (rather than as
    * part of the main query).
    * <p>
    * The queryBatchSize is the number of parent id's that this separate query
    * will load per batch.
-   * </p>
    * <p>
    * This will load all beans on this path eagerly unless a {@link #lazy(int)}
    * is also used.
-   * </p>
    *
-   * @param queryBatchSize the batch size used to load beans on this path
+   * @param batchSize the batch size used to load beans on this path
    */
-  public FetchConfig query(int queryBatchSize) {
-    this.queryBatchSize = queryBatchSize;
-    // queryAll true as long as a lazy batch size has not already been set
-    this.queryAll = (lazyBatchSize == -1);
-    return this;
+  @Deprecated
+  public FetchConfig query(int batchSize) {
+    return mutate(QUERY_MODE, batchSize);
   }
 
   /**
+   * Deprecated - migrate to FetchConfig.ofQuery(batchSize).
+   * <p>
    * Eagerly fetch the first batch of beans on this path.
    * This is similar to {@link #query(int)} but only fetches the first batch.
    * <p>
    * If there are more parent beans than the batch size then they will not be
    * loaded eagerly but instead use lazy loading.
-   * </p>
    *
-   * @param queryBatchSize the number of parent beans this path is populated for
+   * @param batchSize the number of parent beans this path is populated for
    */
-  public FetchConfig queryFirst(int queryBatchSize) {
-    this.queryBatchSize = queryBatchSize;
-    this.queryAll = false;
-    return this;
+  @Deprecated
+  public FetchConfig queryFirst(int batchSize) {
+    return query(batchSize);
   }
 
   /**
-   * Return the batch size for lazy loading.
+   * Deprecated - migrate to FetchConfig.ofCache().
+   * <p>
+   * Eagerly fetch the beans fetching the beans from the L2 bean cache
+   * and using the DB for beans not in the cache.
    */
-  public int getLazyBatchSize() {
-    return lazyBatchSize;
+  @Deprecated
+  public FetchConfig cache() {
+    return mutate(CACHE_MODE, 100);
   }
 
   /**
-   * Return the batch size for separate query load.
+   * Return the batch size for fetching.
    */
-  public int getQueryBatchSize() {
-    return queryBatchSize;
+  public int getBatchSize() {
+    return batchSize;
   }
 
   /**
-   * Return true if the query fetch should fetch 'all' rather than just the
-   * 'first' batch.
-   */
-  public boolean isQueryAll() {
-    return queryAll;
-  }
-
-  /**
-   * Return true if this uses L2 bean cache.
+   * Return true if the fetch should use the L2 cache.
    */
   public boolean isCache() {
-    return cache;
+    return mode == CACHE_MODE;
+  }
+
+  /**
+   * Return true if the fetch should be a eager secondary query.
+   */
+  public boolean isQuery() {
+    return mode == QUERY_MODE;
+  }
+
+  /**
+   * Return true if the fetch should be a lazy query.
+   */
+  public boolean isLazy() {
+    return mode == LAZY_MODE;
+  }
+
+  /**
+   * Return true if the fetch should try to use SQL join.
+   */
+  public boolean isJoin() {
+    return mode == JOIN_MODE;
   }
 
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
-
-    FetchConfig that = (FetchConfig) o;
-    if (lazyBatchSize != that.lazyBatchSize) return false;
-    if (queryBatchSize != that.queryBatchSize) return false;
-    if (cache != that.cache) return false;
-    return queryAll == that.queryAll;
+    return (hashCode == ((FetchConfig) o).hashCode);
   }
 
   @Override
   public int hashCode() {
-    int result = lazyBatchSize;
-    result = 92821 * result + queryBatchSize;
-    result = 92821 * result + (queryAll ? 1 : 0);
-    result = 92821 * result + (cache ? 1 : 0);
-    return result;
+    return hashCode;
   }
 }

ebean-api/src/main/java/io/ebean/Finder.java

@@ -37,7 +37,7 @@ import java.util.List;
  *   }
  * }
  *
- * ＠Entity
+ * @Entity
  * public class Customer extends BaseModel {
  *
  *   public static final CustomerFinder find = new CustomerFinder();
@@ -80,7 +80,7 @@ public class Finder<I, T> {
    *   // ... add extra customer specific finder methods
    * }
    *
-   * ＠Entity
+   * @Entity
    * public class Customer extends BaseModel {
    *
    *   public static final CustomerFinder find = new CustomerFinder();

ebean-api/src/main/java/io/ebean/Model.java

@@ -32,16 +32,16 @@ import io.ebean.bean.EntityBean;
  *     // Typically there is a common base model that has some
  *     // common properties like the ones below
  *
- *   ＠MappedSuperclass
+ *   @MappedSuperclass
  *   public class BaseModel extends Model {
  *
- *     ＠Id Long id;
+ *     @Id Long id;
  *
- *     ＠Version Long version;
+ *     @Version Long version;
  *
- *     ＠WhenCreated Timestamp whenCreated;
+ *     @WhenCreated Timestamp whenCreated;
  *
- *     ＠WhenUpdated Timestamp whenUpdated;
+ *     @WhenUpdated Timestamp whenUpdated;
  *
  *     ...
  *   }
@@ -52,7 +52,7 @@ import io.ebean.bean.EntityBean;
  *
  *     // Extend the mappedSuperclass
  *
- *     ＠Entity ＠Table(name="o_account")
+ *     @Entity @Table(name="o_account")
  *     public class Customer extends BaseModel {
  *
  *       String name;

ebean-api/src/main/java/io/ebean/ModifyAwareType.java

@@ -1,11 +1,9 @@
-package io.ebeaninternal.json;
-
-import java.io.Serializable;
+package io.ebean;
 
 /**
  * Owner object notified when a modification is detected.
  */
-public interface ModifyAwareOwner extends Serializable {
+public interface ModifyAwareType {
 
   /**
    * Return true if the value is considered dirty.
@@ -16,11 +14,6 @@ public interface ModifyAwareOwner extends Serializable {
   /**
    * Marks the object as modified.
    */
-  void markAsModified();
-
-  /**
-   * Reset the dirty state to clean.
-   */
-  void resetMarkedDirty();
+  void setMarkedDirty(boolean markedDirty);
 
 }

ebean-api/src/main/java/io/ebean/OrderBy.java

@@ -16,7 +16,7 @@ import java.util.Objects;
  * on the Query object.
  * </p>
  */
-public final class OrderBy<T> implements Serializable {
+public class OrderBy<T> implements Serializable {
 
   private static final long serialVersionUID = 9157089257745730539L;
 
@@ -69,7 +69,6 @@ public final class OrderBy<T> implements Serializable {
    * Add a property with ascending order to this OrderBy.
    */
   public Query<T> asc(String propertyName) {
-
     list.add(new Property(propertyName, true));
     return query;
   }
@@ -98,7 +97,6 @@ public final class OrderBy<T> implements Serializable {
     return query;
   }
 
-
   /**
    * Return true if the property is known to be contained in the order by clause.
    */
@@ -207,7 +205,6 @@ public final class OrderBy<T> implements Serializable {
     if (!(obj instanceof OrderBy<?>)) {
       return false;
     }
-
     OrderBy<?> e = (OrderBy<?>) obj;
     return e.list.equals(list);
   }
@@ -249,7 +246,7 @@ public final class OrderBy<T> implements Serializable {
   /**
    * A property and its ascending descending order.
    */
-  public static final class Property implements Serializable {
+  public static class Property implements Serializable {
 
     private static final long serialVersionUID = 1546009780322478077L;
 
@@ -415,13 +412,10 @@ public final class OrderBy<T> implements Serializable {
   }
 
   private void parse(String orderByClause) {
-
     if (orderByClause == null) {
       return;
     }
-
-    String[] chunks = orderByClause.split(",");
-    for (String chunk : chunks) {
+    for (String chunk : orderByClause.split(",")) {
       Property p = parseProperty(chunk);
       if (p != null) {
         list.add(p);
@@ -467,8 +461,7 @@ public final class OrderBy<T> implements Serializable {
     if (s.startsWith("desc")) {
       return false;
     }
-    String m = "Expecting [" + s + "] to be asc or desc?";
-    throw new RuntimeException(m);
+    throw new RuntimeException("Expecting [" + s + "] to be asc or desc?");
   }
 
   private boolean isEmptyString(String s) {

ebean-api/src/main/java/io/ebean/Pairs.java

@@ -18,7 +18,7 @@ import java.util.List;
  *
  *   // where a bean is annotated with a complex
  *   // natural key made of several properties
- *   ＠Cache(naturalKey = {"store","code","sku"})
+ *   @Cache(naturalKey = {"store","code","sku"})
  *
  *
  *   Pairs pairs = new Pairs("sku", "code");

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

@@ -180,13 +180,44 @@ import java.util.stream.Stream;
 public interface Query<T> {
 
   /**
-   * For update mode.
+   * The lock type (strength) to use with query FOR UPDATE row locking.
    */
-  enum ForUpdate {
+  enum LockType {
+    /**
+     * The default lock type being either UPDATE or NO_KEY_UPDATE based on
+     * PlatformConfig.forUpdateNoKey configuration (Postgres option).
+     */
+    DEFAULT,
+
+    /**
+     * FOR UPDATE.
+     */
+    UPDATE,
+
+    /**
+     * FOR NO KEY UPDATE (Postgres only).
+     */
+    NO_KEY_UPDATE,
+
+    /**
+     * FOR SHARE (Postgres only).
+     */
+    SHARE,
+
+    /**
+     * FOR KEY SHARE (Postgres only).
+     */
+    KEY_SHARE
+  }
+
+  /**
+   * FOR UPDATE wait mode.
+   */
+  enum LockWait {
     /**
      * Standard For update clause.
      */
-    BASE,
+    WAIT,
 
     /**
      * For update with No Wait option.
@@ -483,7 +514,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   *  fetch(path, fetchProperties, new FetchConfig().query())
+   *  fetch(path, fetchProperties, FetchConfig.ofQuery())
    *
    * }</pre>
    * <p>
@@ -517,7 +548,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   *  fetch(path, fetchProperties, new FetchConfig().lazy())
+   *  fetch(path, fetchProperties, FetchConfig.ofLazy())
    *
    * }</pre>
    * <p>
@@ -542,7 +573,7 @@ public interface Query<T> {
    * // fetch customers (their id, name and status)
    * List<Customer> customers = DB.find(Customer.class)
    *     .select("name, status")
-   *     .fetch("contacts", "firstName,lastName,email", new FetchConfig().lazy(10))
+   *     .fetch("contacts", "firstName,lastName,email", FetchConfig.ofLazy(10))
    *     .findList();
    *
    * }</pre>
@@ -579,7 +610,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   *  fetch(path, new FetchConfig().query())
+   *  fetch(path, FetchConfig.ofQuery())
    *
    * }</pre>
    * <p>
@@ -608,7 +639,7 @@ public interface Query<T> {
    * </p>
    * <pre>{@code
    *
-   *  fetch(path, new FetchConfig().lazy())
+   *  fetch(path, FetchConfig.ofLazy())
    *
    * }</pre>
    * <p>
@@ -631,7 +662,7 @@ public interface Query<T> {
    * // fetch customers (their id, name and status)
    * List<Customer> customers = DB.find(Customer.class)
    *     // lazy fetch contacts with a batch size of 100
-   *     .fetch("contacts", new FetchConfig().lazy(100))
+   *     .fetch("contacts", FetchConfig.ofLazy(100))
    *     .findList();
    *
    * }</pre>
@@ -779,7 +810,7 @@ public interface Query<T> {
    * </p>
    * <p>
    * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the Consumer interface which is better suited to use with Java8 closures.
+   * iterator uses the Consumer interface which is better suited to use with closures.
    * </p>
    * <pre>{@code
    *
@@ -798,6 +829,21 @@ public interface Query<T> {
    */
   void findEach(Consumer<T> consumer);
 
+  /**
+   * Execute findEach streaming query batching the results for consuming.
+   * <p>
+   * This query execution will stream the results and is suited to consuming
+   * large numbers of results from the database.
+   * <p>
+   * Typically we use this batch consumer when we want to do further processing on
+   * the beans and want to do that processing in batch form, for example - 100 at
+   * a time.
+   *
+   * @param batch    The number of beans processed in the batch
+   * @param consumer Process the batch of beans
+   */
+  void findEach(int batch, Consumer<List<T>> consumer);
+
   /**
    * Execute the query using callbacks to a visitor to process the resulting
    * beans one at a time.
@@ -808,12 +854,12 @@ public interface Query<T> {
    * </p>
    * <p>
    * This method is functionally equivalent to findIterate() but instead of using an
-   * iterator uses the Predicate (SAM) interface which is better suited to use with Java8 closures.
+   * iterator uses the Predicate interface which is better suited to use with closures.
    * </p>
    * <pre>{@code
    *
    *  DB.find(Customer.class)
-   *     .fetch("contacts", new FetchConfig().query(2))
+   *     .fetchQuery("contacts")
    *     .where().eq("status", Status.NEW)
    *     .order().asc("id")
    *     .setMaxRows(2000)
@@ -1613,8 +1659,32 @@ public interface Query<T> {
    */
   String getGeneratedSql();
 
+  /**
+   * Execute the query with the given lock type and WAIT.
+   * <p>
+   * Note that <code>forUpdate()</code> is the same as
+   * <code>withLock(LockType.UPDATE)</code>.
+   * <p>
+   * Provides us with the ability to explicitly use Postgres
+   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
+   */
+  Query<T> withLock(LockType lockType);
+
+  /**
+   * Execute the query with the given lock type and lock wait.
+   * <p>
+   * Note that <code>forUpdateNoWait()</code> is the same as
+   * <code>withLock(LockType.UPDATE, LockWait.NOWAIT)</code>.
+   * <p>
+   * Provides us with the ability to explicitly use Postgres
+   * SHARE, KEY SHARE, NO KEY UPDATE and UPDATE row locks.
+   */
+  Query<T> withLock(LockType lockType, LockWait lockWait);
+
   /**
    * Execute using "for update" clause which results in the DB locking the record.
+   * <p>
+   * The same as <code>withLock(LockType.UPDATE, LockWait.WAIT)</code>.
    */
   Query<T> forUpdate();
 
@@ -1622,7 +1692,8 @@ public interface Query<T> {
    * Execute using "for update" clause with "no wait" option.
    * <p>
    * This is typically a Postgres and Oracle only option at this stage.
-   * </p>
+   * <p>
+   * The same as <code>withLock(LockType.UPDATE, LockWait.NOWAIT)</code>.
    */
   Query<T> forUpdateNoWait();
 
@@ -1630,7 +1701,8 @@ public interface Query<T> {
    * Execute using "for update" clause with "skip locked" option.
    * <p>
    * This is typically a Postgres and Oracle only option at this stage.
-   * </p>
+   * <p>
+   * The same as <code>withLock(LockType.UPDATE, LockWait.SKIPLOCKED)</code>.
    */
   Query<T> forUpdateSkipLocked();
 
@@ -1640,9 +1712,14 @@ public interface Query<T> {
   boolean isForUpdate();
 
   /**
-   * Return the "for update" mode to use.
+   * Return the "for update" wait mode to use.
    */
-  ForUpdate getForUpdateMode();
+  LockWait getForUpdateLockWait();
+
+  /**
+   * Return the lock type (strength) to use with "for update".
+   */
+  LockType getForUpdateLockType();
 
   /**
    * Set root table alias.

ebean-api/src/main/java/io/ebean/QueryIterator.java

@@ -56,7 +56,7 @@ import java.util.Iterator;
  *
  * @param <T> the type of entity bean in the iteration
  */
-public interface QueryIterator<T> extends Iterator<T>, java.io.Closeable {
+public interface QueryIterator<T> extends Iterator<T>, AutoCloseable {
 
   /**
    * Returns <tt>true</tt> if the iteration has more elements.

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

@@ -41,14 +41,14 @@ package io.ebean;
  * <h3>Example OrderAggregate</h3>
  * <pre>{@code
  *  ...
- *   // ＠Sql indicates to that this bean
+ *   // @Sql indicates to that this bean
  *   // is based on RawSql rather than a table
  *
- *   ＠Entity
- *   ＠Sql
+ *   @Entity
+ *   @Sql
  *   public class OrderAggregate {
  *
- *    ＠OneToOne
+ *    @OneToOne
  *    Order order;
  *
  *    Double totalAmount;
@@ -107,7 +107,7 @@ package io.ebean;
  *
  *   List<OrderAggregate> orders = DB.find(OrderAggregate.class)
  *     .setRawSql(rawSql)
- *     .fetch("order", "status,orderDate", new FetchConfig().query())
+ *     .fetch("order", "status,orderDate", FetchConfig.ofQuery())
  *     .fetch("order.customer", "name")
  *     .where().gt("order.id", 0)
  *     .having().gt("totalAmount", 20)

ebean-api/src/main/java/io/ebean/RowMapper.java

@@ -22,7 +22,7 @@ import java.sql.SQLException;
  *    //
  *    class CustomerMapper implements RowMapper<CustomerDto> {
  *
- *     ＠Override
+ *     @Override
  *     public CustomerDto map(ResultSet rset, int rowNum) throws SQLException {
  *
  *       long id = rset.getLong(1);

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

@@ -365,5 +365,10 @@ public interface SqlQuery extends Serializable {
      * Return the list of values.
      */
     List<T> findList();
+
+    /**
+     * Find streaming the result effectively consuming a row at a time.
+     */
+    void findEach(Consumer<T> consumer);
   }
 }

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

@@ -2,8 +2,8 @@ package io.ebean;
 
 import io.ebean.annotation.DocStoreMode;
 import io.ebean.annotation.PersistBatch;
-import io.ebean.config.DocStoreConfig;
 import io.ebean.config.DatabaseConfig;
+import io.ebean.config.DocStoreConfig;
 
 import javax.persistence.PersistenceException;
 import java.sql.Connection;
@@ -59,6 +59,14 @@ public interface Transaction extends AutoCloseable {
    */
   void register(TransactionCallback callback);
 
+  /**
+   * EXPERIMENTAL - turn on automatic persistence of dirty beans and batchMode true.
+   * <p>
+   * With this turned on beans that are dirty in the persistence context
+   * are automatically persisted on flush() and commit().
+   */
+  void setAutoPersistUpdates(boolean autoPersistUpdates);
+
   /**
    * Set a label on the transaction.
    * <p>
@@ -339,15 +347,12 @@ public interface Transaction extends AutoCloseable {
    * The batch is automatically flushed when it hits the batch size and also when we
    * execute queries or when we mix UpdateSql and CallableSql with save and delete of
    * beans.
-   * </p>
    * <p>
    * We use {@link #flush()} to explicitly flush the batch and we can use
    * {@link #setFlushOnQuery(boolean)} and {@link #setFlushOnMixed(boolean)}
    * to control the automatic flushing behaviour.
-   * </p>
    * <p>
    * Example: batch processing of CallableSql executing every 10 rows
-   * </p>
    *
    * <pre>{@code
    *
@@ -392,14 +397,11 @@ public interface Transaction extends AutoCloseable {
    * <p>
    * This only takes effect when batch mode on the transaction has not already meant that
    * JDBC batch mode is being used.
-   * </p>
    * <p>
    * This is useful when the single save() or delete() cascades. For example, inserting a 'master' cascades
    * and inserts a collection of 'detail' beans. The detail beans can be inserted using JDBC batch.
-   * </p>
    * <p>
    * This is effectively already turned on for all platforms apart from older Sql Server.
-   * </p>
    *
    * @param batchMode the batch mode to use per save(), insert(), update() or delete()
    * @see io.ebean.config.DatabaseConfig#setPersistBatchOnCascade(PersistBatch)
@@ -422,15 +424,19 @@ public interface Transaction extends AutoCloseable {
   int getBatchSize();
 
   /**
-   * Specify if you want batched inserts to use getGeneratedKeys.
+   * Specify if we want batched inserts to use getGeneratedKeys.
    * <p>
    * By default batched inserts will try to use getGeneratedKeys if it is
    * supported by the underlying jdbc driver and database.
-   * </p>
    * <p>
-   * You may want to turn getGeneratedKeys off when you are inserting a large
-   * number of objects and you don't care about getting back the ids.
-   * </p>
+   * We want to turn off getGeneratedKeys when we are inserting a large
+   * number of objects and we don't care about getting back the ids. In this
+   * way we avoid the extra cost of getting back the generated id values
+   * from the database.
+   * <p>
+   * Note that when we do turn off getGeneratedKeys then we have the limitation
+   * that after a bean has been inserted we are unable to then mutate the bean
+   * and update it in the same transaction as we have not obtained it's id value.
    */
   void setGetGeneratedKeys(boolean getGeneratedKeys);
 
@@ -449,13 +455,11 @@ public interface Transaction extends AutoCloseable {
    * <p>
    * If you want to execute both WITHOUT having the batch automatically flush
    * you need to call this with batchFlushOnMixed = false.
-   * </p>
    * <p>
    * Note that UpdateSql and CallableSql are ALWAYS executed first (before the
    * beans are executed). This is because the UpdateSql and CallableSql have
    * already been bound to their PreparedStatements. The beans on the other hand
    * have a 2 step process (delayed binding).
-   * </p>
    */
   void setFlushOnMixed(boolean batchFlushOnMixed);
 
@@ -473,7 +477,6 @@ public interface Transaction extends AutoCloseable {
    * <p>
    * Calling this method with batchFlushOnQuery = false means that you can
    * execute a query and the batch will not be automatically flushed.
-   * </p>
    */
   void setFlushOnQuery(boolean batchFlushOnQuery);
 
@@ -490,7 +493,6 @@ public interface Transaction extends AutoCloseable {
    * should be flushed prior to executing a query.
    * <p>
    * The default is for this to be true.
-   * </p>
    */
   boolean isFlushOnQuery();
 
@@ -507,7 +509,6 @@ public interface Transaction extends AutoCloseable {
    * flush the batch if you like.
    * <p>
    * Flushing occurs automatically when:
-   * </p>
    * <ul>
    * <li>the batch size is reached</li>
    * <li>A query is executed on the same transaction</li>
@@ -519,11 +520,11 @@ public interface Transaction extends AutoCloseable {
   void flush() throws PersistenceException;
 
   /**
-   * This is a synonym for flush() and will be deprecated.
+   * Deprecated - migrate to flush().
    * <p>
    * flush() is preferred as it matches the JPA flush() method.
-   * </p>
    */
+  @Deprecated
   void flushBatch() throws PersistenceException;
 
   /**
@@ -533,11 +534,9 @@ public interface Transaction extends AutoCloseable {
    * commit() rollback() and end() methods on the Transaction should still be
    * used. Calling these methods on the Connection would be a big no no unless
    * you know what you are doing.
-   * </p>
    * <p>
    * Examples of when a developer may wish to use the connection directly are:
    * Savepoints, advanced CLOB BLOB use and advanced stored procedure calls.
-   * </p>
    */
   Connection getConnection();
 
@@ -545,17 +544,14 @@ public interface Transaction extends AutoCloseable {
    * Add table modification information to the TransactionEvent.
    * <p>
    * Use this in conjunction with getConnection() and raw JDBC.
-   * </p>
    * <p>
    * This effectively informs Ebean of the data that has been changed by the
    * transaction and this information is normally automatically handled by Ebean
    * when you save entity beans or use UpdateSql etc.
-   * </p>
    * <p>
    * If you use raw JDBC then you can use this method to inform Ebean for the
    * tables that have been modified. Ebean uses this information to keep its
    * caches in synch and maintain text indexes.
-   * </p>
    */
   void addModification(String tableName, boolean inserts, boolean updates, boolean deletes);
 

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

@@ -2,6 +2,7 @@ package io.ebean;
 
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.TxIsolation;
+import io.ebean.annotation.TxOption;
 import io.ebean.annotation.TxType;
 
 import java.util.ArrayList;
@@ -33,6 +34,8 @@ public final class TxScope {
 
   private TxIsolation isolation;
 
+  private TxOption autoPersistUpdates;
+
   private PersistBatch batch;
 
   private PersistBatch batchOnCascade;
@@ -123,6 +126,13 @@ public final class TxScope {
       + "] serverName[" + serverName + "] rollbackFor[" + rollbackFor + "] noRollbackFor[" + noRollbackFor + "]";
   }
 
+  /**
+   * Return the AutoPersistUpdates mode as a nullable Boolean.
+   */
+  public Boolean getAutoPersistUpdates() {
+    return autoPersistUpdates == null ? null : autoPersistUpdates.asBoolean();
+  }
+
   /**
    * Return true if PersistBatch has been set.
    */
@@ -176,6 +186,14 @@ public final class TxScope {
     return this;
   }
 
+  /**
+   * Set the autoPersistUpdates mode.
+   */
+  public TxScope setAutoPersistUpdates(TxOption autoPersistUpdates) {
+    this.autoPersistUpdates = autoPersistUpdates;
+    return this;
+  }
+
   /**
    * Return the transaction profile id.
    */

ebean-api/src/main/java/io/ebean/Update.java

@@ -13,23 +13,23 @@ package io.ebean;
  * </p>
  * <pre>{@code
  *    ...
- *   ＠NamedUpdates(value = {
- *     ＠NamedUpdate(
+ *   @NamedUpdates(value = {
+ *     @NamedUpdate(
  *       name = "setTitle",
  *       notifyCache = false,
  *       update = "update topic set title = :title, postCount = :count where id = :id"),
- *    ＠NamedUpdate(
+ *    @NamedUpdate(
  *       name = "setPostCount",
  *       notifyCache = false,
  *       update = "update f_topic set post_count = :postCount where id = :id"),
- *    ＠NamedUpdate(
+ *    @NamedUpdate(
  *       name = "incrementPostCount",
  *       notifyCache = false,
  *       update = "update Topic set postCount = postCount + 1 where id = :id")
  *       //update = "update f_topic set post_count = post_count + 1 where id = :id")
  *   })
- *   ＠Entity
- *   ＠Table(name = "f_topic")
+ *   @Entity
+ *   @Table(name = "f_topic")
  *   public class Topic {
  *     ...
  *   }

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

@@ -32,39 +32,47 @@ public final class EntityBeanIntercept implements Serializable {
   private static final int STATE_REFERENCE = 1;
   private static final int STATE_LOADED = 2;
 
-  private transient final ReentrantLock lock = new ReentrantLock(false);
+  /**
+   * Used when a bean is partially filled.
+   */
+  private static final byte FLAG_LOADED_PROP = 1;
+  private static final byte FLAG_CHANGED_PROP = 2;
+  private static final byte FLAG_CHANGEDLOADED_PROP = 3;
+  /**
+   * Flags indicating if a property is a dirty embedded bean. Used to distinguish
+   * between an embedded bean being completely overwritten and one of its
+   * embedded properties being made dirty.
+   */
+  private static final byte FLAG_EMBEDDED_DIRTY = 4;
+  /**
+   * Flags indicating if a property is a dirty embedded bean. Used to distinguish
+   * between an embedded bean being completely overwritten and one of its
+   * embedded properties being made dirty.
+   */
+  private static final byte FLAG_ORIG_VALUE_SET = 8;
 
+  private transient final ReentrantLock lock = new ReentrantLock();
   private transient NodeUsageCollector nodeUsageCollector;
-
   private transient PersistenceContext persistenceContext;
-
   private transient BeanLoader beanLoader;
-
   private transient PreGetterCallback preGetterCallback;
 
   private String ebeanServerName;
-
   private boolean deletedFromCollection;
 
   /**
    * The actual entity bean that 'owns' this intercept.
    */
   private final EntityBean owner;
-
   private EntityBean embeddedOwner;
   private int embeddedOwnerIndex;
-
   /**
    * One of NEW, REF, UPD.
    */
   private int state;
-
   private boolean forceUpdate;
-
   private boolean readOnly;
-
   private boolean dirty;
-
   /**
    * Flag set to disable lazy loading - typically for SQL "report" type entity beans.
    */
@@ -74,35 +82,9 @@ public final class EntityBeanIntercept implements Serializable {
    * Flag set when lazy loading failed due to the underlying bean being deleted in the DB.
    */
   private boolean lazyLoadFailure;
-
-  /**
-   * Used when a bean is partially filled.
-   */
-  private static final byte FLAG_LOADED_PROP = 1;
-
-  /**
-   * Set of changed properties.
-   */
-  private static final byte FLAG_CHANGED_PROP = 2;
-
-  /**
-   * Flags indicating if a property is a dirty embedded bean. Used to distinguish
-   * between an embedded bean being completely overwritten and one of its
-   * embedded properties being made dirty.
-   */
-  private static final byte FLAG_EMBEDDED_DIRTY = 4;
-
-  /**
-   * Flags indicating if a property is a dirty embedded bean. Used to distinguish
-   * between an embedded bean being completely overwritten and one of its
-   * embedded properties being made dirty.
-   */
-  private static final byte FLAG_ORIG_VALUE_SET = 8;
-
-  private final byte[] flags;
-
   private boolean fullyLoadedBean;
   private boolean loadedFromCache;
+  private final byte[] flags;
   private Object[] origValues;
   private Exception[] loadErrors;
   private int lazyLoadProperty = -1;
@@ -569,6 +551,10 @@ public final class EntityBeanIntercept implements Serializable {
     flags[propertyIndex] |= FLAG_CHANGED_PROP;
   }
 
+  private void setChangeLoaded(int propertyIndex) {
+    flags[propertyIndex] |= FLAG_CHANGEDLOADED_PROP;
+  }
+
   /**
    * Set that an embedded bean has had one of its properties changed.
    */
@@ -931,10 +917,14 @@ public final class EntityBeanIntercept implements Serializable {
    * OneToMany and ManyToMany only set loaded state.
    */
   public void preSetterMany(boolean interceptField, int propertyIndex, Object oldValue, Object newValue) {
-    if (readOnly) {
-      throw new IllegalStateException("This bean is readOnly");
+    if (state == STATE_NEW) {
+      setLoadedProperty(propertyIndex);
+    } else {
+      if (readOnly) {
+        throw new IllegalStateException("This bean is readOnly");
+      }
+      setChangeLoaded(propertyIndex);
     }
-    setLoadedProperty(propertyIndex);
   }
 
   private void setChangedPropertyValue(int propertyIndex, boolean setDirtyState, Object origValue) {
@@ -973,7 +963,6 @@ public final class EntityBeanIntercept implements Serializable {
     }
   }
 
-
   /**
    * Check for primitive boolean.
    */

ebean-api/src/main/java/io/ebean/bean/PersistenceContext.java

@@ -1,5 +1,7 @@
 package io.ebean.bean;
 
+import java.util.List;
+
 /**
  * Holds entity beans by there type and id.
  * <p>
@@ -77,6 +79,11 @@ public interface PersistenceContext {
    */
   boolean resetLimit();
 
+  /**
+   * Return the list of dirty beans held by this persistence context.
+   */
+  List<Object> dirtyBeans();
+
   /**
    * Wrapper on a bean to also indicate if a bean has been deleted.
    * <p>

ebean-api/src/main/java/io/ebean/bean/SingleBeanLoader.java

@@ -10,7 +10,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public abstract class SingleBeanLoader implements BeanLoader {
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   protected final Database database;
 

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

@@ -16,7 +16,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
 
   private static final long serialVersionUID = 3365725236140187588L;
 
-  protected final ReentrantLock lock = new ReentrantLock(false);
+  protected final ReentrantLock lock = new ReentrantLock();
 
   protected boolean readOnly;
 

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

@@ -87,7 +87,7 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
 
   @Override
   public void internalAddWithCheck(Object bean) {
-    if (list == null || !containsInstance(bean)) {
+    if (list == null || bean == null || !containsInstance(bean)) {
       internalAdd(bean);
     }
   }
@@ -198,10 +198,9 @@ public final class BeanList<E> extends AbstractBeanCollection<E> implements List
     }
     if (list == null) {
       sb.append("deferred ");
-
     } else {
       sb.append("size[").append(list.size()).append("] ");
-      sb.append("list").append(list).append("");
+      sb.append("list").append(list);
     }
     return sb.toString();
   }

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

@@ -77,7 +77,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   }
 
   public void internalPutWithCheck(Object key, Object bean) {
-    if (map == null || !map.containsKey(key)) {
+    if (map == null || key == null || !map.containsKey(key)) {
       internalPut(key, bean);
     }
   }
@@ -175,10 +175,6 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
 
   /**
    * Returns the map entrySet.
-   * <p>
-   * This is because the key values may need to be set against the details (so
-   * they don't need to be set twice).
-   * </p>
    */
   @Override
   public Collection<?> getActualEntries() {
@@ -194,7 +190,6 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
     }
     if (map == null) {
       sb.append("deferred ");
-
     } else {
       sb.append("size[").append(map.size()).append("]");
       sb.append(" map").append(map);
@@ -243,17 +238,12 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
   }
 
   @Override
-  @SuppressWarnings({"unchecked"})
   public Set<Entry<K, E>> entrySet() {
     init();
     if (isReadOnly()) {
       return Collections.unmodifiableSet(map.entrySet());
     }
-    if (modifyListening) {
-      Set<Entry<K, E>> s = map.entrySet();
-      return new ModifySet(this, s);
-    }
-    return map.entrySet();
+    return modifyListening ? new ModifyEntrySet<>(this, map.entrySet()) : map.entrySet();
   }
 
   @Override
@@ -274,8 +264,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
     if (isReadOnly()) {
       return Collections.unmodifiableSet(map.keySet());
     }
-    // we don't really care about modifications to the ketSet?
-    return map.keySet();
+    return modifyListening ? new ModifyKeySet<>(this, map.keySet()) : map.keySet();
   }
 
   @Override
@@ -346,11 +335,7 @@ public final class BeanMap<K, E> extends AbstractBeanCollection<E> implements Ma
     if (isReadOnly()) {
       return Collections.unmodifiableCollection(map.values());
     }
-    if (modifyListening) {
-      Collection<E> c = map.values();
-      return new ModifyCollection<>(this, c);
-    }
-    return map.values();
+    return modifyListening ? new ModifyCollection<>(this, map.values()) : map.values();
   }
 
   @Override

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

@@ -70,9 +70,8 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
 
   @Override
   public void internalAddWithCheck(Object bean) {
-    if (set == null || !set.contains(bean)) {
-      internalAdd(bean);
-    }
+    // set add() already de-dups so just add it
+    internalAdd(bean);
   }
 
   @Override
@@ -177,7 +176,6 @@ public final class BeanSet<E> extends AbstractBeanCollection<E> implements Set<E
     }
     if (set == null) {
       sb.append("deferred ");
-
     } else {
       sb.append("size[").append(set.size()).append("]");
       sb.append(" set").append(set);

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

@@ -20,7 +20,7 @@ public final class CopyOnFirstWriteList<E> extends AbstractList<E> implements Li
 
   private static final long serialVersionUID = 1L;
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   /**
    * The underlying List implementation.

ebean-api/src/main/java/io/ebean/common/ModifyCollection.java

@@ -25,7 +25,7 @@ class ModifyCollection<E> implements Collection<E> {
    * The owner is notified of the additions and removals.
    * </p>
    */
-  public ModifyCollection(BeanCollection<E> owner, Collection<E> c) {
+  ModifyCollection(BeanCollection<E> owner, Collection<E> c) {
     this.owner = owner;
     this.c = c;
   }

ebean-api/src/main/java/io/ebean/common/ModifyEntrySet.java

@@ -0,0 +1,131 @@
+package io.ebean.common;
+
+import java.util.*;
+
+/**
+ * Handles the Entry Set for BeanMap.
+ */
+class ModifyEntrySet<K, E> implements Set<Map.Entry<K, E>> {
+
+  private final BeanMap<K, E> owner;
+  private final Set<Map.Entry<K, E>> entrySet;
+
+  ModifyEntrySet(BeanMap<K, E> owner, Set<Map.Entry<K, E>> entrySet) {
+    this.owner = owner;
+    this.entrySet = entrySet;
+  }
+
+  @Override
+  public int size() {
+    return entrySet.size();
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return entrySet.isEmpty();
+  }
+
+  @Override
+  public boolean contains(Object o) {
+    return entrySet.contains(o);
+  }
+
+  @Override
+  public Object[] toArray() {
+    return entrySet.toArray();
+  }
+
+  @Override
+  public <T> T[] toArray(T[] a) {
+    return entrySet.toArray(a);
+  }
+
+  @Override
+  public boolean containsAll(Collection<?> entries) {
+    return entrySet.containsAll(entries);
+  }
+
+  @Override
+  public void clear() {
+    owner.clear();
+  }
+
+  @Override
+  public boolean add(Map.Entry<K, E> entry) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public boolean addAll(Collection<? extends Map.Entry<K, E>> c) {
+    throw new UnsupportedOperationException();
+  }
+
+  @SuppressWarnings("rawtypes")
+  @Override
+  public boolean remove(Object o) {
+    if (o instanceof Map.Entry) {
+      Map.Entry entry = (Map.Entry) o;
+      final E val = owner.get(entry.getKey());
+      if (Objects.equals(val, entry.getValue())) {
+        owner.remove(entry.getKey());
+        return true;
+      }
+    }
+    return false;
+  }
+
+  @Override
+  public boolean retainAll(Collection<?> entries) {
+    boolean modified = false;
+    final Iterator<Map.Entry<K, E>> it = iterator();
+    while (it.hasNext()) {
+      if (!entries.contains(it.next())) {
+        it.remove();
+        modified = true;
+      }
+    }
+    return modified;
+  }
+
+  @Override
+  public boolean removeAll(Collection<?> entries) {
+    boolean modified = false;
+    for (Object entry : entries) {
+      modified |= remove(entry);
+    }
+    return modified;
+  }
+
+  @Override
+  public Iterator<Map.Entry<K, E>> iterator() {
+    return new EntrySetIterator(new ArrayList<>(entrySet).iterator());
+  }
+
+  class EntrySetIterator implements Iterator<Map.Entry<K, E>> {
+
+    private final Iterator<Map.Entry<K, E>> iterator;
+    private Map.Entry<K, E> entry;
+
+    EntrySetIterator(Iterator<Map.Entry<K, E>> iterator) {
+      this.iterator = iterator;
+    }
+
+    @Override
+    public boolean hasNext() {
+      return iterator.hasNext();
+    }
+
+    @Override
+    public Map.Entry<K, E> next() {
+      entry = iterator.next();
+      return entry;
+    }
+
+    @Override
+    public void remove() {
+      owner.remove(entry.getKey());
+      iterator.remove();
+    }
+  }
+
+}

ebean-api/src/main/java/io/ebean/common/ModifyKeySet.java

@@ -0,0 +1,126 @@
+package io.ebean.common;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+
+/**
+ * Handle the Key Set for BeanMap.
+ */
+class ModifyKeySet<E> implements Set<E> {
+
+  private final Set<E> keySet;
+  private final BeanMap<E, ?> owner;
+
+  ModifyKeySet(BeanMap<E, ?> owner, Set<E> keySet) {
+    this.owner = owner;
+    this.keySet = keySet;
+  }
+
+  @Override
+  public int size() {
+    return keySet.size();
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return keySet.isEmpty();
+  }
+
+  @Override
+  public boolean contains(Object o) {
+    return keySet.contains(o);
+  }
+
+  @Override
+  public Object[] toArray() {
+    return keySet.toArray();
+  }
+
+  @Override
+  public <T> T[] toArray(T[] a) {
+    return keySet.toArray(a);
+  }
+
+  @Override
+  public boolean add(E key) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public boolean addAll(Collection<? extends E> keys) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public boolean remove(Object o) {
+    return owner.remove(o) != null;
+  }
+
+  @Override
+  public boolean containsAll(Collection<?> keys) {
+    return keySet.containsAll(keys);
+  }
+
+  @Override
+  public void clear() {
+    owner.clear();
+  }
+
+  @Override
+  public Iterator<E> iterator() {
+    return new KeySetIterator<>(new ArrayList<>(keySet).iterator());
+  }
+
+  @Override
+  public boolean retainAll(Collection<?> keys) {
+    return keysMatch(keys, false);
+  }
+
+  @Override
+  public boolean removeAll(Collection<?> keys) {
+    return keysMatch(keys, true);
+  }
+
+  private boolean keysMatch(Collection<?> keys, boolean containsMatch) {
+    boolean changed = false;
+    final Iterator<E> iterator = iterator();
+    while (iterator.hasNext()) {
+      final E key = iterator.next();
+      if (keys.contains(key) == containsMatch) {
+        iterator.remove();
+        changed = true;
+      }
+    }
+    return changed;
+  }
+
+
+  class KeySetIterator<K> implements Iterator<K> {
+
+    private final Iterator<K> iterator;
+    private K key;
+
+    KeySetIterator(Iterator<K> iterator) {
+      this.iterator = iterator;
+    }
+
+    @Override
+    public boolean hasNext() {
+      return iterator.hasNext();
+    }
+
+    @Override
+    public K next() {
+      key = iterator.next();
+      return key;
+    }
+
+    @Override
+    public void remove() {
+      owner.remove(key);
+      iterator.remove();
+    }
+  }
+}

ebean-api/src/main/java/io/ebean/common/ModifySet.java

@@ -1,24 +0,0 @@
-package io.ebean.common;
-
-import io.ebean.bean.BeanCollection;
-
-import java.util.Set;
-
-/**
- * Wraps a Set for the purposes of notifying removals and additions to the
- * BeanCollection owner.
- * <p>
- * This is required for persisting ManyToMany objects. Additions and removals
- * become inserts and deletes to the intersection table.
- * </p>
- */
-class ModifySet<E> extends ModifyCollection<E> implements Set<E> {
-
-  /**
-   * Create with an Owner that is notified of any additions or deletions.
-   */
-  public ModifySet(BeanCollection<E> owner, Set<E> s) {
-    super(owner, s);
-  }
-
-}

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

@@ -7,6 +7,8 @@ import javax.persistence.DiscriminatorValue;
 import javax.persistence.Inheritance;
 import javax.persistence.Table;
 
+import static io.ebean.util.StringHelper.isNull;
+
 /**
  * Provides some base implementation for NamingConventions.
  *
@@ -78,10 +80,16 @@ public abstract class AbstractNamingConvention implements NamingConvention {
 
   @Override
   public String getSequenceName(String rawTableName, String pkColumn) {
-    final String tableNameUnquoted = databasePlatform.unQuote(rawTableName);
+    TableName tableName = new TableName(rawTableName);
+    String seqName = seqName(pkColumn, tableName.getName());
+    return tableName.withCatalogAndSchema(seqName);
+  }
+
+  private String seqName(String pkColumn, String tableName) {
+    final String tableNameUnquoted = unQuote(tableName);
     String seqName = sequenceFormat.replace("{table}", tableNameUnquoted);
-    pkColumn = (pkColumn == null) ? "" : databasePlatform.unQuote(pkColumn);
-    return seqName.replace("{column}", pkColumn);
+    pkColumn = (pkColumn == null) ? "" : unQuote(pkColumn);
+    return quoteIdentifiers(seqName.replace("{column}", pkColumn));
   }
 
   /**
@@ -216,15 +224,13 @@ public abstract class AbstractNamingConvention implements NamingConvention {
         || AnnotationUtil.has(supCls, DiscriminatorValue.class);
   }
 
-
   @Override
   public TableName getM2MJoinTableName(TableName lhsTable, TableName rhsTable) {
-
     StringBuilder buffer = new StringBuilder();
-    buffer.append(lhsTable.getName());
+    buffer.append(unQuote(lhsTable.getName()));
     buffer.append("_");
 
-    String rhsTableName = rhsTable.getName();
+    String rhsTableName = unQuote(rhsTable.getName());
     if (rhsTableName.indexOf('_') < rhsPrefixLength) {
       // trim off a xx_ prefix if there is one
       rhsTableName = rhsTableName.substring(rhsTableName.indexOf('_') + 1);
@@ -238,7 +244,13 @@ public abstract class AbstractNamingConvention implements NamingConvention {
       buffer.setLength(maxTableNameLength);
     }
 
-    return new TableName(lhsTable.getCatalog(), lhsTable.getSchema(), buffer.toString());
+    String tableName = quoteIdentifiers(buffer.toString());
+    return new TableName(lhsTable.getCatalog(), lhsTable.getSchema(), tableName);
+  }
+
+  @Override
+  public String deriveM2MColumn(String tableName, String dbColumn) {
+    return quoteIdentifiers(unQuote(tableName) +"_" + unQuote(dbColumn));
   }
 
   /**
@@ -255,14 +267,29 @@ public abstract class AbstractNamingConvention implements NamingConvention {
     return null;
   }
 
+  @Override
+  public String getTableName(String catalog, String schema, String name) {
+    StringBuilder sb = new StringBuilder();
+    if (!isNull(catalog)) {
+      sb.append(quoteIdentifiers(catalog)).append(".");
+    }
+    if (!isNull(schema)) {
+      sb.append(quoteIdentifiers(schema)).append(".");
+    }
+    return sb.append(quoteIdentifiers(name)).toString();
+  }
+
   /**
-   * Replace back ticks (if they are used) with database platform specific
-   * quoted identifiers.
+   * Replace back ticks (if they are used) with database platform specific quoted identifiers.
    */
   protected String quoteIdentifiers(String s) {
     return databasePlatform.convertQuotedIdentifiers(s);
   }
 
+  private String unQuote(String val) {
+    return databasePlatform.unQuote(val);
+  }
+
   /**
    * Checks string is null or empty .
    */

ebean-api/src/main/java/io/ebean/config/ClassLoadConfig.java

@@ -26,20 +26,6 @@ public class ClassLoadConfig {
     this.context = new ClassLoaderContext(classLoader);
   }
 
-  /**
-   * Return true if the Java.time types are available and should be supported.
-   */
-  public boolean isJavaTimePresent() {
-    return isPresent("java.time.LocalDate");
-  }
-
-  /**
-   * Return true if Java7 is present.
-   */
-  public boolean isJava7Present() {
-    return isPresent("java.nio.file.Path");
-  }
-
   /**
    * Return true if the Joda types are available and should be supported.
    */
@@ -54,6 +40,13 @@ public class ClassLoadConfig {
     return isPresent("javax.validation.constraints.NotNull");
   }
 
+  /**
+   * Return true if jakarta validation annotations like Size and NotNull are present.
+   */
+  public boolean isJakartaValidationAnnotationsPresent() {
+    return isPresent("jakarta.validation.constraints.NotNull");
+  }
+
   /**
    * Return true if javax PostConstruct annotation is present (maybe not in java9).
    * If not we don't support PostConstruct lifecycle events.

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

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

ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java

@@ -3,6 +3,7 @@ package io.ebean.config;
 import com.fasterxml.jackson.core.JsonFactory;
 import io.avaje.config.Config;
 import io.ebean.DatabaseFactory;
+import io.ebean.EbeanVersion;
 import io.ebean.PersistenceContextScope;
 import io.ebean.Query;
 import io.ebean.Transaction;
@@ -28,12 +29,13 @@ import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
-import io.ebean.migration.MigrationRunner;
 import io.ebean.util.StringHelper;
 
 import javax.persistence.EnumType;
 import javax.sql.DataSource;
 import java.time.Clock;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -191,6 +193,12 @@ public class DatabaseConfig {
    */
   private JsonConfig.Include jsonInclude = JsonConfig.Include.ALL;
 
+  /**
+   * When true then by default DbJson beans are assumed to be dirty.
+   * I believe we want to change this default to false in the future.
+   */
+  private boolean jsonDirtyByDefault = true;
+
   /**
    * The database platform name. Used to imply a DatabasePlatform to use.
    */
@@ -230,6 +238,12 @@ public class DatabaseConfig {
    */
   private String historyTableSuffix = "_history";
 
+  /**
+   * When true explicit transactions beans that have been made dirty will be
+   * automatically persisted via update on flush.
+   */
+  private boolean autoPersistUpdates;
+
   /**
    * Use for transaction scoped batch mode.
    */
@@ -277,6 +291,25 @@ public class DatabaseConfig {
 
   private String ddlSeedSql;
 
+  private String ddlHeader;
+
+  /**
+   * Mode used to check non-null columns added via migration have a default value specified etc.
+   */
+  private boolean ddlStrictMode = true;
+
+  /**
+   * Comma and equals delimited key/value placeholders to replace in DDL scripts.
+   */
+  private String ddlPlaceholders;
+
+  /**
+   * Map of key/value placeholders to replace in DDL scripts.
+   */
+  private Map<String, String> ddlPlaceholderMap;
+
+  private boolean runMigration;
+
   /**
    * When true L2 bean cache use is skipped after a write has occurred on a transaction.
    */
@@ -322,11 +355,6 @@ public class DatabaseConfig {
    */
   private String dbSchema;
 
-  /**
-   * The db migration config (migration resource path etc).
-   */
-  private DbMigrationConfig migrationConfig = new DbMigrationConfig();
-
   /**
    * The ClassLoadConfig used to detect Joda, Java8, Jackson etc and create plugin instances given a className.
    */
@@ -473,7 +501,7 @@ public class DatabaseConfig {
    * 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;
+  private boolean useValidationNotNull = true;
 
   /**
    * Generally we want to perform L2 cache notification in the background and not impact
@@ -482,14 +510,23 @@ public class DatabaseConfig {
   private boolean notifyL2CacheInForeground;
 
   /**
-   * Set to true to support query plan capture.
+   * Set to true to enable bind capture required for query plan capture.
    */
-  private boolean collectQueryPlans;
+  private boolean queryPlanEnable;
 
   /**
    * The default threshold in micros for collecting query plans.
    */
-  private long collectQueryPlanThresholdMicros = Long.MAX_VALUE;
+  private long queryPlanThresholdMicros = Long.MAX_VALUE;
+
+  /**
+   * Set to true to enable automatic periodic query plan capture.
+   */
+  private boolean queryPlanCapture;
+  private long queryPlanCapturePeriodSecs = 60 * 10; // 10 minutes
+  private long queryPlanCaptureMaxTimeMillis = 10_000; // 10 seconds
+  private int queryPlanCaptureMaxCount = 10;
+  private QueryPlanListener queryPlanListener;
 
   /**
    * The time in millis used to determine when a query is alerted for being slow.
@@ -706,6 +743,26 @@ public class DatabaseConfig {
     this.jsonInclude = jsonInclude;
   }
 
+  /**
+   * Return true if DbJson beans are assumed dirty by default.
+   * <p>
+   * That is, when true beans that do not implement ModifyAwareType are by
+   * default assumed to be dirty and included in updates.
+   */
+  public boolean isJsonDirtyByDefault() {
+    return jsonDirtyByDefault;
+  }
+
+  /**
+   * Set to false if we want DbJson beans to not be assumed to be dirty.
+   * <p>
+   * That is, when true beans that do not implement ModifyAwareType are by
+   * default assumed to be dirty and included in updates.
+   */
+  public void setJsonDirtyByDefault(boolean jsonDirtyByDefault) {
+    this.jsonDirtyByDefault = jsonDirtyByDefault;
+  }
+
   /**
    * Return the name of the Database.
    */
@@ -880,6 +937,20 @@ public class DatabaseConfig {
     this.tenantCatalogProvider = tenantCatalogProvider;
   }
 
+  /**
+   * Return true if dirty beans are automatically persisted.
+   */
+  public boolean isAutoPersistUpdates() {
+    return autoPersistUpdates;
+  }
+
+  /**
+   * Set to true if dirty beans are automatically persisted.
+   */
+  public void setAutoPersistUpdates(boolean autoPersistUpdates) {
+    this.autoPersistUpdates = autoPersistUpdates;
+  }
+
   /**
    * Return the PersistBatch mode to use by default at the transaction level.
    * <p>
@@ -1029,7 +1100,6 @@ public class DatabaseConfig {
    * This is a performance optimisation to reduce the number times Ebean
    * requests a sequence to be used as an Id for a bean (aka reduce network
    * chatter).
-
    */
   public void setDatabaseSequenceBatchSize(int databaseSequenceBatchSize) {
     platformConfig.setDatabaseSequenceBatchSize(databaseSequenceBatchSize);
@@ -1212,20 +1282,6 @@ public class DatabaseConfig {
     this.dbSchema = dbSchema;
   }
 
-  /**
-   * Return the DB migration configuration.
-   */
-  public DbMigrationConfig getMigrationConfig() {
-    return migrationConfig;
-  }
-
-  /**
-   * Set the DB migration configuration.
-   */
-  public void setMigrationConfig(DbMigrationConfig migrationConfig) {
-    this.migrationConfig = migrationConfig;
-  }
-
   /**
    * Return the Geometry SRID.
    */
@@ -2026,7 +2082,15 @@ public class DatabaseConfig {
    * as it is often the only thing we need to configure for migrations.
    */
   public void setRunMigration(boolean runMigration) {
-    migrationConfig.setRunMigration(runMigration);
+    this.runMigration = runMigration;
+  }
+
+  /**
+   * Return true if the DB migration should run on server start.
+   */
+  public boolean isRunMigration() {
+    final String run = System.getProperty("ebean.migration.run");
+    return (run != null) ? Boolean.parseBoolean(run) : runMigration;
   }
 
   /**
@@ -2134,6 +2198,67 @@ public class DatabaseConfig {
     return ddlExtra;
   }
 
+  /**
+   * Set the header to use with DDL generation.
+   */
+  public void setDdlHeader(String ddlHeader) {
+    this.ddlHeader = ddlHeader;
+  }
+
+  /**
+   * Return the header to use with DDL generation.
+   */
+  public String getDdlHeader() {
+    if (ddlHeader != null && !ddlHeader.isEmpty()) {
+      String header = ddlHeader.replace("${version}", EbeanVersion.getVersion());
+      header = header.replace("${timestamp}", ZonedDateTime.now().format(DateTimeFormatter.ISO_INSTANT));
+      return header;
+    }
+    return ddlHeader;
+  }
+
+  /**
+   * Return true if strict mode is used which includes a check that non-null columns have a default value.
+   */
+  public boolean isDdlStrictMode() {
+    return ddlStrictMode;
+  }
+
+  /**
+   * Set to false to turn off strict mode allowing non-null columns to not have a default value.
+   */
+  public void setDdlStrictMode(boolean ddlStrictMode) {
+    this.ddlStrictMode = ddlStrictMode;
+  }
+
+  /**
+   * Return a comma and equals delimited placeholders that are substituted in DDL scripts.
+   */
+  public String getDdlPlaceholders() {
+    return ddlPlaceholders;
+  }
+
+  /**
+   * Set a comma and equals delimited placeholders that are substituted in DDL scripts.
+   */
+  public void setDdlPlaceholders(String ddlPlaceholders) {
+    this.ddlPlaceholders = ddlPlaceholders;
+  }
+
+  /**
+   * Return a map of placeholder values that are substituted in DDL scripts.
+   */
+  public Map<String, String> getDdlPlaceholderMap() {
+    return ddlPlaceholderMap;
+  }
+
+  /**
+   * Set a map of placeholder values that are substituted in DDL scripts.
+   */
+  public void setDdlPlaceholderMap(Map<String, String> ddlPlaceholderMap) {
+    this.ddlPlaceholderMap = ddlPlaceholderMap;
+  }
+
   /**
    * Return true if the class path search should be disabled.
    */
@@ -2622,7 +2747,10 @@ public class DatabaseConfig {
   }
 
   /**
-   * Load settings from ebean.properties.
+   * Load settings from application.properties, application.yaml and other sources.
+   * <p>
+   * Uses <code>avaje-config</code> to load configuration properties.  Goto https://avaje.io/config
+   * for detail on how and where properties are loaded from.
    */
   public void loadFromProperties() {
     this.properties = Config.asProperties();
@@ -2699,13 +2827,8 @@ public class DatabaseConfig {
    * Load the configuration settings from the properties file.
    */
   protected void loadSettings(PropertiesWrapper p) {
-
     dbSchema = p.get("dbSchema", dbSchema);
-    if (dbSchema != null) {
-      migrationConfig.setDefaultDbSchema(dbSchema);
-    }
     profilingConfig.loadSettings(p, name);
-    migrationConfig.loadSettings(p, name);
     platformConfig.loadSettings(p);
     if (platformConfig.isAllQuotedIdentifiers()) {
       adjustNamingConventionForAllQuoted();
@@ -2729,21 +2852,27 @@ public class DatabaseConfig {
     }
     loadDocStoreSettings(p);
 
+    defaultServer = p.getBoolean("defaultServer", defaultServer);
+    autoPersistUpdates = p.getBoolean("autoPersistUpdates", autoPersistUpdates);
     loadModuleInfo = p.getBoolean("loadModuleInfo", loadModuleInfo);
     maxCallStack = p.getInt("maxCallStack", maxCallStack);
     dumpMetricsOnShutdown = p.getBoolean("dumpMetricsOnShutdown", dumpMetricsOnShutdown);
     dumpMetricsOptions = p.get("dumpMetricsOptions", dumpMetricsOptions);
     queryPlanTTLSeconds = p.getInt("queryPlanTTLSeconds", queryPlanTTLSeconds);
     slowQueryMillis = p.getLong("slowQueryMillis", slowQueryMillis);
-    collectQueryPlans = p.getBoolean("collectQueryPlans", collectQueryPlans);
-    collectQueryPlanThresholdMicros = p.getLong("collectQueryPlanThresholdMicros", collectQueryPlanThresholdMicros);
+    queryPlanEnable = p.getBoolean("queryPlan.enable", queryPlanEnable);
+    queryPlanThresholdMicros = p.getLong("queryPlan.thresholdMicros", queryPlanThresholdMicros);
+    queryPlanCapture = p.getBoolean("queryPlan.capture", queryPlanCapture);
+    queryPlanCapturePeriodSecs = p.getLong("queryPlan.capturePeriodSecs", queryPlanCapturePeriodSecs);
+    queryPlanCaptureMaxTimeMillis = p.getLong("queryPlan.captureMaxTimeMillis", queryPlanCaptureMaxTimeMillis);
+    queryPlanCaptureMaxCount = p.getInt("queryPlan.captureMaxCount", queryPlanCaptureMaxCount);
     docStoreOnly = p.getBoolean("docStoreOnly", docStoreOnly);
     disableL2Cache = p.getBoolean("disableL2Cache", disableL2Cache);
     localOnlyL2Cache = p.getBoolean("localOnlyL2Cache", localOnlyL2Cache);
     enabledL2Regions = p.get("enabledL2Regions", enabledL2Regions);
     notifyL2CacheInForeground = p.getBoolean("notifyL2CacheInForeground", notifyL2CacheInForeground);
     useJtaTransactionManager = p.getBoolean("useJtaTransactionManager", useJtaTransactionManager);
-    useJavaxValidationNotNull = p.getBoolean("useJavaxValidationNotNull", useJavaxValidationNotNull);
+    useValidationNotNull = p.getBoolean("useValidationNotNull", useValidationNotNull);
     autoReadOnlyDataSource = p.getBoolean("autoReadOnlyDataSource", autoReadOnlyDataSource);
     idGeneratorAutomatic = p.getBoolean("idGeneratorAutomatic", idGeneratorAutomatic);
 
@@ -2806,13 +2935,18 @@ public class DatabaseConfig {
     jsonInclude = p.getEnum(JsonConfig.Include.class, "jsonInclude", jsonInclude);
     jsonDateTime = p.getEnum(JsonConfig.DateTime.class, "jsonDateTime", jsonDateTime);
     jsonDate = p.getEnum(JsonConfig.Date.class, "jsonDate", jsonDate);
+    jsonDirtyByDefault = p.getBoolean("jsonDirtyByDefault", jsonDirtyByDefault);
 
+    runMigration = p.getBoolean("migration.run", runMigration);
     ddlGenerate = p.getBoolean("ddl.generate", ddlGenerate);
     ddlRun = p.getBoolean("ddl.run", ddlRun);
     ddlExtra = p.getBoolean("ddl.extra", ddlExtra);
     ddlCreateOnly = p.getBoolean("ddl.createOnly", ddlCreateOnly);
     ddlInitSql = p.get("ddl.initSql", ddlInitSql);
     ddlSeedSql = p.get("ddl.seedSql", ddlSeedSql);
+    ddlStrictMode = p.getBoolean("ddl.strictMode", ddlStrictMode);
+    ddlPlaceholders = p.get("ddl.placeholders", ddlPlaceholders);
+    ddlHeader = p.get("ddl.header", ddlHeader);
 
     // read tenant-configuration from config:
     // tenant.mode = NONE | DB | SCHEMA | CATALOG | PARTITION
@@ -2986,20 +3120,21 @@ public class DatabaseConfig {
   /**
    * Returns if we use javax.validation.constraints.NotNull
    */
-  public boolean isUseJavaxValidationNotNull() {
-    return useJavaxValidationNotNull;
+  public boolean isUseValidationNotNull() {
+    return useValidationNotNull;
   }
 
   /**
-   * Controls if Ebean should ignore <code>&x64;javax.validation.contstraints.NotNull</code>
+   * Controls if Ebean should ignore <code>&x64;javax.validation.contstraints.NotNull</code> or
+   * <code>&x64;jakarta.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;
+  public void setUseValidationNotNull(boolean useValidationNotNull) {
+    this.useValidationNotNull = useValidationNotNull;
   }
 
   /**
@@ -3021,30 +3156,22 @@ public class DatabaseConfig {
   }
 
   /**
-   * Return the query plan time to live.
+   * Return the time to live for ebean's internal query plan.
    */
   public int getQueryPlanTTLSeconds() {
     return queryPlanTTLSeconds;
   }
 
   /**
-   * Set the query plan time to live.
+   * Set the time to live for ebean's internal query plan.
+   * <p>
+   * This is the plan that knows how to execute the query, read the result
+   * and collects execution metrics. By default this is set to 5 mins.
    */
   public void setQueryPlanTTLSeconds(int queryPlanTTLSeconds) {
     this.queryPlanTTLSeconds = queryPlanTTLSeconds;
   }
 
-  /**
-   * Run the DB migration against the DataSource.
-   */
-  public DataSource runDbMigration(DataSource dataSource) {
-    if (migrationConfig.isRunMigration()) {
-      MigrationRunner runner = migrationConfig.createRunner(getClassLoadConfig().getClassLoader(), properties);
-      runner.run(dataSource);
-    }
-    return dataSource;
-  }
-
   /**
    * Create a new PlatformConfig based of the one held but with overridden properties by reading
    * properties with the given path and prefix.
@@ -3112,29 +3239,110 @@ public class DatabaseConfig {
   /**
    * Return true if query plan capture is enabled.
    */
-  public boolean isCollectQueryPlans() {
-    return collectQueryPlans;
+  public boolean isQueryPlanEnable() {
+    return queryPlanEnable;
   }
 
   /**
    * Set to true to enable query plan capture.
    */
-  public void setCollectQueryPlans(boolean collectQueryPlans) {
-    this.collectQueryPlans = collectQueryPlans;
+  public void setQueryPlanEnable(boolean queryPlanEnable) {
+    this.queryPlanEnable = queryPlanEnable;
   }
 
   /**
    * Return the query plan collection threshold in microseconds.
    */
-  public long getCollectQueryPlanThresholdMicros() {
-    return collectQueryPlanThresholdMicros;
+  public long getQueryPlanThresholdMicros() {
+    return queryPlanThresholdMicros;
   }
 
   /**
    * Set the query plan collection threshold in microseconds.
+   * <p>
+   * Queries executing slower than this will have bind values captured such that later
+   * the query plan can be captured and reported.
    */
-  public void setCollectQueryPlanThresholdMicros(long collectQueryPlanThresholdMicros) {
-    this.collectQueryPlanThresholdMicros = collectQueryPlanThresholdMicros;
+  public void setQueryPlanThresholdMicros(long queryPlanThresholdMicros) {
+    this.queryPlanThresholdMicros = queryPlanThresholdMicros;
+  }
+
+  /**
+   * Return true if periodic capture of query plans is enabled.
+   */
+  public boolean isQueryPlanCapture() {
+    return queryPlanCapture;
+  }
+
+  /**
+   * Set to true to turn on periodic capture of query plans.
+   */
+  public void setQueryPlanCapture(boolean queryPlanCapture) {
+    this.queryPlanCapture = queryPlanCapture;
+  }
+
+  /**
+   * Return the frequency to capture query plans.
+   */
+  public long getQueryPlanCapturePeriodSecs() {
+    return queryPlanCapturePeriodSecs;
+  }
+
+  /**
+   * Set the frequency in seconds to capture query plans.
+   */
+  public void setQueryPlanCapturePeriodSecs(long queryPlanCapturePeriodSecs) {
+    this.queryPlanCapturePeriodSecs = queryPlanCapturePeriodSecs;
+  }
+
+  /**
+   * Return the time after which a capture query plans request will
+   * stop capturing more query plans.
+   * <p>
+   * Effectively this controls the amount of load/time we want to
+   * allow for query plan capture.
+   */
+  public long getQueryPlanCaptureMaxTimeMillis() {
+    return queryPlanCaptureMaxTimeMillis;
+  }
+
+  /**
+   * Set the time after which a capture query plans request will
+   * stop capturing more query plans.
+   * <p>
+   * Effectively this controls the amount of load/time we want to
+   * allow for query plan capture.
+   */
+  public void setQueryPlanCaptureMaxTimeMillis(long queryPlanCaptureMaxTimeMillis) {
+    this.queryPlanCaptureMaxTimeMillis = queryPlanCaptureMaxTimeMillis;
+  }
+
+  /**
+   * Return the max number of query plans captured per request.
+   */
+  public int getQueryPlanCaptureMaxCount() {
+    return queryPlanCaptureMaxCount;
+  }
+
+  /**
+   * Set the max number of query plans captured per request.
+   */
+  public void setQueryPlanCaptureMaxCount(int queryPlanCaptureMaxCount) {
+    this.queryPlanCaptureMaxCount = queryPlanCaptureMaxCount;
+  }
+
+  /**
+   * Return the listener used to process captured query plans.
+   */
+  public QueryPlanListener getQueryPlanListener() {
+    return queryPlanListener;
+  }
+
+  /**
+   * Set the listener used to process captured query plans.
+   */
+  public void setQueryPlanListener(QueryPlanListener queryPlanListener) {
+    this.queryPlanListener = queryPlanListener;
   }
 
   /**

ebean-api/src/main/java/io/ebean/config/DatabaseConfigProvider.java

@@ -15,7 +15,7 @@ package io.ebean.config;
  *
  * public class EbeanConfigProvider implements DatabaseConfigProvider {
  *
- *   ＠Override
+ *   @Override
  *   public void apply(DatabaseConfig config) {
  *
  *     // register the entity bean classes explicitly

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

@@ -1,509 +0,0 @@
-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;
-
-import static io.ebean.util.StringHelper.replace;
-
-/**
- * Configuration for the DB migration processing.
- */
-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.
-   */
-  protected Platform platform;
-
-  /**
-   * Resource path for the migration xml and sql.
-   */
-  protected String migrationPath = "dbmigration";
-
-  protected String migrationInitPath = "dbinit";
-
-  /**
-   * Subdirectory the model xml files go into.
-   */
-  protected String modelPath = "model";
-
-  protected String applySuffix = ".sql";
-
-  /**
-   * Set this to "V" to be compatible with FlywayDB.
-   */
-  protected String applyPrefix = "";
-
-  protected String modelSuffix = ".model.xml";
-
-  /**
-   * For running migration the DB table that holds migration execution status.
-   */
-  protected String metaTable = "db_migration";
-
-  /**
-   * Flag set to true means to run any outstanding migrations on startup.
-   */
-  protected boolean runMigration;
-
-  /**
-   * Comma and equals delimited key/value placeholders to replace in DDL scripts.
-   */
-  protected String runPlaceholders;
-
-  /**
-   * Map of key/value placeholders to replace in DDL scripts.
-   */
-  protected Map<String, String> runPlaceholderMap;
-
-  /**
-   * DB schema used for the migration (and testing).
-   */
-  protected String dbSchema;
-
-  /**
-   * Set to true if we consider this the 'default schema' (Postgres schema that matches DB username)
-   */
-  protected boolean defaultDbSchema;
-
-  /**
-   * DB user used to run the DB migration.
-   */
-  protected String dbUsername;
-
-  /**
-   * DB password used to run the DB migration.
-   */
-  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>
-   * We typically need to explicitly specify this as migration can often be generated
-   * when running against H2.
-   */
-  public Platform getPlatform() {
-    return platform;
-  }
-
-  /**
-   * Set the DB platform to generate migration DDL for.
-   */
-  public void setPlatform(Platform platform) {
-    this.platform = platform;
-  }
-
-  /**
-   * Return the path for normal migrations or dbinit migrations.
-   *
-   * @param dbinitMigration When true return the path for dbinit migrations.
-   */
-  public String getMigrationPath(boolean dbinitMigration) {
-    return dbinitMigration ? migrationInitPath : migrationPath;
-  }
-
-  /**
-   * Return the resource path for db migrations.
-   */
-  public String getMigrationPath() {
-    return migrationPath;
-  }
-
-  /**
-   * Set the resource path for db migrations.
-   * <p>
-   * The default of "dbmigration" is reasonable in most cases. You may look to set this
-   * to be something like "dbmigration/myapp" where myapp gives it a unique resource path
-   * in the case there are multiple Database applications in the single classpath.
-   * </p>
-   */
-  public void setMigrationPath(String migrationPath) {
-    this.migrationPath = migrationPath;
-  }
-
-  /**
-   * Return the relative path for the model files (defaults to model).
-   */
-  public String getModelPath() {
-    return modelPath;
-  }
-
-  /**
-   * Set the relative path for the model files.
-   */
-  public void setModelPath(String modelPath) {
-    this.modelPath = modelPath;
-  }
-
-  /**
-   * Return the model suffix (defaults to model.xml)
-   */
-  public String getModelSuffix() {
-    return modelSuffix;
-  }
-
-  /**
-   * Set the model suffix.
-   */
-  public void setModelSuffix(String modelSuffix) {
-    this.modelSuffix = modelSuffix;
-  }
-
-  /**
-   * Return the apply script suffix (defaults to sql).
-   */
-  public String getApplySuffix() {
-    return applySuffix;
-  }
-
-  /**
-   * Set the apply script suffix (defaults to sql).
-   */
-  public void setApplySuffix(String applySuffix) {
-    this.applySuffix = applySuffix;
-  }
-
-  /**
-   * Return the apply prefix.
-   */
-  public String getApplyPrefix() {
-    return applyPrefix;
-  }
-
-  /**
-   * Set the apply prefix. This might be set to "V" for use with FlywayDB.
-   */
-  public void setApplyPrefix(String applyPrefix) {
-    this.applyPrefix = applyPrefix;
-  }
-
-  /**
-   * Return the table name that holds the migration run details
-   * (used by DB Migration runner only).
-   */
-  public String getMetaTable() {
-    return metaTable;
-  }
-
-  /**
-   * Set the table name that holds the migration run details
-   * (used by DB Migration runner only).
-   */
-  public void setMetaTable(String metaTable) {
-    this.metaTable = metaTable;
-  }
-
-  /**
-   * Return a comma and equals delimited placeholders that are substituted in SQL scripts when running migration
-   * (used by DB Migration runner only).
-   */
-  public String getRunPlaceholders() {
-    // environment properties take precedence
-    String placeholders = readEnvironment("ddl.migration.placeholders");
-    if (placeholders != null) {
-      return placeholders;
-    }
-    return runPlaceholders;
-  }
-
-  /**
-   * Set a comma and equals delimited placeholders that are substituted in SQL scripts when running migration
-   * (used by DB Migration runner only).
-   */
-  public void setRunPlaceholders(String runPlaceholders) {
-    this.runPlaceholders = runPlaceholders;
-  }
-
-  /**
-   * Return a map of placeholder values that are substituted in SQL scripts when running migration
-   * (used by DB Migration runner only).
-   */
-  public Map<String, String> getRunPlaceholderMap() {
-    return runPlaceholderMap;
-  }
-
-  /**
-   * Set a map of placeholder values that are substituted when running migration
-   * (used by DB Migration runner only).
-   */
-  public void setRunPlaceholderMap(Map<String, String> runPlaceholderMap) {
-    this.runPlaceholderMap = runPlaceholderMap;
-  }
-
-  /**
-   * Return true if the DB migration should be run on startup.
-   */
-  public boolean isRunMigration() {
-    // environment properties take precedence
-    String run = readEnvironment("ddl.migration.run");
-    if (run != null) {
-      return "true".equalsIgnoreCase(run.trim());
-    }
-    return runMigration;
-  }
-
-  /**
-   * Set to true to run the DB migration on startup.
-   */
-  public void setRunMigration(boolean runMigration) {
-    this.runMigration = runMigration;
-  }
-
-  /**
-   * Return the DB username to use for running DB migrations.
-   */
-  public String getDbUsername() {
-    // environment properties take precedence
-    String user = readEnvironment("ddl.migration.user");
-    if (user != null) {
-      return user;
-    }
-    return dbUsername;
-  }
-
-  /**
-   * Set the DB username to use for running DB migrations.
-   */
-  public void setDbUsername(String dbUsername) {
-    this.dbUsername = dbUsername;
-  }
-
-  /**
-   * Return the DB password to use for running DB migrations.
-   */
-  public String getDbPassword() {
-    String user = readEnvironment("ddl.migration.password");
-    if (user != null) {
-      return user;
-    }
-    return dbPassword;
-  }
-
-  /**
-   * Set the DB password to use for running DB migrations.
-   */
-  public void setDbPassword(String dbPassword) {
-    this.dbPassword = dbPassword;
-  }
-
-  /**
-   * Return the DB schema to use (for migration, testing etc).
-   */
-  public String getDbSchema() {
-    String schema = readEnvironment("ddl.migration.schema");
-    if (schema != null) {
-      return schema;
-    }
-    return dbSchema;
-  }
-
-  /**
-   * Set the Db schema to use.
-   */
-  public void setDbSchema(String dbSchema) {
-    this.dbSchema = dbSchema;
-  }
-
-  /**
-   * Set the Db schema if it hasn't already been defined.
-   */
-  public void setDefaultDbSchema(String dbSchema) {
-    this.defaultDbSchema = true;
-    this.dbSchema = dbSchema;
-  }
-
-  /**
-   * Return true if this is considered the default DB schema (Postgres schema matching DB username).
-   */
-  public boolean isDefaultDbSchema() {
-    return defaultDbSchema;
-  }
-
-  /**
-   * 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() {
-    if (ddlHeader != null && !ddlHeader.isEmpty()) {
-      ddlHeader = replace(ddlHeader, "${version}", EbeanVersion.getVersion());
-      ddlHeader = replace(ddlHeader, "${timestamp}", ZonedDateTime.now().format( DateTimeFormatter.ISO_INSTANT ));
-    }
-    return ddlHeader;
-  }
-
-  /**
-   * Set the header prepended to the DDL.
-   */
-  public void setDdlHeader(String ddlHeader) {
-    this.ddlHeader = 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.
-   */
-  public void loadSettings(PropertiesWrapper properties, String serverName) {
-
-    migrationPath = properties.get("migration.migrationPath", migrationPath);
-    migrationInitPath = properties.get("migration.migrationInitPath", migrationInitPath);
-    modelPath = properties.get("migration.modelPath", modelPath);
-    applyPrefix = properties.get("migration.applyPrefix", applyPrefix);
-    applySuffix = properties.get("migration.applySuffix", applySuffix);
-    modelSuffix = properties.get("migration.modelSuffix", modelSuffix);
-
-    platform = properties.getEnum(Platform.class, "migration.platform", platform);
-    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);
-    dbSchema = properties.get("migration.dbSchema", dbSchema);
-
-    //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);
-    String adminPwd = properties.get("datasource." + serverName + ".adminpassword", dbPassword);
-    dbPassword = properties.get("migration.dbpassword", adminPwd);
-    ddlHeader = properties.get("ddl.header", ddlHeader);
-  }
-
-  /**
-   * Return the system or environment property.
-   */
-  protected String readEnvironment(String key) {
-
-    String val = System.getProperty(key);
-    if (val == null) {
-      val = System.getenv(key);
-    }
-    return val;
-  }
-
-  /**
-   * Return true if the string is null or empty.
-   */
-  protected boolean isEmpty(String val) {
-    return val == null || val.trim().isEmpty();
-  }
-
-  /**
-   * Create the MigrationRunner to run migrations if necessary.
-   */
-  public MigrationRunner createRunner(ClassLoader classLoader, Properties properties) {
-
-    runnerConfig.setMetaTable(metaTable);
-    runnerConfig.setApplySuffix(applySuffix);
-    runnerConfig.setMigrationPath(migrationPath);
-    runnerConfig.setMigrationInitPath(migrationInitPath);
-    runnerConfig.setRunPlaceholderMap(runPlaceholderMap);
-    runnerConfig.setRunPlaceholders(runPlaceholders);
-    runnerConfig.setDbUsername(getDbUsername());
-    runnerConfig.setDbPassword(getDbPassword());
-    runnerConfig.setDbSchema(getDbSchema());
-    if (defaultDbSchema) {
-      runnerConfig.setSetCurrentSchema(false);
-    }
-    runnerConfig.setClassLoader(classLoader);
-    if (patchInsertOn != null) {
-      runnerConfig.setPatchInsertOn(patchInsertOn);
-    }
-    if (patchResetChecksumOn != null) {
-      runnerConfig.setPatchResetChecksumOn(patchResetChecksumOn);
-    }
-    if (properties != null) {
-      runnerConfig.load(properties);
-    }
-    return new MigrationRunner(runnerConfig);
-  }
-}

ebean-api/src/main/java/io/ebean/config/MatchingNamingConvention.java

@@ -39,11 +39,6 @@ public class MatchingNamingConvention extends AbstractNamingConvention {
     return new TableName(quoteIdentifiers(getCatalog()), quoteIdentifiers(getSchema()), quoteIdentifiers(beanClass.getSimpleName()));
   }
 
-  @Override
-  public String getPropertyFromColumn(Class<?> beanClass, String dbColumnName) {
-    return dbColumnName;
-  }
-
   @Override
   public String getForeignKey(String prefix, String fkProperty) {
     prefix = databasePlatform.unQuote(prefix);

ebean-api/src/main/java/io/ebean/config/ModuleInfoLoader.java

@@ -7,13 +7,8 @@ import java.util.List;
  */
 public interface ModuleInfoLoader {
 
-  /**
-   * Return the entity classes to register with the default DB.
-   */
-  List<Class<?>> entityClasses();
-
   /**
    * Return entity classes to register for a named DB (not default DB).
    */
-  List<Class<?>> entityClassesFor(String dbName);
+  List<Class<?>> classesFor(String dbName, boolean defaultServer);
 }

ebean-api/src/main/java/io/ebean/config/NamingConvention.java

@@ -53,6 +53,16 @@ public interface NamingConvention {
    */
   TableName getM2MJoinTableName(TableName lhsTable, TableName rhsTable);
 
+  /**
+   * Derive a DB Column from a FK table and column.
+   */
+  String deriveM2MColumn(String tableName, String dbColumn);
+
+  /**
+   * Return the full table name taking into account quoted identifiers.
+   */
+  String getTableName(String catalog, String schema, String name);
+
   /**
    * Return the column name given the property name.
    *
@@ -60,18 +70,6 @@ public interface NamingConvention {
    */
   String getColumnFromProperty(Class<?> beanClass, String propertyName);
 
-  /**
-   * Return the property name from the column name.
-   * <p>
-   * This is used to help mapping of raw SQL queries onto bean properties.
-   * </p>
-   *
-   * @param beanClass    the bean class
-   * @param dbColumnName the db column name
-   * @return the property name from the column name
-   */
-  String getPropertyFromColumn(Class<?> beanClass, String dbColumnName);
-
   /**
    * Return the sequence name given the table name (for DB's that use sequences).
    * <p>

ebean-api/src/main/java/io/ebean/config/PlatformConfig.java

@@ -17,6 +17,11 @@ public class PlatformConfig {
 
   private boolean allQuotedIdentifiers;
 
+  /**
+   * Set this to true for Postgres FOR UPDATE to use NO KEY option.
+   */
+  private boolean forUpdateNoKey;
+
   private DbConstraintNaming constraintNaming;
 
   /**
@@ -77,6 +82,7 @@ public class PlatformConfig {
    * Construct based on given config - typically for DbMigration generation with many platforms.
    */
   public PlatformConfig(PlatformConfig platformConfig) {
+    this.forUpdateNoKey = platformConfig.forUpdateNoKey;
     this.databaseBooleanFalse = platformConfig.databaseBooleanFalse;
     this.databaseBooleanTrue = platformConfig.databaseBooleanTrue;
     this.databaseSequenceBatchSize = platformConfig.databaseSequenceBatchSize;
@@ -133,14 +139,26 @@ public class PlatformConfig {
     this.caseSensitiveCollation = caseSensitiveCollation;
   }
 
+  /**
+   * Return true if Postgres FOR UPDATE should use the NO KEY option.
+   */
+  public boolean isForUpdateNoKey() {
+    return forUpdateNoKey;
+  }
+
+  /**
+   * Set to true such that Postgres FOR UPDATE should use the NO KEY option.
+   */
+  public void setForUpdateNoKey(boolean forUpdateNoKey) {
+    this.forUpdateNoKey = forUpdateNoKey;
+  }
+
   /**
    * Return a value used to represent TRUE in the database.
    * <p>
    * This is used for databases that do not support boolean natively.
-   * </p>
    * <p>
    * The value returned is either a Integer or a String (e.g. "1", or "T").
-   * </p>
    */
   public String getDatabaseBooleanTrue() {
     return databaseBooleanTrue;
@@ -150,10 +168,8 @@ public class PlatformConfig {
    * Set the value to represent TRUE in the database.
    * <p>
    * This is used for databases that do not support boolean natively.
-   * </p>
    * <p>
    * The value set is either a Integer or a String (e.g. "1", or "T").
-   * </p>
    */
   public void setDatabaseBooleanTrue(String databaseBooleanTrue) {
     this.databaseBooleanTrue = databaseBooleanTrue;
@@ -245,7 +261,6 @@ public class PlatformConfig {
 
   /**
    * Add a custom type mapping.
-   * <p>
    * <pre>{@code
    *
    *   // set the default mapping for BigDecimal.class/decimal
@@ -266,7 +281,6 @@ public class PlatformConfig {
 
   /**
    * Add a custom type mapping that applies to all platforms.
-   * <p>
    * <pre>{@code
    *
    *   // set the default mapping for BigDecimal/decimal
@@ -294,6 +308,7 @@ public class PlatformConfig {
   public void loadSettings(PropertiesWrapper p) {
 
     idType = p.getEnum(IdType.class, "idType", idType);
+    forUpdateNoKey = p.getBoolean("forUpdateNoKey", forUpdateNoKey);
     databaseSequenceBatchSize = p.getInt("databaseSequenceBatchSize", databaseSequenceBatchSize);
     databaseBooleanTrue = p.get("databaseBooleanTrue", databaseBooleanTrue);
     databaseBooleanFalse = p.get("databaseBooleanFalse", databaseBooleanFalse);
@@ -334,7 +349,6 @@ public class PlatformConfig {
    */
   public enum DbUuid {
 
-
     /**
      * Store using native UUID in H2 and Postgres and otherwise fallback to VARCHAR(40).
      */

ebean-api/src/main/java/io/ebean/config/QueryPlanCapture.java

@@ -0,0 +1,34 @@
+package io.ebean.config;
+
+import io.ebean.Database;
+import io.ebean.meta.MetaQueryPlan;
+
+import java.util.List;
+
+/**
+ * The captured query plans.
+ */
+public class QueryPlanCapture {
+
+  private final Database database;
+  private final List<MetaQueryPlan> plans;
+
+  public QueryPlanCapture(Database database, List<MetaQueryPlan> plans) {
+    this.database = database;
+    this.plans = plans;
+  }
+
+  /**
+   * Return the database the plans were captured for.
+   */
+  public Database getDatabase() {
+    return database;
+  }
+
+  /**
+   * Return the captured query plans.
+   */
+  public List<MetaQueryPlan> getPlans() {
+    return plans;
+  }
+}

ebean-api/src/main/java/io/ebean/config/QueryPlanListener.java

@@ -0,0 +1,13 @@
+package io.ebean.config;
+
+/**
+ * EXPERIMENTAL: Listener for captured query plans.
+ */
+@FunctionalInterface
+public interface QueryPlanListener {
+
+  /**
+   * Process the captured query plans.
+   */
+  void process(QueryPlanCapture capture);
+}

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

@@ -1,47 +1,6 @@
 package io.ebean.config;
 
-import com.fasterxml.jackson.core.JsonFactory;
-import io.avaje.config.Config;
 import io.ebean.DatabaseFactory;
-import io.ebean.PersistenceContextScope;
-import io.ebean.Query;
-import io.ebean.Transaction;
-import io.ebean.annotation.Encrypted;
-import io.ebean.annotation.PersistBatch;
-import io.ebean.annotation.Platform;
-import io.ebean.cache.ServerCachePlugin;
-import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.config.dbplatform.DbEncrypt;
-import io.ebean.config.dbplatform.DbType;
-import io.ebean.config.dbplatform.IdType;
-import io.ebean.datasource.DataSourceConfig;
-import io.ebean.event.BeanFindController;
-import io.ebean.event.BeanPersistController;
-import io.ebean.event.BeanPersistListener;
-import io.ebean.event.BeanPostConstructListener;
-import io.ebean.event.BeanPostLoad;
-import io.ebean.event.BeanQueryAdapter;
-import io.ebean.event.BulkTableEventListener;
-import io.ebean.event.ServerConfigStartup;
-import io.ebean.event.changelog.ChangeLogListener;
-import io.ebean.event.changelog.ChangeLogPrepare;
-import io.ebean.event.changelog.ChangeLogRegister;
-import io.ebean.event.readaudit.ReadAuditLogger;
-import io.ebean.event.readaudit.ReadAuditPrepare;
-import io.ebean.migration.MigrationRunner;
-import io.ebean.util.StringHelper;
-
-import javax.persistence.EnumType;
-import javax.sql.DataSource;
-import java.time.Clock;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.ServiceLoader;
 
 /**
  * Deprecated - please migrate to <code>io.ebean.DatabaseConfig</code>.

ebean-api/src/main/java/io/ebean/config/ServerConfigProvider.java

@@ -16,7 +16,7 @@ package io.ebean.config;
  *
  * public class EbeanConfigProvider implements ServerConfigProvider {
  *
- *   ＠Override
+ *   @Override
  *   public void apply(ServerConfig config) {
  *
  *     // register the entity bean classes explicitly

ebean-api/src/main/java/io/ebean/config/TableName.java

@@ -20,7 +20,7 @@ public final class TableName {
   /**
    * The name.
    */
-  private String name;
+  private final String name;
 
   /**
    * Construct with the given catalog schema and table name.
@@ -29,7 +29,6 @@ public final class TableName {
    * </p>
    */
   public TableName(String catalog, String schema, String name) {
-    super();
     this.catalog = catalog != null ? catalog.trim() : null;
     this.schema = schema != null ? schema.trim() : null;
     this.name = name != null ? name.trim() : null;
@@ -110,14 +109,11 @@ public final class TableName {
    * @return the qualified name
    */
   public String getQualifiedName() {
-
     StringBuilder buffer = new StringBuilder();
-
     // Add catalog
     if (catalog != null) {
       buffer.append(catalog);
     }
-
     // Add schema
     if (schema != null) {
       if (buffer.length() > 0) {
@@ -125,31 +121,27 @@ public final class TableName {
       }
       buffer.append(schema);
     }
-
     if (buffer.length() > 0) {
       buffer.append(".");
     }
-    buffer.append(name);
-
-    return buffer.toString();
+    return buffer.append(name).toString();
   }
 
   /**
    * Append a catalog and schema prefix if they exist to the string builder.
    */
-  public void appendCatalogAndSchema(StringBuilder buffer) {
-    if (catalog != null) {
-      buffer.append(catalog).append(".");
-    }
+  public String withCatalogAndSchema(String name) {
     if (schema != null) {
-      buffer.append(schema).append(".");
+      name = schema + "." + name;
     }
+    if (catalog != null) {
+      name = catalog + "." + name;
+    }
+    return name;
   }
 
   /**
    * Checks if is table name is valid i.e. it has at least a name.
-   *
-   * @return true, if is valid
    */
   public boolean isValid() {
     return name != null && !name.isEmpty();

ebean-api/src/main/java/io/ebean/config/UnderscoreNamingConvention.java

@@ -60,18 +60,6 @@ public class UnderscoreNamingConvention extends AbstractNamingConvention {
     return toUnderscoreFromCamel(propertyName);
   }
 
-  /**
-   * Converts underscore based column name to Camel case property name.
-   *
-   * @param beanClass    the bean class
-   * @param dbColumnName the db column name
-   * @return the property from column
-   */
-  @Override
-  public String getPropertyFromColumn(Class<?> beanClass, String dbColumnName) {
-    return toCamelFromUnderscore(dbColumnName);
-  }
-
   /**
    * Return true if the result will be upper case.
    * <p>

ebean-api/src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java

@@ -9,9 +9,6 @@ import java.sql.Types;
  * functions for varchar, date and timestamp. If they are left null then that is
  * treated as though that data type can not be encrypted in the DB and will
  * instead use java client encryption.
- * </p>
- *
- * @author rbygrave
  */
 public abstract class AbstractDbEncrypt implements DbEncrypt {
 
@@ -47,13 +44,10 @@ public abstract class AbstractDbEncrypt implements DbEncrypt {
       case Types.CHAR:
       case Types.LONGVARCHAR:
         return varcharEncryptFunction;
-
       case Types.DATE:
         return dateEncryptFunction;
-
       case Types.TIMESTAMP:
         return timestampEncryptFunction;
-
       default:
         return null;
     }

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

@@ -679,21 +679,20 @@ public class DatabasePlatform {
 
   public String completeSql(String sql, Query<?> query) {
     if (query.isForUpdate()) {
-      sql = withForUpdate(sql, query.getForUpdateMode());
+      sql = withForUpdate(sql, query.getForUpdateLockWait(), query.getForUpdateLockType());
     }
-
     return sql;
   }
 
   /**
    * For update hint on the FROM clause (SQL server only).
    */
-  public String fromForUpdate(Query.ForUpdate forUpdateMode) {
+  public String fromForUpdate(Query.LockWait lockWait) {
     // return null except for sql server
     return null;
   }
 
-  protected String withForUpdate(String sql, Query.ForUpdate forUpdateMode) {
+  protected String withForUpdate(String sql, Query.LockWait lockWait, Query.LockType lockType) {
     // silently assume the database does not support the "for update" clause.
     logger.info("it seems your database does not support the 'for update' clause");
     return sql;

ebean-api/src/main/java/io/ebean/config/dbplatform/DbDefaultValue.java

@@ -79,7 +79,7 @@ public class DbDefaultValue {
   }
 
   /**
-   * This method checks & convert the {@link DbDefault#value()} to a valid SQL literal.
+   * This method checks and converts the {@link DbDefault#value()} to a valid SQL literal.
    *
    * This is mainly to quote string literals and verify integer/dates for correctness.
    * <p>

ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java

@@ -16,6 +16,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.NavigableSet;
 import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
@@ -25,9 +26,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
 
   protected static final Logger logger = LoggerFactory.getLogger("io.ebean.SEQ");
 
-  private final ReentrantLock lock = new ReentrantLock(false);
-
-  private final ReentrantLock loadLock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   /**
    * The actual sequence name.
@@ -42,7 +41,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
 
   protected final int allocationSize;
 
-  protected boolean currentlyBackgroundLoading;
+  protected AtomicBoolean currentlyBackgroundLoading = new AtomicBoolean(false);
 
   /**
    * Construct given a dataSource and sql to return the next sequence value.
@@ -128,27 +127,16 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
    * Load another batch of Id's using a background thread.
    */
   protected void loadInBackground(final int requestSize) {
-    // single threaded processing...
-    loadLock.lock();
-    try {
-      if (currentlyBackgroundLoading) {
-        // skip as already background loading
-        logger.debug("... skip background sequence load (another load in progress)");
-        return;
-      }
-      currentlyBackgroundLoading = true;
-      backgroundExecutor.execute(() -> {
-        loadMore(requestSize);
-        loadLock.lock();
-        try {
-          currentlyBackgroundLoading = false;
-        } finally {
-          loadLock.unlock();
-        }
-      });
-    } finally {
-      loadLock.lock();
+    if (currentlyBackgroundLoading.get()) {
+      // skip as already background loading
+      logger.debug("... skip background sequence load (another load in progress)");
+      return;
     }
+    currentlyBackgroundLoading.set(true);
+    backgroundExecutor.execute(() -> {
+      loadMore(requestSize);
+      currentlyBackgroundLoading.set(false);
+    });
   }
 
   /**

ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java

@@ -5,8 +5,6 @@ import io.ebean.config.dbplatform.DbEncryptFunction;
 
 /**
  * H2 encryption support via encrypt decrypt function.
- *
- * @author rbygrave
  */
 public class H2DbEncrypt extends AbstractDbEncrypt {
 

ebean-api/src/main/java/io/ebean/config/dbplatform/h2/H2HistoryTrigger.java

@@ -4,11 +4,7 @@ import org.h2.api.Trigger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
+import java.sql.*;
 import java.util.Arrays;
 
 /**
@@ -43,7 +39,6 @@ public class H2HistoryTrigger implements Trigger {
 
   @Override
   public void init(Connection conn, String schemaName, String triggerName, String tableName, boolean before, int type) throws SQLException {
-
     // get the columns for the table
     ResultSet rs = conn.getMetaData().getColumns(null, schemaName, tableName, null);
 
@@ -79,7 +74,6 @@ public class H2HistoryTrigger implements Trigger {
 
   @Override
   public void fire(Connection connection, Object[] oldRow, Object[] newRow) throws SQLException {
-
     if (oldRow != null) {
       // a delete or update event
       Timestamp now = new Timestamp(System.currentTimeMillis());
@@ -99,7 +93,6 @@ public class H2HistoryTrigger implements Trigger {
    * Insert the data into the history table.
    */
   private void insertIntoHistory(Connection connection, Object[] oldRow) throws SQLException {
-
     try (PreparedStatement stmt = connection.prepareStatement(insertHistorySql)) {
       for (int i = 0; i < oldRow.length; i++) {
         stmt.setObject(i + 1, oldRow[i]);
@@ -110,11 +103,11 @@ public class H2HistoryTrigger implements Trigger {
 
   @Override
   public void close() throws SQLException {
-
+    // do nothing
   }
 
   @Override
   public void remove() throws SQLException {
-
+    // do nothing
   }
 }

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

@@ -51,7 +51,7 @@ public class H2Platform extends DatabasePlatform {
   }
 
   @Override
-  protected String withForUpdate(String sql, Query.ForUpdate forUpdateMode) {
+  protected String withForUpdate(String sql, Query.LockWait lockWait, Query.LockType lockType) {
     // NOWAIT and SKIP LOCKED currently not supported with H2
     return sql + " for update";
   }

ebean-api/src/main/java/io/ebean/config/dbplatform/hana/HanaPlatform.java

@@ -1,6 +1,7 @@
 package io.ebean.config.dbplatform.hana;
 
-import io.ebean.Query.ForUpdate;
+import io.ebean.Query;
+import io.ebean.Query.LockWait;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebean.config.PlatformConfig;
@@ -68,16 +69,16 @@ public class HanaPlatform extends DatabasePlatform {
   }
 
   @Override
-  protected String withForUpdate(String sql, ForUpdate forUpdateMode) {
-    switch (forUpdateMode) {
-      case BASE:
+  protected String withForUpdate(String sql, LockWait lockWait, Query.LockType lockType) {
+    switch (lockWait) {
+      case WAIT:
         return sql + " for update";
       case NOWAIT:
         return sql + " for update nowait";
       case SKIPLOCKED:
         return sql + " for update ignore locked";
       default:
-        throw new IllegalArgumentException("Unknown update mode: " + forUpdateMode.name());
+        throw new IllegalArgumentException("Unknown update mode: " + lockWait);
     }
   }
 

ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/BaseMySqlPlatform.java

@@ -60,7 +60,7 @@ public abstract class BaseMySqlPlatform extends DatabasePlatform {
   }
 
   @Override
-  protected String withForUpdate(String sql, Query.ForUpdate forUpdateMode) {
+  protected String withForUpdate(String sql, Query.LockWait lockWait, Query.LockType lockType) {
     // NOWAIT and SKIP LOCKED currently not supported with MySQL
     return sql + " for update";
   }

ebean-api/src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java

@@ -5,8 +5,6 @@ import io.ebean.config.dbplatform.DbEncryptFunction;
 
 /**
  * MySql aes_encrypt aes_decrypt based encryption support.
- *
- * @author rbygrave
  */
 public class MySqlDbEncrypt extends AbstractDbEncrypt {
 

ebean-api/src/main/java/io/ebean/config/dbplatform/nuodb/NuoDbPlatform.java

@@ -48,8 +48,8 @@ public class NuoDbPlatform extends DatabasePlatform {
   }
 
   @Override
-  protected String withForUpdate(String sql, Query.ForUpdate forUpdateMode) {
-    switch (forUpdateMode) {
+  protected String withForUpdate(String sql, Query.LockWait lockWait, Query.LockType lockType) {
+    switch (lockWait) {
       case NOWAIT:
         return sql + " for update nowait";
       case SKIPLOCKED:

ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java

@@ -13,6 +13,7 @@ public class Oracle11Platform extends OraclePlatform {
     this.platform = Platform.ORACLE11;
     this.columnAliasPrefix = "c";
     this.sqlLimiter = new OracleRownumSqlLimiter();
+    this.basicSqlLimiter = new OracleRownumBasicLimiter();
     dbIdentity.setIdType(IdType.SEQUENCE);
   }
 }

ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java

@@ -60,7 +60,6 @@ public class OracleDbEncrypt extends AbstractDbEncrypt {
    * @param decryptFunction the decrypt stored procedure
    */
   public OracleDbEncrypt(String encryptFunction, String decryptFunction) {
-
     this.varcharEncryptFunction = new OraVarcharFunction(encryptFunction, decryptFunction);
     this.dateEncryptFunction = new OraDateFunction(encryptFunction, decryptFunction);
   }

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

@@ -79,8 +79,8 @@ public class OraclePlatform extends DatabasePlatform {
   }
 
   @Override
-  protected String withForUpdate(String sql, Query.ForUpdate forUpdateMode) {
-    switch (forUpdateMode) {
+  protected String withForUpdate(String sql, Query.LockWait lockWait, Query.LockType lockType) {
+    switch (lockWait) {
       case SKIPLOCKED:
         return sql + " for update skip locked";
       case NOWAIT:

ebean-api/src/main/java/io/ebean/config/dbplatform/oracle/OracleRownumBasicLimiter.java

@@ -0,0 +1,35 @@
+package io.ebean.config.dbplatform.oracle;
+
+import io.ebean.config.dbplatform.BasicSqlLimiter;
+
+/**
+ * Row limiter for Oracle 9,10,11 using rownum.
+ */
+public class OracleRownumBasicLimiter implements BasicSqlLimiter {
+
+  @Override
+  public String limit(String dbSql, int firstRow, int maxRows) {
+    if (firstRow < 1 && maxRows < 1) {
+      return dbSql;
+    }
+    StringBuilder sb = new StringBuilder(60 + dbSql.length());
+    int lastRow = maxRows;
+    if (lastRow > 0) {
+      lastRow += firstRow;
+    }
+    sb.append("select * from (select ");
+    if (maxRows > 0) {
+      sb.append("/*+ FIRST_ROWS(").append(maxRows).append(") */ ");
+    }
+    sb.append("a.*, rownum rn_ from (");
+    sb.append(dbSql).append(") a ");
+    if (lastRow > 0) {
+      sb.append(" where rownum <= ").append(lastRow);
+    }
+    sb.append(") ");
+    if (firstRow > 0) {
+      sb.append(" where rn_ > ").append(firstRow);
+    }
+    return sb.toString();
+  }
+}

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

@@ -4,6 +4,7 @@ import io.ebean.BackgroundExecutor;
 import io.ebean.Query;
 import io.ebean.annotation.PartitionMode;
 import io.ebean.annotation.Platform;
+import io.ebean.config.PlatformConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbType;
@@ -25,6 +26,15 @@ import java.sql.Types;
  */
 public class PostgresPlatform extends DatabasePlatform {
 
+  private static final String SKIP_LOCKED = " skip locked";
+  private static final String NO_WAIT = " nowait";
+  private static final String FOR_UPDATE = " for update";
+  private static final String FOR_NO_KEY_UPDATE = " for no key update";
+  private static final String FOR_SHARE = " for share";
+  private static final String FOR_KEY_SHARE = " for key share";
+
+  private boolean forUpdateNoKey;
+
   public PostgresPlatform() {
     super();
     this.platform = Platform.POSTGRES;
@@ -81,6 +91,12 @@ public class PostgresPlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.LONGVARCHAR, dbTypeText);
   }
 
+  @Override
+  public void configure(PlatformConfig config) {
+    super.configure(config);
+    forUpdateNoKey = config.isForUpdateNoKey();
+  }
+
   @Override
   protected void addGeoTypes(int srid) {
     dbTypeMap.put(DbType.POINT, geoType("point", srid));
@@ -108,22 +124,32 @@ public class PostgresPlatform extends DatabasePlatform {
    */
   @Override
   public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) {
-
     return new PostgresSequenceIdGenerator(be, ds, seqName, sequenceBatchSize);
   }
 
   @Override
-  protected String withForUpdate(String sql, Query.ForUpdate forUpdateMode) {
-    switch (forUpdateMode) {
+  protected String withForUpdate(String sql, Query.LockWait lockWait, Query.LockType lockType) {
+    switch (lockWait) {
       case SKIPLOCKED:
-        return sql + " for update skip locked";
+        return sql + lock(lockType) + SKIP_LOCKED;
       case NOWAIT:
-        return sql + " for update nowait";
+        return sql + lock(lockType) + NO_WAIT;
       default:
-        return sql + " for update";
+        return sql + lock(lockType);
     }
   }
 
+  private String lock(Query.LockType lockType) {
+    switch (lockType) {
+      case UPDATE: return FOR_UPDATE;
+      case NO_KEY_UPDATE: return FOR_NO_KEY_UPDATE;
+      case SHARE: return FOR_SHARE;
+      case KEY_SHARE: return FOR_KEY_SHARE;
+      case DEFAULT: return forUpdateNoKey ? FOR_NO_KEY_UPDATE : FOR_UPDATE;
+    }
+    return FOR_UPDATE;
+  }
+
   @Override
   public boolean tablePartitionsExist(Connection connection, String table) throws SQLException {
     try (PreparedStatement statement = connection.prepareStatement("select count(*) from pg_inherits i WHERE  i.inhparent = ?::regclass")) {

ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerBasePlatform.java

@@ -25,6 +25,7 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
     this.platform = Platform.SQLSERVER;
     // disable persistBatchOnCascade mode for
     // SQL Server unless we are using sequences
+    this.dbEncrypt = new SqlServerDbEncrypt();
     this.persistBatchOnCascade = PersistBatch.NONE;
     this.idInExpandedForm = true;
     this.selectCountWithAlias = true;
@@ -105,8 +106,8 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
    * For update is part of the FROM clause on the base table for sql server.
    */
   @Override
-  public String fromForUpdate(Query.ForUpdate forUpdateMode) {
-    switch (forUpdateMode) {
+  public String fromForUpdate(Query.LockWait lockWait) {
+    switch (lockWait) {
       case SKIPLOCKED:
         return "with (updlock,readpast)";
       case NOWAIT:
@@ -117,7 +118,7 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
   }
 
   @Override
-  protected String withForUpdate(String sql, Query.ForUpdate forUpdateMode) {
+  protected String withForUpdate(String sql, Query.LockWait lockWait, Query.LockType lockType) {
     // for update are hints on from clause of base table
     return sql;
   }

ebean-api/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerDbEncrypt.java

@@ -0,0 +1,46 @@
+package io.ebean.config.dbplatform.sqlserver;
+
+import io.ebean.config.dbplatform.AbstractDbEncrypt;
+import io.ebean.config.dbplatform.DbEncryptFunction;
+
+/**
+ * SQL Server EncryptByPassPhrase DecryptByPassPhrase based encryption support.
+ */
+public class SqlServerDbEncrypt extends AbstractDbEncrypt {
+
+  public SqlServerDbEncrypt() {
+    this.varcharEncryptFunction = new VarcharFunction();
+    this.dateEncryptFunction = new DateFunction();
+  }
+
+  @Override
+  public boolean isBindEncryptDataFirst() {
+    return false;
+  }
+
+  private static class VarcharFunction implements DbEncryptFunction {
+
+    @Override
+    public String getDecryptSql(String columnWithTableAlias) {
+      return "convert(nvarchar,DecryptByPassPhrase(?," + columnWithTableAlias + "))";
+    }
+
+    @Override
+    public String getEncryptBindSql() {
+      return "EncryptByPassPhrase(?,?)";
+    }
+  }
+
+  private static class DateFunction implements DbEncryptFunction {
+
+    @Override
+    public String getDecryptSql(String columnWithTableAlias) {
+      return "cast(convert(nvarchar,DecryptByPassPhrase(?," + columnWithTableAlias + ")) as date)";
+    }
+
+    @Override
+    public String getEncryptBindSql() {
+      return "EncryptByPassPhrase(?,format(?,'yyyy-MM-dd'))";
+    }
+  }
+}

ebean-api/src/main/java/io/ebean/event/ShutdownManager.java

@@ -23,7 +23,7 @@ public final class ShutdownManager {
 
   private static final Logger logger = LoggerFactory.getLogger(ShutdownManager.class);
 
-  private static final ReentrantLock lock = new ReentrantLock(false);
+  private static final ReentrantLock lock = new ReentrantLock();
 
   private static final List<Database> databases = new ArrayList<>();
 

ebean-api/src/main/java/io/ebean/meta/QueryPlanRequest.java

@@ -41,6 +41,9 @@ public class QueryPlanRequest {
 
   /**
    * Set the maximum number of plans to capture.
+   * <p>
+   * Use this to limit how much query plan capturing is done as query
+   * plan capture is actual database load.
    */
   public void setMaxCount(int maxCount) {
     this.maxCount = maxCount;
@@ -58,7 +61,9 @@ public class QueryPlanRequest {
   /**
    * Set the maximum amount of time we want to use to capture plans.
    * <p>
-   * Query plan collection will stop once this time is exceeded.
+   * Query plan collection will stop once this time is exceeded. We use
+   * this to ensure the query plan capture does not use excessive amount
+   * of time - put too much load on the database.
    */
   public void setMaxTimeMillis(long maxTimeMillis) {
     this.maxTimeMillis = maxTimeMillis;

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

@@ -2,11 +2,11 @@ package io.ebean.plugin;
 
 import io.ebean.Query;
 import io.ebean.config.dbplatform.IdType;
+import io.ebean.docstore.DocMapping;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanPersistController;
 import io.ebean.event.BeanPersistListener;
 import io.ebean.event.BeanQueryAdapter;
-import io.ebean.docstore.DocMapping;
 
 import javax.annotation.Nonnull;
 import java.util.Collection;

ebean-api/src/main/java/io/ebean/plugin/SpiServer.java

@@ -1,18 +1,17 @@
 package io.ebean.plugin;
 
-import io.ebean.EbeanServer;
+import io.ebean.Database;
 import io.ebean.bean.BeanLoader;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.dbplatform.DatabasePlatform;
 
-import javax.sql.DataSource;
 import java.util.List;
 
 /**
  * Extensions to Database API made available to plugins.
  */
-public interface SpiServer extends EbeanServer {
+public interface SpiServer extends Database {
 
   /**
    * Return the DatabaseConfig.
@@ -44,16 +43,6 @@ public interface SpiServer extends EbeanServer {
    */
   BeanType<?> getBeanTypeForQueueId(String queueId);
 
-  /**
-   * Return the associated DataSource for this Database instance.
-   */
-  DataSource getDataSource();
-
-  /**
-   * Return the associated read only DataSource for this Database instance (can be null).
-   */
-  DataSource getReadOnlyDataSource();
-
   /**
    * Return a BeanLoader.
    */

ebean-api/src/main/java/io/ebean/text/json/JsonBeanReader.java

@@ -1,7 +1,7 @@
 package io.ebean.text.json;
 
-import io.ebean.bean.PersistenceContext;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.bean.PersistenceContext;
 
 /**
  * Provides a JSON reader that can hold a persistence context and load context while reading JSON.

ebean-api/src/main/java/io/ebean/text/json/JsonContext.java

@@ -1,9 +1,9 @@
 package io.ebean.text.json;
 
-import io.ebean.FetchPath;
-import io.ebean.plugin.BeanType;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import io.ebean.FetchPath;
+import io.ebean.plugin.BeanType;
 
 import java.io.IOException;
 import java.io.Reader;

ebean-autotune/pom.xml

@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-<!--  <parent>-->
-<!--    <artifactId>ebean-parent</artifactId>-->
-<!--    <groupId>io.ebean</groupId>-->
-<!--    <version>12.5.2-SNAPSHOT</version>-->
-<!--  </parent>-->
   <parent>
-    <groupId>org.avaje</groupId>
-    <artifactId>java8-oss</artifactId>
-    <version>2.2</version>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>12.9.2</version>
   </parent>
+<!--  <parent>-->
+<!--    <groupId>org.avaje</groupId>-->
+<!--    <artifactId>java8-oss</artifactId>-->
+<!--    <version>2.2</version>-->
+<!--  </parent>-->
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.9.2</tag>
   </scm>
 
+  <name>ebean autotune</name>
+  <description>ebean automatic query tuning module</description>
   <artifactId>ebean-autotune</artifactId>
-  <groupId>io.ebean</groupId>
-  <version>12.5.2-SNAPSHOT</version>
 
   <dependencies>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.1</version>
+      <version>12.9.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -38,6 +38,13 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.avaje.composite</groupId>
       <artifactId>junit</artifactId>
@@ -52,12 +59,12 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.18</version>
+        <version>2.19</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
             <!-- other tiles ... -->
-            <tile>io.ebean.tile:enhancement:12.5.0</tile>
+            <tile>io.ebean.tile:enhancement:12.6.0</tile>
           </tiles>
         </configuration>
       </plugin>

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java

@@ -23,7 +23,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
 
   private static final Logger logger = LoggerFactory.getLogger(DefaultAutoTuneService.class);
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   private final SpiEbeanServer server;
 
@@ -77,7 +77,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
       loadTuningFile();
       if (isRuntimeTuningUpdates()) {
         // periodically gather and update query tuning
-        server.getBackgroundExecutor().executePeriodically(new ProfilingUpdate(), profilingUpdateFrequency, TimeUnit.SECONDS);
+        server.getBackgroundExecutor().scheduleWithFixedDelay(new ProfilingUpdate(), profilingUpdateFrequency, profilingUpdateFrequency, TimeUnit.SECONDS);
       }
     }
   }

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java

@@ -18,7 +18,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public class ProfileManager implements ProfilingListener {
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   private final boolean queryTuningAddVersion;
 
@@ -46,7 +46,6 @@ public class ProfileManager implements ProfilingListener {
 
   @Override
   public boolean isProfileRequest(ObjectGraphNode origin, SpiQuery<?> query) {
-
     ProfileOrigin profileOrigin = profileMap.get(origin.getOriginQueryPoint().getKey());
     if (profileOrigin == null) {
       profileMap.put(origin.getOriginQueryPoint().getKey(), createProfileOrigin(origin, query));
@@ -61,12 +60,11 @@ public class ProfileManager implements ProfilingListener {
    * <p>
    * For new profiling entries it is useful to compare the profiling against the current
    * query detail that is specified in the code (as the query might already be manually optimised).
-   * </p>
    */
   private ProfileOrigin createProfileOrigin(ObjectGraphNode origin, SpiQuery<?> query) {
     ProfileOrigin profileOrigin = new ProfileOrigin(origin.getOriginQueryPoint(), queryTuningAddVersion, profilingBase, profilingRate);
     // set the current query detail (fetch group) so that we can compare against profiling for new entries
-    profileOrigin.setOriginalQuery(query.getDetail().toString());
+    profileOrigin.setOriginalQuery(query.getDetail().asString());
     return profileOrigin;
   }
 
@@ -77,7 +75,6 @@ public class ProfileManager implements ProfilingListener {
    */
   @Override
   public void collectQueryInfo(ObjectGraphNode node, long beans, long micros) {
-
     if (node != null) {
       ObjectGraphOrigin origin = node.getOriginQueryPoint();
       if (origin != null) {
@@ -92,11 +89,9 @@ public class ProfileManager implements ProfilingListener {
    * <p>
    * This is sent to use from a EntityBeanIntercept when the finalise method
    * is called on the bean.
-   * </p>
    */
   @Override
   public void collectNodeUsage(NodeUsageCollector usageCollector) {
-
     ProfileOrigin profileOrigin = getProfileOrigin(usageCollector.getNode().getOriginQueryPoint());
     profileOrigin.collectUsageInfo(usageCollector);
   }
@@ -114,16 +109,13 @@ public class ProfileManager implements ProfilingListener {
    * Collect all the profiling information.
    */
   public AutoTuneCollection profilingCollection(boolean reset) {
-
     AutoTuneCollection req = new AutoTuneCollection();
-
     for (ProfileOrigin origin : profileMap.values()) {
       BeanDescriptor<?> desc = server.getBeanDescriptorById(origin.getOrigin().getBeanType());
       if (desc != null) {
         origin.profilingCollection(desc, req, reset);
       }
     }
-
     return req;
   }
 

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOrigin.java

@@ -16,7 +16,7 @@ import java.util.concurrent.locks.ReentrantLock;
 
 public class ProfileOrigin {
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   private static final long RESET_COUNT = -1000000000L;
 

ebean-autotune/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java

@@ -21,7 +21,7 @@ public class ProfileOriginNodeUsage {
 
   private static final Logger logger = LoggerFactory.getLogger(ProfileOriginNodeUsage.class);
 
-  private final ReentrantLock lock = new ReentrantLock(false);
+  private final ReentrantLock lock = new ReentrantLock();
 
   private final String path;
 

ebean-autotune/src/test/java/io/ebeaninternal/server/autotune/service/ProfileOriginTest.java

@@ -11,12 +11,9 @@ import org.tests.model.basic.Order;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-//import org.tests.model.basic.ResetBasicData;
-
 public class ProfileOriginTest extends BaseTestCase {
 
-
-  private BeanDescriptor<Order> desc = getBeanDescriptor(Order.class);
+  private final BeanDescriptor<Order> desc = getBeanDescriptor(Order.class);
 
   @Test
   public void buildDetail() {

ebean-bom/pom.xml

@@ -4,15 +4,22 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 
+  <name>ebean bom</name>
+  <description>ebean bill of materials pom</description>
   <artifactId>ebean-bom</artifactId>
   <packaging>pom</packaging>
 
   <properties>
-    <ebean-agent.version>12.5.0</ebean-agent.version>
-    <ebean-maven-plugin.version>12.5.0</ebean-maven-plugin.version>
+    <ebean-ddl-runner.version>1.0</ebean-ddl-runner.version>
+    <ebean-migration-auto.version>1.0</ebean-migration-auto.version>
+    <ebean-migration.version>12.4.0</ebean-migration.version>
+    <ebean-test-docker.version>4.1</ebean-test-docker.version>
+    <ebean-datasource.version>7.0</ebean-datasource.version>
+    <ebean-agent.version>12.9.0</ebean-agent.version>
+    <ebean-maven-plugin.version>12.9.1</ebean-maven-plugin.version>
   </properties>
 
   <dependencyManagement>
@@ -21,6 +28,36 @@
 
       <!-- dependencies external to this ebean.git build -->
 
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-ddl-runner</artifactId>
+        <version>${ebean-ddl-runner.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-migration-auto</artifactId>
+        <version>${ebean-migration-auto.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-migration</artifactId>
+        <version>${ebean-migration.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-datasource-api</artifactId>
+        <version>${ebean-datasource.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-datasource</artifactId>
+        <version>${ebean-datasource.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-agent</artifactId>
@@ -33,77 +70,101 @@
         <version>${ebean-maven-plugin.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-test-docker</artifactId>
+        <version>${ebean-test-docker.version}</version>
+      </dependency>
+
       <!-- modules -->
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>${project.version}</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>${project.version}</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>${project.version}</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
-        <artifactId>ebean-ddlgen</artifactId>
-        <version>${project.version}</version>
+        <artifactId>ebean-core-type</artifactId>
+        <version>12.9.2</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-ddl-generator</artifactId>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>${project.version}</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>${project.version}</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>${project.version}</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>${project.version}</version>
+        <version>12.9.2</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>${project.version}</version>
+        <version>12.9.2</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>${project.version}</version>
+        <version>12.9.2</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>${project.version}</version>
+        <version>12.9.2</version>
         <scope>test</scope>
       </dependency>
 
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-postgis</artifactId>
+        <version>12.9.2</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.ebean</groupId>
+        <artifactId>ebean-redis</artifactId>
+        <version>12.9.2</version>
+      </dependency>
+
     </dependencies>
 
   </dependencyManagement>

ebean-core-type/pom.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>12.9.2</version>
+  </parent>
+
+  <artifactId>ebean-core-type</artifactId>
+  <name>ebean core type</name>
+  <description>ebean scalar types api</description>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-api</artifactId>
+      <version>12.9.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>${jackson.version}</version>
+      <optional>true</optional>
+    </dependency>
+
+  </dependencies>
+
+</project>

ebean-core-type/src/main/java/io/ebean/core/type/DataBinder.java

@@ -0,0 +1,166 @@
+package io.ebean.core.type;
+
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.List;
+
+/**
+ * Data binder for ScalarTypes generally to an underlying PreparedStatement.
+ */
+public interface DataBinder {
+
+  /**
+   * Add something to the binding log.
+   */
+  StringBuilder append(Object entry);
+
+  /**
+   * Return the binding log.
+   */
+  StringBuilder log();
+
+  /**
+   * Close the underlying prepared statement.
+   */
+  void close() throws SQLException;
+
+  /**
+   * Return the current position. Effectively column binding position.
+   */
+  int currentPos();
+
+  /**
+   * Return the next position.
+   */
+  int nextPos();
+
+  /**
+   * Decrement the position.
+   */
+  void decrementPos();
+
+  /**
+   * Execute as a dml statement.
+   */
+  int executeUpdate() throws SQLException;
+
+  /**
+   * Return the underlying PreparedStatement.
+   */
+  PreparedStatement getPstmt();
+
+  /**
+   * Return any inputStreams that have been bound (and should be closed).
+   * This is used for batched statement execution only.
+   */
+  List<InputStream> getInputStreams();
+
+  /**
+   * Bind an object.
+   */
+  void setObject(Object value) throws SQLException;
+
+  /**
+   * Bind an object with given sql type.
+   */
+  void setObject(Object value, int sqlType) throws SQLException;
+
+  /**
+   * Bind null.
+   */
+  void setNull(int jdbcType) throws SQLException;
+
+  /**
+   * Bind a string value.
+   */
+  void setString(String value) throws SQLException;
+
+  /**
+   * Bind a int value.
+   */
+  void setInt(int value) throws SQLException;
+
+  /**
+   * Bind a long value.
+   */
+  void setLong(long value) throws SQLException;
+
+  /**
+   * Bind a short value.
+   */
+  void setShort(short value) throws SQLException;
+
+  /**
+   * Bind a float value.
+   */
+  void setFloat(float value) throws SQLException;
+
+  /**
+   * Bind a double value.
+   */
+  void setDouble(double value) throws SQLException;
+
+  /**
+   * Bind a BigDecimal value.
+   */
+  void setBigDecimal(BigDecimal value) throws SQLException;
+
+  /**
+   * Bind a date value.
+   */
+  void setDate(java.sql.Date value) throws SQLException;
+
+  /**
+   * Bind a timestamp value.
+   */
+  void setTimestamp(Timestamp value) throws SQLException;
+
+  /**
+   * Bind a time value.
+   */
+  void setTime(Time value) throws SQLException;
+
+  /**
+   * Bind a boolean value.
+   */
+  void setBoolean(boolean value) throws SQLException;
+
+  /**
+   * Bind a byte array value.
+   */
+  void setBytes(byte[] value) throws SQLException;
+
+  /**
+   * Bind a byte value.
+   */
+  void setByte(byte value) throws SQLException;
+
+  /**
+   * Bind a char value.
+   */
+  void setChar(char value) throws SQLException;
+
+  /**
+   * Bind a InputStream value.
+   */
+  void setBinaryStream(InputStream inputStream, long length) throws SQLException;
+
+  /**
+   * Bind a byte array value.
+   */
+  void setBlob(byte[] bytes) throws SQLException;
+
+  /**
+   * Bind a string clob value.
+   */
+  void setClob(String content) throws SQLException;
+
+  /**
+   * Bind an array value.
+   */
+  void setArray(String arrayType, Object[] elements) throws SQLException;
+}

ebean-core-type/src/main/java/io/ebean/core/type/DataReader.java

@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.core.type;
 
 import java.io.InputStream;
 import java.math.BigDecimal;
@@ -11,8 +11,6 @@ public interface DataReader {
 
   boolean next() throws SQLException;
 
-  void resetColumnPosition();
-
   void incrementPos(int increment);
 
   byte[] getBinaryBytes() throws SQLException;

ebean-core-type/src/main/java/io/ebean/core/type/DocPropertyType.java

@@ -1,4 +1,4 @@
-package io.ebeanservice.docstore.api.mapping;
+package io.ebean.core.type;
 
 /**
  * Types as defined for document store property types.

ebean-core-type/src/main/java/io/ebean/core/type/ExtraTypeFactory.java

@@ -1,7 +1,6 @@
-package io.ebeaninternal.api;
+package io.ebean.core.type;
 
 import io.ebean.config.DatabaseConfig;
-import io.ebeaninternal.server.type.ScalarType;
 
 import java.util.List;
 

ebean-core-type/src/main/java/io/ebean/core/type/ScalarDataReader.java

@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.core.type;
 
 import java.sql.SQLException;
 
@@ -10,6 +10,6 @@ public interface ScalarDataReader<T> {
   /**
    * Read and return the appropriate value from the dataReader.
    */
-  T read(DataReader dataReader) throws SQLException;
+  T read(DataReader reader) throws SQLException;
 
 }

ebean-core-type/src/main/java/io/ebean/core/type/ScalarType.java

@@ -1,10 +1,9 @@
-package io.ebeaninternal.server.type;
+package io.ebean.core.type;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.text.StringFormatter;
 import io.ebean.text.StringParser;
-import io.ebeanservice.docstore.api.mapping.DocPropertyType;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -112,7 +111,7 @@ public interface ScalarType<T> extends StringParser, StringFormatter, ScalarData
    * JDBC type.
    * </p>
    */
-  void bind(DataBind bind, T value) throws SQLException;
+  void bind(DataBinder binder, T value) throws SQLException;
 
   /**
    * Convert the value as necessary to the JDBC type.

ebean-core/pom.xml

@@ -3,25 +3,21 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.5.2-SNAPSHOT</version>
+    <version>12.9.2</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
   <packaging>jar</packaging>
 
-  <name>ebean-core</name>
-  <url>http://ebean-orm.github.io/</url>
+  <name>ebean core</name>
+  <description>ebean core module</description>
+  <url>https://ebean.io/</url>
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-parent-12.9.2</tag>
   </scm>
 
-  <properties>
-    <jackson-core.version>2.11.3</jackson-core.version>
-    <jackson-databind.version>2.11.3</jackson-databind.version>
-  </properties>
-
   <profiles>
     <profile>
       <!-- Note: to use this profile, you need to download manually the db2jcc4 driver.
@@ -47,14 +43,40 @@
   </profiles>
   <dependencies>
 
-    <!-- keep testing in core using ebean-ddlgen -->
     <dependency>
       <groupId>io.ebean</groupId>
-      <artifactId>ebean-ddlgen</artifactId>
-      <version>12.5.0</version>
+      <artifactId>ebean-ddl-runner</artifactId>
+      <version>1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>classpath-scanner</artifactId>
+      <version>4.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration-auto</artifactId>
+      <version>1.0</version>
+    </dependency>
+
+    <!-- keep testing in core using ebean-ddl-generator & ebean-migration -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-migration</artifactId>
+      <version>12.4.0</version>
       <scope>test</scope>
     </dependency>
-    <!-- test scope for supporting ebean-ddlgen -->
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-ddl-generator</artifactId>
+      <version>12.9.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- test scope for supporting ebean-ddl-generator -->
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
@@ -65,13 +87,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>${project.version}</version>
+      <version>12.9.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-core-type</artifactId>
+      <version>12.9.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>${project.version}</version>
+      <version>12.9.2</version>
     </dependency>
 
     <dependency>
@@ -91,6 +119,15 @@
       <scope>provided</scope>
     </dependency>
 
+    <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
+         and not require a separate module for it -->
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>1.4.199</version>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>javax.transaction</groupId>
       <artifactId>jta</artifactId>
@@ -105,6 +142,12 @@
       <version>1.1.0.Final</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+      <version>3.0.0</version>
+      <optional>true</optional>
+    </dependency>
 
     <dependency>
       <groupId>joda-time</groupId>
@@ -124,14 +167,14 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${jackson-core.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson-databind.version}</version>
+      <version>${jackson.version}</version>
       <optional>true</optional>
     </dependency>
 
@@ -145,6 +188,13 @@
 
     <!-- Test scope -->
 
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>${ebean-datasource.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>com.nuodb.jdbc</groupId>
       <artifactId>nuodb-jdbc</artifactId>
@@ -160,9 +210,9 @@
     </dependency>
 
     <dependency>
-      <groupId>io.ebean.test</groupId>
+      <groupId>io.ebean</groupId>
       <artifactId>ebean-test-docker</artifactId>
-      <version>3.1.5</version>
+      <version>4.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -173,15 +223,6 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
-         and not require a separate module for it -->
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>1.4.199</version>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.xerial</groupId>
       <artifactId>sqlite-jdbc</artifactId>
@@ -241,7 +282,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.5</version>
+      <version>2.7</version>
       <scope>test</scope>
     </dependency>
 
@@ -261,7 +302,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.5.0</version>
+        <version>12.9.1</version>
         <executions>
           <execution>
             <id>test</id>

ebean-core/src/main/java/io/ebeaninternal/api/BindParams.java

@@ -155,7 +155,6 @@ public class BindParams implements Serializable {
    * Set an In Out parameter using position.
    */
   public void setParameter(int position, Object value, int outType) {
-
     Param p = getParam(position);
     p.setInValue(value);
     p.setOutType(outType);
@@ -178,8 +177,8 @@ public class BindParams implements Serializable {
    * Using position set the In value of a parameter. Note that for nulls you
    * must use setNullParameter.
    */
+  @SuppressWarnings("rawtypes")
   public void setParameter(int position, Object value) {
-
     Param p = getParam(position);
     if (value instanceof Collection) {
       // use of postgres ANY with positioned parameter
@@ -214,7 +213,6 @@ public class BindParams implements Serializable {
    * Set a named In Out parameter.
    */
   public void setParameter(String name, Object value, int outType) {
-
     Param p = getParam(name);
     p.setInValue(value);
     p.setOutType(outType);
@@ -232,7 +230,6 @@ public class BindParams implements Serializable {
    * Set a named In parameter that is not null.
    */
   public Param setParameter(String name, Object value) {
-
     Param p = getParam(name);
     p.setInValue(value);
     return p;
@@ -299,7 +296,6 @@ public class BindParams implements Serializable {
    * Return true if the bind hash and count has not changed.
    */
   public boolean isSameBindHash() {
-
     if (bindHash == null) {
       bindHash = calcQueryPlanHash();
       return false;
@@ -330,10 +326,6 @@ public class BindParams implements Serializable {
 
     private final StringBuilder preparedSql;
 
-    public OrderedList() {
-      this(new ArrayList<>());
-    }
-
     public OrderedList(List<Param> paramList) {
       this.paramList = paramList;
       this.preparedSql = new StringBuilder();