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

Add overloaded method taking Collection of id values.

.travis.yml

@@ -34,7 +34,7 @@ env:
 install: true
 
 script:
-  - mvn clean test
+  - mvn -T 1C clean test
 
 after_failure:
   - ./.travis/print_surefire_reports

ebean-api/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.12.0</version>
   </parent>
 
   <name>ebean api</name>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-config</artifactId>
-      <version>1.3</version>
+      <version>1.5</version>
     </dependency>
 
     <!--
@@ -37,26 +37,26 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsr305</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>persistence-api</artifactId>
-      <version>2.2.4</version>
+      <version>2.2.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>7.2</version>
+      <version>7.3</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-types</artifactId>
-      <version>2.1</version>
+      <version>2.2</version>
     </dependency>
 
     <dependency>
@@ -104,21 +104,28 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>junit</artifactId>
+      <version>1.0</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.5</version>
+        <groupId>io.repaint.maven</groupId>
+        <artifactId>tiles-maven-plugin</artifactId>
+        <version>2.24</version>
+        <extensions>true</extensions>
         <configuration>
-          <archive>
-            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
+          <tiles>
+            <tile>io.avaje.tile:moditech-module:1.0</tile>
+          </tiles>
         </configuration>
       </plugin>
     </plugins>
   </build>
-
 </project>

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

@@ -79,11 +79,11 @@ public abstract class BeanFinder<I,T> {
   /**
    * Creates an entity reference for this ID.
    * <p>
-   * Equivalent to {@link Database#getReference(Class, Object)}
+   * Equivalent to {@link Database#reference(Class, Object)}
    */
   @Nonnull
   public T ref(I id) {
-    return db().getReference(type, id);
+    return db().reference(type, id);
   }
 
   /**

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

@@ -57,7 +57,7 @@ public interface BeanState {
    *
    *   // set loaded state on the email property to false so that
    *   // the email property is not included in a stateless update
-   *   DB.getBeanState(user).setPropertyLoaded("email", false);
+   *   DB.beanState(user).setPropertyLoaded("email", false);
    *
    *   user.update();
    *
@@ -72,25 +72,47 @@ public interface BeanState {
    * bean.
    * <p>
    * Accessing another property will cause lazy loading to occur.
-   * </p>
    */
-  Set<String> getLoadedProps();
+  Set<String> loadedProps();
+
+  /**
+   * Deprecated migrate to loadedProps().
+   */
+  @Deprecated
+  default Set<String> getLoadedProps() {
+    return loadedProps();
+  }
 
   /**
    * Return the set of changed properties.
    */
-  Set<String> getChangedProps();
+  Set<String> changedProps();
+
+  /**
+   * Deprecated migrate to changedProps().
+   */
+  @Deprecated
+  default Set<String> getChangedProps() {
+    return changedProps();
+  }
 
   /**
    * Return a map of the updated properties and their new and old values.
    */
-  Map<String, ValuePair> getDirtyValues();
+  Map<String, ValuePair> dirtyValues();
+
+  /**
+   * Deprecated migrate to dirtyValues().
+   */
+  @Deprecated
+  default Map<String, ValuePair> getDirtyValues() {
+    return dirtyValues();
+  }
 
   /**
    * Return true if the bean is readOnly.
    * <p>
    * If a setter is called on a readOnly bean it will throw an exception.
-   * </p>
    */
   boolean isReadOnly();
 
@@ -114,8 +136,29 @@ public interface BeanState {
   void resetForInsert();
 
   /**
-   * Returns a map with load erros.
+   * Returns a map with load errors.
    */
   @Nullable
-  Map<String, Exception> getLoadErrors();
+  Map<String, Exception> loadErrors();
+
+  /**
+   * Deprecated migrate to loadErrors().
+   */
+  @Deprecated
+  default Map<String, Exception> getLoadErrors() {
+    return loadErrors();
+  }
+
+  /**
+   * Return the sort order value for an order column.
+   */
+  int sortOrder();
+
+  /**
+   * Deprecated migrate to sortOrder().
+   */
+  @Deprecated
+  default int getSortOrder() {
+    return sortOrder();
+  }
 }

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

@@ -126,8 +126,16 @@ public final class DB {
    * an expression that uses OR like Expression e = Expr.or(..., ...);
    * </p>
    */
+  public static ExpressionFactory expressionFactory() {
+    return getDefault().expressionFactory();
+  }
+
+  /**
+   * Deprecated migrate to expressionFactory().
+   */
+  @Deprecated
   public static ExpressionFactory getExpressionFactory() {
-    return getDefault().getExpressionFactory();
+    return expressionFactory();
   }
 
   /**
@@ -650,8 +658,16 @@ public final class DB {
    * @param beanType the type of entity bean
    * @param id       the id value
    */
+  public static <T> T reference(Class<T> beanType, Object id) {
+    return getDefault().reference(beanType, id);
+  }
+
+  /**
+   * Deprecated migrate to beanId().
+   */
+  @Deprecated
   public static <T> T getReference(Class<T> beanType, Object id) {
-    return getDefault().getReference(beanType, id);
+    return reference(beanType, id);
   }
 
   /**
@@ -660,14 +676,12 @@ public final class DB {
    * <ul>
    * <li>asc - ascending order (which is the default)</li>
    * <li>desc - Descending order</li>
-   * <li>nullsHigh - Treat null values as high/large values (which is the
-   * default)</li>
+   * <li>nullsHigh - Treat null values as high/large values (which is the default)</li>
    * <li>nullsLow- Treat null values as low/very small values</li>
    * </ul>
    * <p>
    * If you leave off any keywords the defaults are ascending order and treating
    * nulls as high values.
-   * </p>
    * <p>
    * Note that the sorting uses a Comparator and Collections.sort(); and does
    * not invoke a DB query.
@@ -1231,30 +1245,77 @@ public final class DB {
    * This will return null if the bean is not an enhanced entity bean.
    * </p>
    */
+  public static BeanState beanState(Object bean) {
+    return getDefault().beanState(bean);
+  }
+
+  /**
+   * Deprecated migrate to beanState().
+   */
+  @Deprecated
   public static BeanState getBeanState(Object bean) {
-    return getDefault().getBeanState(bean);
+    return beanState(bean);
   }
 
   /**
    * Return the value of the Id property for a given bean.
    */
+  public static Object beanId(Object bean) {
+    return getDefault().beanId(bean);
+  }
+
+  /**
+   * Deprecated migrate to beanId().
+   */
+  @Deprecated
   public static Object getBeanId(Object bean) {
-    return getDefault().getBeanId(bean);
+    return beanId(bean);
+  }
+
+  /**
+   * Load and lock the bean using {@code select for update}.
+   * <p>
+   * This should be executed inside a transaction.
+   * <p>
+   * The bean needs to have an ID property set and can be a reference bean (only has ID)
+   * or partially or fully populated bean. This will load all the properties of the bean
+   * from the database using {@code select for update}.
+   *
+   * @param bean The entity bean that we wish to obtain a database lock on.
+   */
+  public static void lock(Object bean) {
+    getDefault().lock(bean);
+  }
+
+  /**
+   * Deprecated migrate to cacheManager().
+   */
+  @Deprecated
+  public static ServerCacheManager getServerCacheManager() {
+    return getDefault().cacheManager();
   }
 
   /**
    * Return the manager of the level 2 cache ("L2" cache).
    */
-  public static ServerCacheManager getServerCacheManager() {
-    return getDefault().getServerCacheManager();
+  public static ServerCacheManager cacheManager() {
+    return getDefault().cacheManager();
   }
 
   /**
    * Return the BackgroundExecutor service for asynchronous processing of
    * queries.
    */
+  public static BackgroundExecutor backgroundExecutor() {
+    return getDefault().backgroundExecutor();
+  }
+
+  /**
+   * Deprecated migrate to backgroundExecutor().
+   */
+  @Deprecated
   public static BackgroundExecutor getBackgroundExecutor() {
-    return getDefault().getBackgroundExecutor();
+    return backgroundExecutor();
   }
 
   /**

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

@@ -120,34 +120,82 @@ public interface Database {
   /**
    * Return AutoTune which is used to control the AutoTune service at runtime.
    */
-  AutoTune getAutoTune();
+  AutoTune autoTune();
+
+  /**
+   * Deprecated migrate to autoTune().
+   */
+  @Deprecated
+  default AutoTune getAutoTune() {
+    return autoTune();
+  }
 
   /**
    * Return the associated DataSource for this Database instance.
    */
-  DataSource getDataSource();
+  DataSource dataSource();
+
+  /**
+   * Deprecated migrate to dataSource().
+   */
+  @Deprecated
+  default DataSource getDataSource() {
+    return dataSource();
+  }
 
   /**
    * Return the associated read only DataSource for this Database instance (can be null).
    */
-  DataSource getReadOnlyDataSource();
+  DataSource readOnlyDataSource();
+
+  /**
+   * Deprecated migrate to readOnlyDataSource().
+   */
+  @Deprecated
+  default DataSource getReadOnlyDataSource() {
+    return readOnlyDataSource();
+  }
 
   /**
    * Return the name. This is used with {@link DB#byName(String)} to get a
    * Database that was registered with the DB singleton.
    */
-  String getName();
+  String name();
+
+  /**
+   * Deprecated migrate to name().
+   */
+  @Deprecated
+  default String getName() {
+    return name();
+  }
 
   /**
    * Return the ExpressionFactory for this database.
    */
-  ExpressionFactory getExpressionFactory();
+  ExpressionFactory expressionFactory();
+
+  /**
+   * Deprecated migrate to expressionFactory().
+   */
+  @Deprecated
+  default ExpressionFactory getExpressionFactory() {
+    return expressionFactory();
+  }
 
   /**
    * Return the MetaInfoManager which is used to get meta data from the Database
    * such as query execution statistics.
    */
-  MetaInfoManager getMetaInfoManager();
+  MetaInfoManager metaInfo();
+
+  /**
+   * Deprecated migrate to metaInfo().
+   */
+  @Deprecated
+  default MetaInfoManager getMetaInfoManager() {
+    return metaInfo();
+  }
 
   /**
    * Return the platform used for this database instance.
@@ -166,12 +214,28 @@ public interface Database {
    *
    * @return platform for this database instance
    */
-  Platform getPlatform();
+  Platform platform();
+
+  /**
+   * Deprecated migrate to platform().
+   */
+  @Deprecated
+  default Platform getPlatform() {
+    return platform();
+  }
 
   /**
    * Return the extended API intended for use by plugins.
    */
-  SpiServer getPluginApi();
+  SpiServer pluginApi();
+
+  /**
+   * Deprecated migrate to pluginApi().
+   */
+  @Deprecated
+  default SpiServer getPluginApi() {
+    return pluginApi();
+  }
 
   /**
    * Return the BeanState for a given entity bean.
@@ -179,12 +243,28 @@ public interface Database {
    * This will return null if the bean is not an enhanced entity bean.
    * </p>
    */
-  BeanState getBeanState(Object bean);
+  BeanState beanState(Object bean);
+
+  /**
+   * Deprecated migrate to beanState().
+   */
+  @Deprecated
+  default BeanState getBeanState(Object bean) {
+    return beanState(bean);
+  }
 
   /**
    * Return the value of the Id property for a given bean.
    */
-  Object getBeanId(Object bean);
+  Object beanId(Object bean);
+
+  /**
+   * Deprecated migrate to beanId().
+   */
+  @Deprecated
+  default Object getBeanId(Object bean) {
+    return beanId(bean);
+  }
 
   /**
    * Set the Id value onto the bean converting the type of the id value if necessary.
@@ -196,7 +276,15 @@ public interface Database {
    * @param bean The entity bean to set the id value on.
    * @param id   The id value to set.
    */
-  Object setBeanId(Object bean, Object id);
+  Object beanId(Object bean, Object id);
+
+  /**
+   * Deprecated migrate to beanId().
+   */
+  @Deprecated
+  default Object setBeanId(Object bean, Object id) {
+    return beanId(bean, id);
+  }
 
   /**
    * Return a map of the differences between two objects of the same type.
@@ -862,7 +950,15 @@ public interface Database {
    * @param id       the id value
    */
   @Nonnull
-  <T> T getReference(Class<T> beanType, Object id);
+  <T> T reference(Class<T> beanType, Object id);
+
+  /**
+   * Deprecated migrate to reference().
+   */
+  @Deprecated
+  default <T> T getReference(Class<T> beanType, Object id) {
+    return reference(beanType, id);
+  }
 
   /**
    * Return the extended API for Database.
@@ -1431,13 +1527,29 @@ public interface Database {
   /**
    * Return the manager of the server cache ("L2" cache).
    */
-  ServerCacheManager getServerCacheManager();
+  ServerCacheManager cacheManager();
+
+  /**
+   * Deprecated migrate to cacheManager().
+   */
+  @Deprecated
+  default ServerCacheManager getServerCacheManager() {
+    return cacheManager();
+  }
 
   /**
    * Return the BackgroundExecutor service for asynchronous processing of
    * queries.
    */
-  BackgroundExecutor getBackgroundExecutor();
+  BackgroundExecutor backgroundExecutor();
+
+  /**
+   * Deprecated migrate to backgroundExecutor().
+   */
+  @Deprecated
+  default BackgroundExecutor getBackgroundExecutor() {
+    return backgroundExecutor();
+  }
 
   /**
    * Return the JsonContext for reading/writing JSON.
@@ -1602,6 +1714,20 @@ public interface Database {
    */
   <T> Set<String> validateQuery(Query<T> query);
 
+  /**
+   * Load and lock the bean using {@code select for update}.
+   * <p>
+   * This should be executed inside a transaction and results in the bean being loaded or
+   * refreshed from the database and a database row lock held via {@code select for update}.
+   * <p>
+   * The bean needs to have an ID property set and can be a reference bean (only has ID)
+   * or partially or fully populated bean. This will load all the properties of the bean
+   * from the database using {@code select for update} obtaining a database row lock (using WAIT).
+   *
+   * @param bean The entity bean that we wish to obtain a database lock on.
+   */
+  void lock(Object bean);
+
   /**
    * Truncate all the given tables.
    */

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

@@ -15,8 +15,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 final class DbContext {
 
-  private static final Logger logger = LoggerFactory.getLogger(DbContext.class);
-
+  private static final Logger log = LoggerFactory.getLogger("io.ebean");
   static {
     EbeanVersion.getVersion();
   }
@@ -39,7 +38,6 @@ final class DbContext {
       if (!DbPrimary.isSkip()) {
         // look to see if there is a default server defined
         String defaultName = DbPrimary.getDefaultServerName();
-        logger.debug("defaultName:{}", defaultName);
         if (defaultName != null && !defaultName.trim().isEmpty()) {
           defaultDatabase = getWithCreate(defaultName.trim());
         }
@@ -54,7 +52,7 @@ final class DbContext {
       throw new DataSourceConfigurationException(msg, e);
 
     } catch (Throwable e) {
-      logger.error("Error trying to create the default Database", e);
+      log.error("Error trying to create the default Database", e);
       throw new RuntimeException(e);
     }
   }
@@ -115,7 +113,7 @@ final class DbContext {
    * Register a server so we can get it by its name.
    */
   void register(Database server, boolean isDefault) {
-    registerWithName(server.getName(), server, isDefault);
+    registerWithName(server.name(), server, isDefault);
   }
 
   private void registerWithName(String name, Database server, boolean isDefault) {

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

@@ -103,7 +103,7 @@ public final class Ebean {
    * </p>
    */
   public static ExpressionFactory getExpressionFactory() {
-    return getDefault().getExpressionFactory();
+    return getDefault().expressionFactory();
   }
 
   /**
@@ -642,7 +642,7 @@ public final class Ebean {
    * @param id       the id value
    */
   public static <T> T getReference(Class<T> beanType, Object id) {
-    return getDefault().getReference(beanType, id);
+    return getDefault().reference(beanType, id);
   }
 
   /**
@@ -1201,14 +1201,14 @@ public final class Ebean {
    * </p>
    */
   public static BeanState getBeanState(Object bean) {
-    return getDefault().getBeanState(bean);
+    return getDefault().beanState(bean);
   }
 
   /**
    * Return the manager of the server cache ("L2" cache).
    */
   public static ServerCacheManager getServerCacheManager() {
-    return getDefault().getServerCacheManager();
+    return getDefault().cacheManager();
   }
 
   /**
@@ -1216,7 +1216,7 @@ public final class Ebean {
    * queries.
    */
   public static BackgroundExecutor getBackgroundExecutor() {
-    return getDefault().getBackgroundExecutor();
+    return getDefault().backgroundExecutor();
   }
 
   /**

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

@@ -14,10 +14,9 @@ import java.util.Properties;
  */
 public class EbeanVersion {
 
-  private static final Logger logger = LoggerFactory.getLogger(EbeanVersion.class);
+  private static final Logger log = LoggerFactory.getLogger("io.ebean");
 
   private static String version = "unknown";
-
   static {
     try {
       Properties prop = new Properties();
@@ -28,9 +27,9 @@ public class EbeanVersion {
           version = prop.getProperty("version");
         }
       }
-      logger.info("ebean version: {}", version);
+      log.info("ebean version: {}", version);
     } catch (IOException e) {
-      logger.warn("Could not determine ebean version: {}", e.getMessage());
+      log.warn("Could not determine ebean version: {}", e.getMessage());
     }
   }
 

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

@@ -16,7 +16,7 @@ import java.util.Map;
  * This provides a convenient way to create expressions for the default
  * database.
  * <p>
- * See also {@link DB#getExpressionFactory()}
+ * See also {@link DB#expressionFactory()}
  * </p>
  * <p>
  * Creates standard common expressions for using in a Query Where or Having
@@ -34,14 +34,14 @@ public class Expr {
    * Equal To - property equal to the given value.
    */
   public static Expression eq(String propertyName, Object value) {
-    return DB.getExpressionFactory().eq(propertyName, value);
+    return DB.expressionFactory().eq(propertyName, value);
   }
 
   /**
    * Not Equal To - property not equal to the given value.
    */
   public static Expression ne(String propertyName, Object value) {
-    return DB.getExpressionFactory().ne(propertyName, value);
+    return DB.expressionFactory().ne(propertyName, value);
   }
 
   /**
@@ -49,7 +49,7 @@ public class Expr {
    * using a lower() function to make it case insensitive).
    */
   public static Expression ieq(String propertyName, String value) {
-    return DB.getExpressionFactory().ieq(propertyName, value);
+    return DB.expressionFactory().ieq(propertyName, value);
   }
 
   /**
@@ -59,28 +59,28 @@ public class Expr {
    * </p>
    */
   public static Expression inRange(String propertyName, Object value1, Object value2) {
-    return DB.getExpressionFactory().inRange(propertyName, value1, value2);
+    return DB.expressionFactory().inRange(propertyName, value1, value2);
   }
 
   /**
    * Between - property between the two given values.
    */
   public static Expression between(String propertyName, Object value1, Object value2) {
-    return DB.getExpressionFactory().between(propertyName, value1, value2);
+    return DB.expressionFactory().between(propertyName, value1, value2);
   }
 
   /**
    * Between - value between two given properties.
    */
   public static Expression between(String lowProperty, String highProperty, Object value) {
-    return DB.getExpressionFactory().betweenProperties(lowProperty, highProperty, value);
+    return DB.expressionFactory().betweenProperties(lowProperty, highProperty, value);
   }
 
   /**
    * Greater Than - property greater than the given value.
    */
   public static Expression gt(String propertyName, Object value) {
-    return DB.getExpressionFactory().gt(propertyName, value);
+    return DB.expressionFactory().gt(propertyName, value);
   }
 
   /**
@@ -88,42 +88,42 @@ public class Expr {
    * value.
    */
   public static Expression ge(String propertyName, Object value) {
-    return DB.getExpressionFactory().ge(propertyName, value);
+    return DB.expressionFactory().ge(propertyName, value);
   }
 
   /**
    * Less Than - property less than the given value.
    */
   public static Expression lt(String propertyName, Object value) {
-    return DB.getExpressionFactory().lt(propertyName, value);
+    return DB.expressionFactory().lt(propertyName, value);
   }
 
   /**
    * Less Than or Equal to - property less than or equal to the given value.
    */
   public static Expression le(String propertyName, Object value) {
-    return DB.getExpressionFactory().le(propertyName, value);
+    return DB.expressionFactory().le(propertyName, value);
   }
 
   /**
    * Is Null - property is null.
    */
   public static Expression isNull(String propertyName) {
-    return DB.getExpressionFactory().isNull(propertyName);
+    return DB.expressionFactory().isNull(propertyName);
   }
 
   /**
    * Is Not Null - property is not null.
    */
   public static Expression isNotNull(String propertyName) {
-    return DB.getExpressionFactory().isNotNull(propertyName);
+    return DB.expressionFactory().isNotNull(propertyName);
   }
 
   /**
    * Case insensitive {@link #exampleLike(Object)}
    */
   public static ExampleExpression iexampleLike(Object example) {
-    return DB.getExpressionFactory().iexampleLike(example);
+    return DB.expressionFactory().iexampleLike(example);
   }
 
   /**
@@ -131,14 +131,14 @@ public class Expr {
    * LikeType.RAW (you need to add you own wildcards % and _).
    */
   public static ExampleExpression exampleLike(Object example) {
-    return DB.getExpressionFactory().exampleLike(example);
+    return DB.expressionFactory().exampleLike(example);
   }
 
   /**
    * Create the query by Example expression specifying more options.
    */
   public static ExampleExpression exampleLike(Object example, boolean caseInsensitive, LikeType likeType) {
-    return DB.getExpressionFactory().exampleLike(example, caseInsensitive, likeType);
+    return DB.expressionFactory().exampleLike(example, caseInsensitive, likeType);
   }
 
   /**
@@ -146,7 +146,7 @@ public class Expr {
    * characters % (percentage) and _ (underscore).
    */
   public static Expression like(String propertyName, String value) {
-    return DB.getExpressionFactory().like(propertyName, value);
+    return DB.expressionFactory().like(propertyName, value);
   }
 
   /**
@@ -155,14 +155,14 @@ public class Expr {
    * a lower() function to make the expression case insensitive.
    */
   public static Expression ilike(String propertyName, String value) {
-    return DB.getExpressionFactory().ilike(propertyName, value);
+    return DB.expressionFactory().ilike(propertyName, value);
   }
 
   /**
    * Starts With - property like value%.
    */
   public static Expression startsWith(String propertyName, String value) {
-    return DB.getExpressionFactory().startsWith(propertyName, value);
+    return DB.expressionFactory().startsWith(propertyName, value);
   }
 
   /**
@@ -170,14 +170,14 @@ public class Expr {
    * lower() function to make the expression case insensitive.
    */
   public static Expression istartsWith(String propertyName, String value) {
-    return DB.getExpressionFactory().istartsWith(propertyName, value);
+    return DB.expressionFactory().istartsWith(propertyName, value);
   }
 
   /**
    * Ends With - property like %value.
    */
   public static Expression endsWith(String propertyName, String value) {
-    return DB.getExpressionFactory().endsWith(propertyName, value);
+    return DB.expressionFactory().endsWith(propertyName, value);
   }
 
   /**
@@ -185,14 +185,14 @@ public class Expr {
    * function to make the expression case insensitive.
    */
   public static Expression iendsWith(String propertyName, String value) {
-    return DB.getExpressionFactory().iendsWith(propertyName, value);
+    return DB.expressionFactory().iendsWith(propertyName, value);
   }
 
   /**
    * Contains - property like %value%.
    */
   public static Expression contains(String propertyName, String value) {
-    return DB.getExpressionFactory().contains(propertyName, value);
+    return DB.expressionFactory().contains(propertyName, value);
   }
 
   /**
@@ -200,42 +200,42 @@ public class Expr {
    * function to make the expression case insensitive.
    */
   public static Expression icontains(String propertyName, String value) {
-    return DB.getExpressionFactory().icontains(propertyName, value);
+    return DB.expressionFactory().icontains(propertyName, value);
   }
 
   /**
    * For collection properties that are empty (have not existing elements).
    */
   public static Expression isEmpty(String propertyName) {
-    return DB.getExpressionFactory().isEmpty(propertyName);
+    return DB.expressionFactory().isEmpty(propertyName);
   }
 
   /**
    * For collection properties that are not empty (have existing elements).
    */
   public static Expression isNotEmpty(String propertyName) {
-    return DB.getExpressionFactory().isNotEmpty(propertyName);
+    return DB.expressionFactory().isNotEmpty(propertyName);
   }
 
   /**
    * In - property has a value in the array of values.
    */
   public static Expression in(String propertyName, Object[] values) {
-    return DB.getExpressionFactory().in(propertyName, values);
+    return DB.expressionFactory().in(propertyName, values);
   }
 
   /**
    * In - using a subQuery.
    */
   public static Expression in(String propertyName, Query<?> subQuery) {
-    return DB.getExpressionFactory().in(propertyName, subQuery);
+    return DB.expressionFactory().in(propertyName, subQuery);
   }
 
   /**
    * In - property has a value in the collection of values.
    */
   public static Expression in(String propertyName, Collection<?> values) {
-    return DB.getExpressionFactory().in(propertyName, values);
+    return DB.expressionFactory().in(propertyName, values);
   }
 
   /**
@@ -272,14 +272,14 @@ public class Expr {
    * }</pre>
    */
   public static Expression inOrEmpty(String propertyName, Collection<?> values) {
-    return DB.getExpressionFactory().inOrEmpty(propertyName, values);
+    return DB.expressionFactory().inOrEmpty(propertyName, values);
   }
 
   /**
    * Id Equal to - ID property is equal to the value.
    */
   public static Expression idEq(Object value) {
-    return DB.getExpressionFactory().idEq(value);
+    return DB.expressionFactory().idEq(value);
   }
 
   /**
@@ -292,7 +292,7 @@ public class Expr {
    * @param propertyMap a map keyed by property names.
    */
   public static Expression allEq(Map<String, Object> propertyMap) {
-    return DB.getExpressionFactory().allEq(propertyMap);
+    return DB.expressionFactory().allEq(propertyMap);
   }
 
   /**
@@ -303,7 +303,7 @@ public class Expr {
    * </p>
    */
   public static Expression raw(String raw, Object value) {
-    return DB.getExpressionFactory().raw(raw, value);
+    return DB.expressionFactory().raw(raw, value);
   }
 
   /**
@@ -314,53 +314,48 @@ public class Expr {
    * </p>
    */
   public static Expression raw(String raw, Object[] values) {
-    return DB.getExpressionFactory().raw(raw, values);
+    return DB.expressionFactory().raw(raw, values);
   }
 
   /**
    * Add raw expression with no parameters.
    */
   public static Expression raw(String raw) {
-    return DB.getExpressionFactory().raw(raw);
+    return DB.expressionFactory().raw(raw);
   }
 
   /**
    * And - join two expressions with a logical and.
    */
   public static Expression and(Expression expOne, Expression expTwo) {
-
-    return DB.getExpressionFactory().and(expOne, expTwo);
+    return DB.expressionFactory().and(expOne, expTwo);
   }
 
   /**
    * Or - join two expressions with a logical or.
    */
   public static Expression or(Expression expOne, Expression expTwo) {
-
-    return DB.getExpressionFactory().or(expOne, expTwo);
+    return DB.expressionFactory().or(expOne, expTwo);
   }
 
   /**
    * Negate the expression (prefix it with NOT).
    */
   public static Expression not(Expression exp) {
-
-    return DB.getExpressionFactory().not(exp);
+    return DB.expressionFactory().not(exp);
   }
 
   /**
    * Return a list of expressions that will be joined by AND's.
    */
   public static <T> Junction<T> conjunction(Query<T> query) {
-
-    return DB.getExpressionFactory().conjunction(query);
+    return DB.expressionFactory().conjunction(query);
   }
 
   /**
    * Return a list of expressions that will be joined by OR's.
    */
   public static <T> Junction<T> disjunction(Query<T> query) {
-
-    return DB.getExpressionFactory().disjunction(query);
+    return DB.expressionFactory().disjunction(query);
   }
 }

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

@@ -137,11 +137,11 @@ public class Finder<I, T> {
   /**
    * Creates an entity reference for this ID.
    * <p>
-   * Equivalent to {@link Database#getReference(Class, Object)}
+   * Equivalent to {@link Database#reference(Class, Object)}
    */
   @Nonnull
   public T ref(I id) {
-    return db().getReference(type, id);
+    return db().reference(type, id);
   }
 
   /**

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

@@ -3,6 +3,7 @@ package io.ebean;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Holds a list of value object pairs.
@@ -62,15 +63,14 @@ import java.util.List;
  * </p>
  * <pre>{@code sql
  *
- *   create index ix_name on table_name ((sku || '-' || code));
+ *   create index ix_name on table_name (sku || '-' || code);
  *
  * }</pre>
  */
-public class Pairs {
+public final class Pairs {
 
   private final String property0;
   private final String property1;
-
   private final List<Entry> entries = new ArrayList<>();
 
   /**
@@ -111,54 +111,70 @@ public class Pairs {
   /**
    * Return the first property name.
    */
-  public String getProperty0() {
+  public String property0() {
     return property0;
   }
 
   /**
    * Return the second property name.
    */
-  public String getProperty1() {
+  public String property1() {
     return property1;
   }
 
   /**
    * Return all the value pairs.
    */
-  public List<Entry> getEntries() {
+  public List<Entry> entries() {
     return Collections.unmodifiableList(entries);
   }
 
   /**
    * Return the separator character used with DB varchar concatenation to combine the 2 values.
    */
-  public String getConcatSeparator() {
+  public String concatSeparator() {
     return concatSeparator;
   }
 
   /**
    * Set the separator character used with DB varchar concatenation to combine the 2 values.
    */
-  public Pairs setConcatSeparator(String concatSeparator) {
+  public Pairs concatSeparator(String concatSeparator) {
     this.concatSeparator = concatSeparator;
     return this;
   }
 
+  /**
+   * Deprecated migrate to concatSeparator()
+   */
+  @Deprecated
+  public Pairs setConcatSeparator(String concatSeparator) {
+    return concatSeparator(concatSeparator);
+  }
+
   /**
    * Return  a suffix used with DB varchar concatenation to combine the 2 values.
    */
-  public String getConcatSuffix() {
+  public String concatSuffix() {
     return concatSuffix;
   }
 
   /**
    * Add a suffix used with DB varchar concatenation to combine the 2 values.
    */
-  public Pairs setConcatSuffix(String concatSuffix) {
+  public Pairs concatSuffix(String concatSuffix) {
     this.concatSuffix = concatSuffix;
     return this;
   }
 
+  /**
+   * Deprecated migrate to concatSuffix()
+   */
+  @Deprecated
+  public Pairs setConcatSuffix(String concatSuffix) {
+    return concatSuffix(concatSuffix);
+  }
+
   @Override
   public String toString() {
     return "p0:" + property0 + " p1:" + property1 + " entries:" + entries;
@@ -208,16 +224,13 @@ public class Pairs {
     public boolean equals(Object o) {
       if (this == o) return true;
       if (o == null || getClass() != o.getClass()) return false;
-
       Entry that = (Entry) o;
       return a.equals(that.a) && b.equals(that.b);
     }
 
     @Override
     public int hashCode() {
-      int result = a.hashCode();
-      result = 92821 * result + b.hashCode();
-      return result;
+      return Objects.hash(a, b);
     }
   }
 }

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

@@ -538,7 +538,15 @@ public interface Transaction extends AutoCloseable {
    * Examples of when a developer may wish to use the connection directly are:
    * Savepoints, advanced CLOB BLOB use and advanced stored procedure calls.
    */
-  Connection getConnection();
+  Connection connection();
+
+  /**
+   * Deprecated migrate to connection().
+   */
+  @Deprecated
+  default Connection getConnection() {
+    return connection();
+  }
 
   /**
    * Add table modification information to the TransactionEvent.

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

@@ -11,7 +11,7 @@ public interface BeanCollectionLoader {
   /**
    * Return the name of the associated Database.
    */
-  String getName();
+  String name();
 
   /**
    * Invoke the lazy loading for this bean collection.

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

@@ -843,7 +843,7 @@ public final class EntityBeanIntercept implements Serializable {
         }
         // For stand alone reference bean or after deserialisation lazy load
         // using the ebeanServer. Synchronise only on the bean.
-        loadBeanInternal(loadProperty, database.getPluginApi().beanLoader());
+        loadBeanInternal(loadProperty, database.pluginApi().beanLoader());
         return;
       }
     } finally {
@@ -1232,7 +1232,8 @@ public final class EntityBeanIntercept implements Serializable {
     if (mutableNext == null) {
       return null;
     }
-    return mutableNext[propertyIndex].content();
+    final MutableValueNext next = mutableNext[propertyIndex];
+    return next != null ? next.content() : null;
   }
 
 }

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

@@ -20,7 +20,7 @@ public abstract class SingleBeanLoader implements BeanLoader {
 
   @Override
   public String getName() {
-    return database.getName();
+    return database.name();
   }
 
   @Override
@@ -39,7 +39,7 @@ public abstract class SingleBeanLoader implements BeanLoader {
 
     @Override
     public void loadBean(EntityBeanIntercept ebi) {
-      database.getPluginApi().loadBeanL2(ebi);
+      database.pluginApi().loadBeanL2(ebi);
     }
   }
 
@@ -53,7 +53,7 @@ public abstract class SingleBeanLoader implements BeanLoader {
 
     @Override
     public void loadBean(EntityBeanIntercept ebi) {
-      database.getPluginApi().loadBeanRef(ebi);
+      database.pluginApi().loadBeanRef(ebi);
     }
   }
 
@@ -67,7 +67,7 @@ public abstract class SingleBeanLoader implements BeanLoader {
 
     @Override
     public void loadBean(EntityBeanIntercept ebi) {
-      database.getPluginApi().loadBean(ebi);
+      database.pluginApi().loadBean(ebi);
     }
   }
 }

ebean-api/src/main/java/io/ebean/cache/QueryCacheEntry.java

@@ -13,9 +13,7 @@ import java.util.Set;
 public class QueryCacheEntry {
 
   private final Object value;
-
   private final Set<String> dependentTables;
-
   private final long timestamp;
 
   /**

ebean-api/src/main/java/io/ebean/cache/ServerCache.java

@@ -10,17 +10,17 @@ import java.util.Set;
  * Represents part of the "L2" server side cache.
  * <p>
  * This is used to cache beans or query results (bean collections).
- * </p>
  * <p>
  * There are 2 ServerCache's for each bean type. One is used as the 'bean cache'
  * which holds beans of a given type. The other is the 'query cache' holding
  * query results for a given type.
- * </p>
  */
 public interface ServerCache {
 
+  /**
+   * Get values for many keys.
+   */
   default Map<Object, Object> getAll(Set<Object> keys) {
-
     Map<Object, Object> map = new LinkedHashMap<>();
     for (Object key : keys) {
       Object value = get(key);
@@ -73,6 +73,14 @@ public interface ServerCache {
   /**
    * Return the hit ratio the cache is currently getting.
    */
+  default int hitRatio() {
+    return getHitRatio();
+  }
+
+  /**
+   * Deprecated migrate to hitRatio().
+   */
+  @Deprecated
   int getHitRatio();
 
   /**
@@ -80,6 +88,14 @@ public interface ServerCache {
    *
    * @param reset if true the statistics are reset.
    */
+  default ServerCacheStatistics statistics(boolean reset) {
+    return getStatistics(reset);
+  }
+
+  /**
+   * Deprecated migrate to statistics().
+   */
+  @Deprecated
   ServerCacheStatistics getStatistics(boolean reset);
 
   /**

ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java

@@ -21,7 +21,15 @@ public interface ServerCacheManager {
    * rather than background processing.
    * </p>
    */
-  boolean isLocalL2Caching();
+  boolean localL2Caching();
+
+  /**
+   * Deprecated migrate to localL2Caching().
+   */
+  @Deprecated
+  default boolean isLocalL2Caching() {
+    return localL2Caching();
+  }
 
   /**
    * Return all the cache regions.
@@ -36,37 +44,78 @@ public interface ServerCacheManager {
    *
    * @param regions A region name or comma delimited list of region names.
    */
-  void setEnabledRegions(String regions);
+  void enabledRegions(String regions);
+
+  /**
+   * Deprecated migrate to enabledRegions().
+   */
+  @Deprecated
+  default void setEnabledRegions(String regions) {
+    enabledRegions(regions);
+  }
 
   /**
    * Enable or disable all the cache regions.
    */
-  void setAllRegionsEnabled(boolean enabled);
+  void allRegionsEnabled(boolean enabled);
 
   /**
-   * Return the cache region by name. Typically to enable or disable the region.
+   * Deprecated migrate to allRegionsEnabled().
    */
-  ServerCacheRegion getRegion(String name);
+  @Deprecated
+  default void setAllRegionsEnabled(boolean enabled) {
+    allRegionsEnabled(enabled);
+  }
+
+  /**
+   * Return the cache region by name. Typically, to enable or disable the region.
+   */
+  ServerCacheRegion region(String name);
+
+  @Deprecated
+  default ServerCacheRegion getRegion(String name) {
+    return region(name);
+  }
 
   /**
    * Return the cache for mapping natural keys to id values.
    */
-  ServerCache getNaturalKeyCache(Class<?> beanType);
+  ServerCache naturalKeyCache(Class<?> beanType);
+
+  @Deprecated
+  default ServerCache getNaturalKeyCache(Class<?> beanType) {
+    return naturalKeyCache(beanType);
+  }
 
   /**
    * Return the cache for beans of a particular type.
    */
-  ServerCache getBeanCache(Class<?> beanType);
+  ServerCache beanCache(Class<?> beanType);
+
+  @Deprecated
+  default ServerCache getBeanCache(Class<?> beanType) {
+    return beanCache(beanType);
+  }
 
   /**
    * Return the cache for associated many properties of a bean type.
    */
-  ServerCache getCollectionIdsCache(Class<?> beanType, String propertyName);
+  ServerCache collectionIdsCache(Class<?> beanType, String propertyName);
+
+  @Deprecated
+  default ServerCache getCollectionIdsCache(Class<?> beanType, String propertyName) {
+    return collectionIdsCache(beanType, propertyName);
+  }
 
   /**
    * Return the cache for query results of a particular type of bean.
    */
-  ServerCache getQueryCache(Class<?> beanType);
+  ServerCache queryCache(Class<?> beanType);
+
+  @Deprecated
+  default ServerCache getQueryCache(Class<?> beanType) {
+    return queryCache(beanType);
+  }
 
   /**
    * This clears both the bean and query cache for a given type.

ebean-api/src/main/java/io/ebean/cache/ServerCacheOptions.java

@@ -18,7 +18,6 @@ public class ServerCacheOptions {
    * Construct with no set options.
    */
   public ServerCacheOptions() {
-
   }
 
   /**
@@ -73,7 +72,6 @@ public class ServerCacheOptions {
    * Return a copy of this object.
    */
   public ServerCacheOptions copy() {
-
     ServerCacheOptions copy = new ServerCacheOptions();
     copy.maxSize = maxSize;
     copy.maxIdleSecs = maxIdleSecs;

ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java

@@ -8,7 +8,15 @@ public interface ServerCacheRegion {
   /**
    * Return the region name.
    */
-  String getName();
+  String name();
+
+  /**
+   * Deprecated migrate to name().
+   */
+  @Deprecated
+  default String getName() {
+    return name();
+  }
 
   /**
    * Return true if the cache region is enabled.

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

@@ -63,7 +63,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
    */
   AbstractBeanCollection(BeanCollectionLoader loader, EntityBean ownerBean, String propertyName) {
     this.loader = loader;
-    this.ebeanServerName = loader.getName();
+    this.ebeanServerName = loader.name();
     this.ownerBean = ownerBean;
     this.propertyName = propertyName;
     this.readOnly = ownerBean != null && ownerBean._ebean_getIntercept().isReadOnly();
@@ -111,7 +111,7 @@ abstract class AbstractBeanCollection<E> implements BeanCollection<E> {
   public void setLoader(BeanCollectionLoader loader) {
     this.registeredWithLoadContext = true;
     this.loader = loader;
-    this.ebeanServerName = loader.getName();
+    this.ebeanServerName = loader.name();
   }
 
   @Override

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

@@ -1,10 +1,5 @@
 package io.ebean.config;
 
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Enumeration;
-
 /**
  * Helper to find classes taking into account the context class loader.
  */
@@ -77,22 +72,14 @@ public class ClassLoadConfig {
    * Return a new instance of the class using the default constructor.
    */
   public Object newInstance(String className) {
-
     try {
       Class<?> cls = forName(className);
-      return cls.newInstance();
+      return cls.getDeclaredConstructor().newInstance();
     } catch (Exception e) {
       throw new IllegalArgumentException("Error constructing " + className, e);
     }
   }
 
-  /**
-   * Return the resources for the given name.
-   */
-  public Enumeration<URL> getResources(String name) throws IOException {
-    return context.getResources(name);
-  }
-
   /**
    * Return true if the given class is present.
    */
@@ -129,9 +116,7 @@ public class ClassLoadConfig {
      * Optional - if set only use this classLoader (no fallback).
      */
     protected final ClassLoader preferredLoader;
-
     protected final ClassLoader contextLoader;
-
     protected final ClassLoader callerLoader;
 
     ClassLoaderContext(ClassLoader preferredLoader) {
@@ -145,15 +130,7 @@ public class ClassLoadConfig {
       return (loader != null) ? loader : callerLoader;
     }
 
-    Enumeration<URL> getResources(String name) throws IOException {
-      if (preferredLoader != null) {
-        return preferredLoader.getResources(name);
-      }
-      return contextLoader().getResources(name);
-    }
-
     Class<?> forName(String name) throws ClassNotFoundException {
-
       if (preferredLoader != null) {
         // only use the explicitly set classLoader
         return classForName(name, preferredLoader);

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

@@ -2,11 +2,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;
+import io.ebean.*;
 import io.ebean.annotation.*;
 import io.ebean.cache.ServerCachePlugin;
 import io.ebean.config.dbplatform.DatabasePlatform;
@@ -14,14 +10,7 @@ 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.*;
 import io.ebean.event.changelog.ChangeLogListener;
 import io.ebean.event.changelog.ChangeLogPrepare;
 import io.ebean.event.changelog.ChangeLogRegister;
@@ -34,14 +23,7 @@ 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;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.ServiceLoader;
+import java.util.*;
 
 /**
  * The configuration used for creating a Database.
@@ -82,7 +64,6 @@ import java.util.ServiceLoader;
  */
 public class DatabaseConfig {
 
-
   /**
    * The Database name.
    */
@@ -402,8 +383,8 @@ public class DatabaseConfig {
   private List<BeanPostConstructListener> postConstructListeners = new ArrayList<>();
   private List<BeanPersistListener> persistListeners = new ArrayList<>();
   private List<BeanQueryAdapter> queryAdapters = new ArrayList<>();
-  private List<BulkTableEventListener> bulkTableEventListeners = new ArrayList<>();
-  private List<ServerConfigStartup> configStartupListeners = new ArrayList<>();
+  private final List<BulkTableEventListener> bulkTableEventListeners = new ArrayList<>();
+  private final List<ServerConfigStartup> configStartupListeners = new ArrayList<>();
 
   /**
    * By default inserts are included in the change log.
@@ -411,42 +392,26 @@ public class DatabaseConfig {
   private boolean changeLogIncludeInserts = true;
 
   private ChangeLogPrepare changeLogPrepare;
-
   private ChangeLogListener changeLogListener;
-
   private ChangeLogRegister changeLogRegister;
-
   private boolean changeLogAsync = true;
-
   private ReadAuditLogger readAuditLogger;
-
   private ReadAuditPrepare readAuditPrepare;
-
   private EncryptKeyManager encryptKeyManager;
-
   private EncryptDeployManager encryptDeployManager;
-
   private Encryptor encryptor;
-
-  private boolean dbOffline;
-
   private DbEncrypt dbEncrypt;
-
+  private boolean dbOffline;
   private ServerCachePlugin serverCachePlugin;
 
   /**
    * The default PersistenceContextScope used if one is not explicitly set on a query.
    */
   private PersistenceContextScope persistenceContextScope = PersistenceContextScope.TRANSACTION;
-
   private JsonFactory jsonFactory;
-
   private boolean localTimeWithNanos;
-
   private boolean durationWithNanos;
-
   private int maxCallStack = 5;
-
   private boolean transactionRollbackOnChecked = true;
 
   // configuration for the background executor service (thread pool)
@@ -2741,21 +2706,7 @@ public class DatabaseConfig {
     this.classLoadConfig = classLoadConfig;
   }
 
-  /**
-   * Return the service loader using the classLoader defined in ClassLoadConfig.
-   */
-  public <T> ServiceLoader<T> serviceLoad(Class<T> spiService) {
-    return ServiceLoader.load(spiService, classLoadConfig.getClassLoader());
-  }
 
-  /**
-   * Return the first service using the service loader (or null).
-   */
-  public <T> T service(Class<T> spiService) {
-    ServiceLoader<T> load = serviceLoad(spiService);
-    Iterator<T> serviceInstances = load.iterator();
-    return serviceInstances.hasNext() ? serviceInstances.next() : null;
-  }
 
   /**
    * Load settings from application.properties, application.yaml and other sources.
@@ -2794,7 +2745,7 @@ public class DatabaseConfig {
    */
   private List<AutoConfigure> autoConfiguration() {
     List<AutoConfigure> list = new ArrayList<>();
-    for (AutoConfigure autoConfigure : serviceLoad(AutoConfigure.class)) {
+    for (AutoConfigure autoConfigure : ServiceLoader.load(AutoConfigure.class)) {
       autoConfigure.preConfigure(this);
       list.add(autoConfigure);
     }

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

@@ -21,6 +21,14 @@ public class QueryPlanCapture {
   /**
    * Return the database the plans were captured for.
    */
+  public Database database() {
+    return database;
+  }
+
+  /**
+   * Deprecated migrate to database().
+   */
+  @Deprecated
   public Database getDatabase() {
     return database;
   }
@@ -28,6 +36,14 @@ public class QueryPlanCapture {
   /**
    * Return the captured query plans.
    */
+  public List<MetaQueryPlan> plans() {
+    return plans;
+  }
+
+  /**
+   * Deprecated migrate to plans().
+   */
+  @Deprecated
   public List<MetaQueryPlan> getPlans() {
     return plans;
   }

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

@@ -25,7 +25,7 @@ import java.sql.Types;
  */
 public class DatabasePlatform {
 
-  private static final Logger logger = LoggerFactory.getLogger(DatabasePlatform.class);
+  private static final Logger log = LoggerFactory.getLogger("io.ebean");
 
   /**
    * Behavior used when ending a query only transaction (at read committed isolation level).
@@ -640,7 +640,7 @@ public class DatabasePlatform {
         if (dbName.charAt(dbName.length() - 1) == BACK_TICK) {
           return openQuote + dbName.substring(1, dbName.length() - 1) + closeQuote;
         } else {
-          logger.error("Missing backquote on [" + dbName + "]");
+          log.error("Missing backquote on [" + dbName + "]");
         }
       } else if (allQuotedIdentifiers) {
         return openQuote + dbName + closeQuote;
@@ -694,7 +694,7 @@ public class DatabasePlatform {
 
   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");
+    log.info("it seems your database does not support the 'for update' clause");
     return sql;
   }
 
@@ -728,7 +728,7 @@ public class DatabasePlatform {
     if (!schemaExists(dbSchema, connection)) {
       Statement query = connection.createStatement();
       try {
-        logger.info("create schema:{}", dbSchema);
+        log.debug("create schema:{}", dbSchema);
         query.executeUpdate("create schema " + dbSchema);
       } finally {
         JdbcClose.close(query);
@@ -758,7 +758,6 @@ public class DatabasePlatform {
    * Return true if the table exists.
    */
   public boolean tableExists(Connection connection, String catalog, String schema, String table) throws SQLException {
-
     DatabaseMetaData metaData = connection.getMetaData();
     ResultSet tables = metaData.getTables(catalog, schema, table, null);
     try {

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

@@ -70,7 +70,6 @@ public class DbPlatformTypeMapping {
    * Load the standard types. These can be overridden by DB specific platform.
    */
   private void loadDefaults(boolean logicalTypes) {
-
     put(DbType.BOOLEAN, BOOLEAN_LOGICAL);
     put(DbType.BIT);
     put(DbType.INTEGER);
@@ -88,7 +87,6 @@ public class DbPlatformTypeMapping {
     put(DbType.LONGVARCHAR);
     // most commonly real maps to db float
     put(DbType.REAL, new DbPlatformType("float"));
-
     put(DbType.POINT, POINT);
     put(DbType.POLYGON, POLYGON);
     put(DbType.LINESTRING, LINESTRING);
@@ -103,7 +101,7 @@ public class DbPlatformTypeMapping {
       put(DbType.VARBINARY, new DbPlatformType("varbinary"));
       put(DbType.BINARY, new DbPlatformType("binary"));
       put(DbType.CHAR, new DbPlatformType("char"));
-
+      put(DbType.LOCALDATETIME, new DbPlatformType("localdatetime", false));
       put(DbType.HSTORE, new DbPlatformType("hstore", false));
       put(DbType.JSON, new DbPlatformType("json", false));
       put(DbType.JSONB, new DbPlatformType("jsonb", false));
@@ -120,7 +118,7 @@ public class DbPlatformTypeMapping {
       put(DbType.VARBINARY, new DbPlatformType("varbinary", 255));
       put(DbType.BINARY, new DbPlatformType("binary", 255));
       put(DbType.CHAR, new DbPlatformType("char", 1));
-
+      put(DbType.LOCALDATETIME, DbType.TIMESTAMP.createPlatformType());
       put(DbType.JSON, JSON_CLOB_PLACEHOLDER); // Postgres maps this to JSON
       put(DbType.JSONB, JSON_CLOB_PLACEHOLDER); // Postgres maps this to JSONB
       put(DbType.JSONCLOB, JSON_CLOB_PLACEHOLDER);
@@ -137,7 +135,6 @@ public class DbPlatformTypeMapping {
    * Lookup the platform specific DbType given the standard sql type name.
    */
   public DbPlatformType lookup(String name, boolean withScale) {
-
     DbType type = lookup.byName(name);
     if (type == null) {
       throw new IllegalArgumentException("Unknown type [" + name + "] - not standard sql type");
@@ -160,7 +157,6 @@ public class DbPlatformTypeMapping {
   }
 
   private DbPlatformType getJsonType(DbType type, boolean withScale) {
-
     DbPlatformType dbType = get(type);
     if (dbType == JSON_CLOB_PLACEHOLDER) {
       // if we have scale that implies this maps to varchar

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

@@ -34,6 +34,7 @@ public enum DbType {
 
   ARRAY(Types.ARRAY),
 
+  LOCALDATETIME(ExtraDbTypes.LOCALDATETIME),
   UUID(ExtraDbTypes.UUID),
   INET(ExtraDbTypes.INET),
   CIDR(ExtraDbTypes.CIDR),

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

@@ -5,11 +5,6 @@ package io.ebean.config.dbplatform;
  */
 public interface ExtraDbTypes {
 
-  /**
-   * DB native UUID type (H2 and Postgres).
-   */
-  int UUID = 5010;
-
   /**
    * Type to map Map content to Postgres HSTORE.
    */
@@ -40,6 +35,12 @@ public interface ExtraDbTypes {
    */
   int JSONBlob = 5005;
 
+  int LOCALDATETIME = 5009;
+
+  /**
+   * DB native UUID type (H2 and Postgres).
+   */
+  int UUID = 5010;
   int INET = 5020;
   int CIDR = 5021;
 

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

@@ -24,23 +24,14 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public abstract class SequenceIdGenerator implements PlatformIdGenerator {
 
-  protected static final Logger logger = LoggerFactory.getLogger("io.ebean.SEQ");
+  protected static final Logger log = LoggerFactory.getLogger("io.ebean.SEQ");
 
   private final ReentrantLock lock = new ReentrantLock();
-
-  /**
-   * The actual sequence name.
-   */
   protected final String seqName;
-
   protected final DataSource dataSource;
-
   protected final BackgroundExecutor backgroundExecutor;
-
   protected final NavigableSet<Long> idList = new TreeSet<>();
-
   protected final int allocationSize;
-
   protected AtomicBoolean currentlyBackgroundLoading = new AtomicBoolean(false);
 
   /**
@@ -129,7 +120,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
   protected void loadInBackground(final int requestSize) {
     if (currentlyBackgroundLoading.get()) {
       // skip as already background loading
-      logger.debug("... skip background sequence load (another load in progress)");
+      log.debug("... skip background sequence load (another load in progress)");
       return;
     }
     currentlyBackgroundLoading.set(true);
@@ -161,8 +152,8 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
       resultSet = statement.executeQuery();
 
       List<Long> newIds = readIds(resultSet, requestSize);
-      if (logger.isTraceEnabled()) {
-        logger.trace("seq:{} loaded:{} sql:{}", seqName, newIds.size(), sql);
+      if (log.isTraceEnabled()) {
+        log.trace("seq:{} loaded:{} sql:{}", seqName, newIds.size(), sql);
       }
       if (newIds.isEmpty()) {
         throw new PersistenceException("Always expecting more than 1 row from " + sql);
@@ -173,7 +164,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator {
     } catch (SQLException e) {
       if (e.getMessage().contains("Database is already closed")) {
         String msg = "Error getting SEQ when DB shutting down " + e.getMessage();
-        logger.error(msg);
+        log.error(msg);
         System.out.println(msg);
         return Collections.emptyList();
       } else {

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

@@ -2,8 +2,6 @@ package io.ebean.config.dbplatform;
 
 import io.ebean.Transaction;
 import io.ebean.util.JdbcClose;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
@@ -20,12 +18,8 @@ import java.sql.SQLException;
  */
 public class SimpleSequenceIdGenerator implements PlatformIdGenerator {
 
-  private static final Logger logger = LoggerFactory.getLogger(SimpleSequenceIdGenerator.class);
-
   private final String sql;
-
   private final DataSource dataSource;
-
   private final String seqName;
 
   /**
@@ -61,7 +55,7 @@ public class SimpleSequenceIdGenerator implements PlatformIdGenerator {
     PreparedStatement pstmt = null;
     ResultSet rset = null;
     try {
-      c = useTxnConnection ? t.getConnection() : dataSource.getConnection();
+      c = useTxnConnection ? t.connection() : dataSource.getConnection();
       pstmt = c.prepareStatement(sql);
       rset = pstmt.executeQuery();
       if (rset.next()) {

ebean-api/src/main/java/io/ebean/config/dbplatform/clickhouse/ClickHousePlatform.java

@@ -26,7 +26,6 @@ public class ClickHousePlatform extends DatabasePlatform {
 
     this.booleanDbType = Types.INTEGER;
     dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("UInt8"));
-
     // using unsigned as default types ...
     dbTypeMap.put(DbType.TINYINT, new DbPlatformType("UInt8", false));
     dbTypeMap.put(DbType.SMALLINT, new DbPlatformType("UInt16", false));
@@ -34,15 +33,13 @@ public class ClickHousePlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.BIGINT, new DbPlatformType("UInt64", false));
     dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("Decimal", 16, 3));
     dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("Float64", false));
-
     dbTypeMap.put(DbType.DATE, new DbPlatformType("Date", false));
     dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("DateTime", false));
-
+    dbTypeMap.put(DbType.LOCALDATETIME, new DbPlatformType("DateTime", false));
     dbTypeMap.put(DbType.VARCHAR, new DbPlatformType("String", false));
     dbTypeMap.put(DbType.LONGVARCHAR, new DbPlatformType("String", false));
     dbTypeMap.put(DbType.CLOB, new DbPlatformType("String", false));
     dbTypeMap.put(DbType.JSONVARCHAR, new DbPlatformType("String", false));
-
     dbTypeMap.put(DbType.UUID, new DbPlatformType("UUID", false));
     dbTypeMap.put(DbType.INET, new DbPlatformType("String", false));
     dbTypeMap.put(DbType.CIDR, new DbPlatformType("String", false));

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

@@ -12,7 +12,7 @@ import java.util.Arrays;
  */
 public class H2HistoryTrigger implements Trigger {
 
-  private static final Logger logger = LoggerFactory.getLogger(H2HistoryTrigger.class);
+  private static final Logger log = LoggerFactory.getLogger(H2HistoryTrigger.class);
 
   /**
    * Hardcoding the column and history table suffix for now. Not sure how to get that
@@ -69,7 +69,7 @@ public class H2HistoryTrigger implements Trigger {
     insertSql.append(");");
 
     this.insertHistorySql = insertSql.toString();
-    logger.debug("History table insert sql: {}", insertHistorySql);
+    log.debug("History table insert sql: {}", insertHistorySql);
   }
 
   @Override
@@ -82,8 +82,8 @@ public class H2HistoryTrigger implements Trigger {
         // update event. Set the effective start timestamp to now.
         newRow[effectStartPosition] = now;
       }
-      if (logger.isDebugEnabled()) {
-        logger.debug("History insert: {}", Arrays.toString(oldRow));
+      if (log.isTraceEnabled()) {
+        log.trace("History insert: {}", Arrays.toString(oldRow));
       }
       insertIntoHistory(connection, oldRow);
     }

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

@@ -51,6 +51,7 @@ public abstract class BaseMySqlPlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.BIT, new DbPlatformType("tinyint(1)"));
     dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("tinyint(1)"));
     dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("datetime(6)"));
+    dbTypeMap.put(DbType.LOCALDATETIME, new DbPlatformType("datetime(6)"));
     dbTypeMap.put(DbType.CLOB, new MySqlClob());
     dbTypeMap.put(DbType.BLOB, new MySqlBlob());
     dbTypeMap.put(DbType.BINARY, new DbPlatformType("binary", 255));

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

@@ -10,5 +10,6 @@ public class MySql55Platform extends BaseMySqlPlatform {
     super();
     this.platform = Platform.MYSQL55;
     dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("datetime"));
+    dbTypeMap.put(DbType.LOCALDATETIME, new DbPlatformType("datetime"));
   }
 }

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

@@ -69,22 +69,19 @@ public class PostgresPlatform extends DatabasePlatform {
 
     DbPlatformType dbTypeText = new DbPlatformType("text", false);
     DbPlatformType dbBytea = new DbPlatformType("bytea", false);
-
     dbTypeMap.put(DbType.UUID, new DbPlatformType("uuid", false));
     dbTypeMap.put(DbType.INET, new DbPlatformType("inet", false));
     dbTypeMap.put(DbType.CIDR, new DbPlatformType("cidr", false));
     dbTypeMap.put(DbType.HSTORE, new DbPlatformType("hstore", false));
     dbTypeMap.put(DbType.JSON, new DbPlatformType("json", false));
     dbTypeMap.put(DbType.JSONB, new DbPlatformType("jsonb", false));
-
     dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false));
     dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("float"));
     dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint"));
     dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("timestamptz"));
-
+    dbTypeMap.put(DbType.LOCALDATETIME, new DbPlatformType("timestamp"));
     dbTypeMap.put(DbType.BINARY, dbBytea);
     dbTypeMap.put(DbType.VARBINARY, dbBytea);
-
     dbTypeMap.put(DbType.BLOB, dbBytea);
     dbTypeMap.put(DbType.CLOB, dbTypeText);
     dbTypeMap.put(DbType.LONGVARBINARY, dbBytea);

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

@@ -21,6 +21,8 @@ public class SqlServer16Platform extends SqlServerBasePlatform {
     dbTypeMap.put(DbType.VARCHAR, new DbPlatformType("varchar", 255));
     dbTypeMap.put(DbType.LONGVARCHAR, new DbPlatformType("text"));
     dbTypeMap.put(DbType.CLOB, new DbPlatformType("text"));
+    dbTypeMap.put(DbType.JSON, new DbPlatformType("text"));
+    dbTypeMap.put(DbType.JSONB, new DbPlatformType("text"));
   }
 
 }

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

@@ -57,7 +57,6 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
     this.dbDefaultValue.setTrue("1");
     this.dbDefaultValue.setNow("SYSUTCDATETIME()");
     dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("bit"));
-
     dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false));
     dbTypeMap.put(DbType.BIGINT, new DbPlatformType("numeric", 19));
     dbTypeMap.put(DbType.REAL, new DbPlatformType("float(16)"));
@@ -67,16 +66,14 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.DATE, new DbPlatformType("date"));
     dbTypeMap.put(DbType.TIME, new DbPlatformType("time"));
     dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("datetime2"));
-
+    dbTypeMap.put(DbType.LOCALDATETIME, new DbPlatformType("datetime2"));
     // UTF8 aware types - overwritten in SqlServer16 platform
     dbTypeMap.put(DbType.CHAR, new DbPlatformType("nchar", 1));
     dbTypeMap.put(DbType.VARCHAR, new DbPlatformType("nvarchar", 255));
     dbTypeMap.put(DbType.LONGVARCHAR, new DbPlatformType("nvarchar", Integer.MAX_VALUE));
     dbTypeMap.put(DbType.CLOB, new DbPlatformType("nvarchar", Integer.MAX_VALUE));
-
     dbTypeMap.put(DbType.JSON, new DbPlatformType("nvarchar", Integer.MAX_VALUE));
     dbTypeMap.put(DbType.JSONB, new DbPlatformType("nvarchar", Integer.MAX_VALUE));
-
     dbTypeMap.put(DbType.BLOB, new DbPlatformType("image"));
     dbTypeMap.put(DbType.LONGVARBINARY, new DbPlatformType("image"));
   }

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

@@ -1,5 +1,6 @@
 package io.ebean.event;
 
+import io.ebean.Database;
 import io.ebean.EbeanServer;
 import io.ebean.Transaction;
 
@@ -9,18 +10,62 @@ import io.ebean.Transaction;
 public interface BeanDeleteIdRequest {
 
   /**
-   * Return the server processing the request.
+   * Deprecated migrate to database().
    */
+  @Deprecated
   EbeanServer getEbeanServer();
 
+  /**
+   * Deprecated migrate to database().
+   */
+  @Deprecated
+  default Database getDatabase() {
+    return getEbeanServer();
+  }
+
+  /**
+   * Return the DB processing the request.
+   */
+  default Database database() {
+    return getEbeanServer();
+  }
+
   /**
    * Return the Transaction associated with this request.
    */
-  Transaction getTransaction();
+  Transaction transaction();
+
+  /**
+   * Deprecated migrate to transaction().
+   */
+  @Deprecated
+  default Transaction getTransaction() {
+    return transaction();
+  }
+
+  /**
+   * Returns the bean type of the bean being deleted.
+   */
+  Class<?> beanType();
+
+  /**
+   * Deprecated migrate to beanType().
+   */
+  @Deprecated
+  default Class<?> getBeanType() {
+    return beanType();
+  }
 
   /**
    * Returns the Id value of the bean being deleted.
    */
-  Object getId();
+  Object id();
 
+  /**
+   * Deprecated migrate to id().
+   */
+  @Deprecated
+  default Object getId() {
+    return id();
+  }
 }

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

@@ -50,4 +50,17 @@ public interface BeanFindController {
    */
   <T> BeanCollection<T> findMany(BeanQueryRequest<T> request);
 
+  /**
+   * Allows post-processing of the find result.
+   */
+  default <T> BeanCollection<T> postProcessMany(BeanQueryRequest<T> request, BeanCollection<T> result) {
+    return result;
+  }
+
+  /**
+   * Allows post-processing of the find result.
+   */
+  default <T> T postProcess(BeanQueryRequest<T> request, T result) {
+    return result;
+  };
 }

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

@@ -1,5 +1,6 @@
 package io.ebean.event;
 
+import io.ebean.Database;
 import io.ebean.EbeanServer;
 import io.ebean.Transaction;
 import io.ebean.ValuePair;
@@ -17,20 +18,44 @@ import java.util.Set;
 public interface BeanPersistRequest<T> {
 
   /**
-   * Return the server processing the request.
+   * Return the DB processing the request.
    */
+  default Database database() {
+    return getEbeanServer();
+  }
+
+  /**
+   * Deprecated migrate to database().
+   */
+  @Deprecated
   EbeanServer getEbeanServer();
 
   /**
    * Return the Transaction associated with this request.
    */
-  Transaction getTransaction();
+  Transaction transaction();
+
+  /**
+   * Deprecated migrate to transaction().
+   */
+  @Deprecated
+  default Transaction getTransaction() {
+    return transaction();
+  }
 
   /**
    * For an update or delete of a partially populated bean this is the set of
    * loaded properties and otherwise returns null.
    */
-  Set<String> getLoadedProperties();
+  Set<String> loadedProperties();
+
+  /**
+   * Deprecated migrate to loadedProperties().
+   */
+  @Deprecated
+  default Set<String> getLoadedProperties() {
+    return loadedProperties();
+  }
 
   /**
    * For an update this is the set of properties that where updated.
@@ -39,12 +64,28 @@ public interface BeanPersistRequest<T> {
    * should be preferred if it satisfies the requirement.
    * </p>
    */
-  Set<String> getUpdatedProperties();
+  Set<String> updatedProperties();
+
+  /**
+   * Deprecated migrate to updatedProperties().
+   */
+  @Deprecated
+  default Set<String> getUpdatedProperties() {
+    return updatedProperties();
+  }
 
   /**
    * Flags set for dirty properties (used by ElasticSearch integration).
    */
-  boolean[] getDirtyProperties();
+  boolean[] dirtyProperties();
+
+  /**
+   * Deprecated migrate to updatedProperties().
+   */
+  @Deprecated
+  default boolean[] getDirtyProperties() {
+    return dirtyProperties();
+  }
 
   /**
    * Return true for an update request if at least one of dirty properties is contained
@@ -66,11 +107,27 @@ public interface BeanPersistRequest<T> {
   /**
    * Returns the bean being inserted updated or deleted.
    */
-  T getBean();
+  T bean();
+
+  /**
+   * Deprecated migrate to bean().
+   */
+  @Deprecated
+  default T getBean() {
+    return bean();
+  }
 
   /**
    * Returns a map of the properties that have changed and their new and old values.
    */
-  Map<String, ValuePair> getUpdatedValues();
+  Map<String, ValuePair> updatedValues();
+
+  /**
+   * Deprecated migrate to updatedValues().
+   */
+  @Deprecated
+  default Map<String, ValuePair> getUpdatedValues() {
+    return updatedValues();
+  }
 
 }

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

@@ -1,5 +1,6 @@
 package io.ebean.event;
 
+import io.ebean.Database;
 import io.ebean.EbeanServer;
 import io.ebean.Query;
 import io.ebean.Transaction;
@@ -10,19 +11,43 @@ import io.ebean.Transaction;
 public interface BeanQueryRequest<T> {
 
   /**
-   * Return the server processing the request.
+   * Return the DB processing the request.
    */
+  default Database database() {
+    return getEbeanServer();
+  }
+
+  /**
+   * Deprecated migrate to database().
+   */
+  @Deprecated
   EbeanServer getEbeanServer();
 
   /**
    * Return the Transaction associated with this request.
    */
-  Transaction getTransaction();
+  Transaction transaction();
+
+  /**
+   * Deprecated migrate to transaction().
+   */
+  @Deprecated
+  default Transaction getTransaction() {
+    return transaction();
+  }
 
   /**
    * Returns the query.
    */
-  Query<T> getQuery();
+  Query<T> query();
+
+  /**
+   * Deprecated migrate to query().
+   */
+  @Deprecated
+  default Query<T> getQuery() {
+    return query();
+  }
 
   /**
    * Return true if an Id IN expression should have the bind parameters padded.

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

@@ -8,7 +8,15 @@ public interface BulkTableEvent {
   /**
    * Return the name of the table that was involved.
    */
-  String getTableName();
+  String tableName();
+
+  /**
+   * Deprecated migrate to tableName().
+   */
+  @Deprecated
+  default String getTableName() {
+    return tableName();
+  }
 
   /**
    * Return true if rows were inserted.

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

@@ -20,18 +20,13 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public final class ShutdownManager {
 
-  private static final Logger logger = LoggerFactory.getLogger(ShutdownManager.class);
-
+  private static final Logger log = LoggerFactory.getLogger("io.ebean");
   private static final ReentrantLock lock = new ReentrantLock();
-
   private static final List<Database> databases = new ArrayList<>();
-
   private static final ShutdownHook shutdownHook = new ShutdownHook();
 
   private static boolean stopping;
-
   private static SpiContainer container;
-
   static {
     // Register the Shutdown hook
     registerShutdownHook();
@@ -125,8 +120,8 @@ public final class ShutdownManager {
         // Already run shutdown...
         return;
       }
-      if (logger.isDebugEnabled()) {
-        logger.debug("Shutting down");
+      if (log.isDebugEnabled()) {
+        log.debug("Ebean shutting down");
       }
       stopping = true;
       deregisterShutdownHook();
@@ -138,7 +133,7 @@ public final class ShutdownManager {
           Runnable r = (Runnable) ClassUtil.newInstance(shutdownRunner);
           r.run();
         } catch (Exception e) {
-          logger.error("Error running custom shutdown runnable", e);
+          log.error("Error running custom shutdown runnable", e);
         }
       }
 
@@ -152,7 +147,7 @@ public final class ShutdownManager {
         try {
           server.shutdown();
         } catch (Exception ex) {
-          logger.error("Error executing shutdown runnable", ex);
+          log.error("Error executing shutdown runnable", ex);
           ex.printStackTrace();
         }
       }
@@ -170,10 +165,10 @@ public final class ShutdownManager {
     while (drivers.hasMoreElements()) {
       Driver driver = drivers.nextElement();
       try {
-        logger.info("De-registering jdbc driver: " + driver);
+        log.info("De-registering jdbc driver: " + driver);
         DriverManager.deregisterDriver(driver);
       } catch (SQLException e) {
-        logger.error("Error de-registering driver " + driver, e);
+        log.error("Error de-registering driver " + driver, e);
       }
     }
   }

ebean-api/src/main/java/io/ebean/metric/QueryPlanMetric.java

@@ -10,7 +10,15 @@ public interface QueryPlanMetric {
   /**
    * Return the underlying timed metric.
    */
-  TimedMetric getMetric();
+  TimedMetric metric();
+
+  /**
+   * Deprecated migrate to metric().
+   */
+  @Deprecated
+  default TimedMetric getMetric() {
+    return metric();
+  }
 
   /**
    * Visit the underlying metric.

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

@@ -16,11 +16,27 @@ public interface BeanDocType<T> {
   /**
    * Return the doc store index type for this bean type.
    */
+  default String indexType() {
+    return getIndexType();
+  }
+
+  /**
+   * Deprecated migrate to indexType().
+   */
+  @Deprecated
   String getIndexType();
 
   /**
    * Return the doc store index name for this bean type.
    */
+  default String indexName() {
+    return getIndexName();
+  }
+
+  /**
+   * Deprecated migrate to indexName().
+   */
+  @Deprecated
   String getIndexName();
 
   /**
@@ -32,12 +48,28 @@ public interface BeanDocType<T> {
   /**
    * Return the FetchPath for the embedded document.
    */
+  default FetchPath embedded(String path) {
+    return getEmbedded(path);
+  }
+
+  /**
+   * Deprecated migrate to embedded().
+   */
+  @Deprecated
   FetchPath getEmbedded(String path);
 
   /**
    * For embedded 'many' properties we need a FetchPath relative to the root which is used to
    * build and replace the embedded list.
    */
+  default FetchPath embeddedManyRoot(String path) {
+    return getEmbeddedManyRoot(path);
+  }
+
+  /**
+   * Deprecated migrate to embeddedManyRoot().
+   */
+  @Deprecated
   FetchPath getEmbeddedManyRoot(String path);
 
   /**

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

@@ -22,24 +22,56 @@ public interface BeanType<T> {
    * Return the short name of the bean type.
    */
   @Nonnull
-  String getName();
+  String name();
+
+  /**
+   * Deprecated migrate to name().
+   */
+  @Deprecated
+  default String getName() {
+    return name();
+  }
 
   /**
    * Return the full name of the bean type.
    */
   @Nonnull
-  String getFullName();
+  String fullName();
+
+  /**
+   * Deprecated migrate to fullName().
+   */
+  @Deprecated
+  default String getFullName() {
+    return fullName();
+  }
 
   /**
    * Return the class type this BeanDescriptor describes.
    */
   @Nonnull
-  Class<T> getBeanType();
+  Class<T> type();
+
+  /**
+   * Deprecated migrate to type().
+   */
+  @Deprecated
+  default Class<T> getBeanType() {
+    return type();
+  }
 
   /**
    * Return the type bean for an OneToMany or ManyToOne or ManyToMany property.
    */
-  BeanType<?> getBeanTypeAtPath(String propertyName);
+  BeanType<?> beanTypeAtPath(String propertyName);
+
+  /**
+   * Deprecated migrate to beanTypeAtPath().
+   */
+  @Deprecated
+  default BeanType<?> getBeanTypeAtPath(String propertyName) {
+    return beanTypeAtPath(propertyName);
+  }
 
   /**
    * Return all the properties for this bean type.
@@ -50,22 +82,54 @@ public interface BeanType<T> {
   /**
    * Return the Id property.
    */
-  Property getIdProperty();
+  Property idProperty();
+
+  /**
+   * Deprecated migrate to idProperty().
+   */
+  @Deprecated
+  default Property getIdProperty() {
+    return idProperty();
+  }
 
   /**
    * Return the when modified property if there is one defined.
    */
-  Property getWhenModifiedProperty();
+  Property whenModifiedProperty();
+
+  /**
+   * Deprecated migrate to idProperty().
+   */
+  @Deprecated
+  default Property getWhenModifiedProperty() {
+    return whenModifiedProperty();
+  }
 
   /**
    * Return the when created property if there is one defined.
    */
-  Property getWhenCreatedProperty();
+  Property whenCreatedProperty();
+
+  /**
+   * Deprecated migrate to idProperty().
+   */
+  @Deprecated
+  default Property getWhenCreatedProperty() {
+    return whenCreatedProperty();
+  }
 
   /**
    * Return the Property to read values from a bean.
    */
-  Property getProperty(String propertyName);
+  Property property(String propertyName);
+
+  /**
+   * Deprecated migrate to property().
+   */
+  @Deprecated
+  default Property getProperty(String propertyName) {
+    return property(propertyName);
+  }
 
   /**
    * Return the ExpressionPath for a given property path.
@@ -73,7 +137,15 @@ public interface BeanType<T> {
    * This can return a property or nested property path.
    * </p>
    */
-  ExpressionPath getExpressionPath(String path);
+  ExpressionPath expressionPath(String path);
+
+  /**
+   * Deprecated migrate to expressionPath().
+   */
+  @Deprecated
+  default ExpressionPath getExpressionPath(String path) {
+    return expressionPath(path);
+  }
 
   /**
    * Return true if the property is a valid known property or path for the given bean type.
@@ -108,7 +180,15 @@ public interface BeanType<T> {
   /**
    * Return the base table this bean type maps to.
    */
-  String getBaseTable();
+  String baseTable();
+
+  /**
+   * Deprecated migrate to baseTable().
+   */
+  @Deprecated
+  default String getBaseTable() {
+    return baseTable();
+  }
 
   /**
    * Create a new instance of the bean.
@@ -118,42 +198,99 @@ public interface BeanType<T> {
   /**
    * Return the bean id. This is the same as getBeanId() but without the generic type.
    */
-  Object beanId(Object bean);
+  Object id(Object bean);
 
   /**
-   * Return the id value for the given bean.
+   * Deprecated migrate to id()
    */
+  @Deprecated
+  default Object beanId(Object bean) {
+    return id(bean);
+  }
+
+  /**
+   * Deprecated migrate to id()
+   */
+  @Deprecated
   Object getBeanId(T bean);
 
   /**
    * Set the id value to the bean.
    */
-  void setBeanId(T bean, Object idValue);
+  void setId(T bean, Object idValue);
+
+  /**
+   * Deprecated migrate to setId()
+   */
+  @Deprecated
+  default void setBeanId(T bean, Object idValue) {
+    setId(bean, idValue);
+  }
 
   /**
    * Return the bean persist controller.
    */
-  BeanPersistController getPersistController();
+  BeanPersistController persistController();
+
+  /**
+   * Deprecated migrate to persistController()
+   */
+  @Deprecated
+  default BeanPersistController getPersistController() {
+    return persistController();
+  }
 
   /**
    * Return the bean persist listener.
    */
-  BeanPersistListener getPersistListener();
+  BeanPersistListener persistListener();
+
+  /**
+   * Deprecated migrate to persistListener()
+   */
+  @Deprecated
+  default BeanPersistListener getPersistListener() {
+    return persistListener();
+  }
 
   /**
    * Return the beanFinder. Usually null unless overriding the finder.
    */
-  BeanFindController getFindController();
+  BeanFindController findController();
+
+  /**
+   * Deprecated migrate to findController()
+   */
+  @Deprecated
+  default BeanFindController getFindController() {
+    return findController();
+  }
 
   /**
    * Return the BeanQueryAdapter or null if none is defined.
    */
-  BeanQueryAdapter getQueryAdapter();
+  BeanQueryAdapter queryAdapter();
+
+  /**
+   * Deprecated migrate to queryAdapter()
+   */
+  @Deprecated
+  default BeanQueryAdapter getQueryAdapter() {
+    return queryAdapter();
+  }
 
   /**
    * Return the identity generation type.
    */
-  IdType getIdType();
+  IdType idType();
+
+  /**
+   * Deprecated migrate to idType()
+   */
+  @Deprecated
+  default IdType getIdType() {
+    return idType();
+  }
 
   /**
    * Return true if this bean type has doc store backing.
@@ -167,12 +304,28 @@ public interface BeanType<T> {
    * for the document store.
    * </p>
    */
-  DocMapping getDocMapping();
+  DocMapping docMapping();
+
+  /**
+   * Deprecated migrate to docMapping()
+   */
+  @Deprecated
+  default DocMapping getDocMapping() {
+    return docMapping();
+  }
 
   /**
    * Return the doc store queueId for this bean type.
    */
-  String getDocStoreQueueId();
+  String docStoreQueueId();
+
+  /**
+   * Deprecated migrate to docStoreQueueId()
+   */
+  @Deprecated
+  default String getDocStoreQueueId() {
+    return docStoreQueueId();
+  }
 
   /**
    * Return the doc store support for this bean type.\
@@ -203,12 +356,28 @@ public interface BeanType<T> {
   /**
    * Returns all direct children of this beantype
    */
-  List<BeanType<?>> getInheritanceChildren();
+  List<BeanType<?>> inheritanceChildren();
 
   /**
-   * Returns the parent in inheritance hiearchy
+   * Deprecated migrate to inheritanceChildren()
    */
-  BeanType<?> getInheritanceParent();
+  @Deprecated
+  default List<BeanType<?>> getInheritanceChildren() {
+    return inheritanceChildren();
+  }
+
+  /**
+   * Returns the parent in inheritance hierarchy
+   */
+  BeanType<?> inheritanceParent();
+
+  /**
+   * Deprecated migrate to inheritanceParent()
+   */
+  @Deprecated
+  default BeanType<?> getInheritanceParent() {
+    return inheritanceParent();
+  }
 
   /**
    * Visit all children recursively
@@ -218,7 +387,15 @@ public interface BeanType<T> {
   /**
    * Return the discriminator column.
    */
-  String getDiscColumn();
+  String discColumn();
+
+  /**
+   * Deprecated migrate to discColumn()
+   */
+  @Deprecated
+  default String getDiscColumn() {
+    return discColumn();
+  }
 
   /**
    * Create a bean given the discriminator value.

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

@@ -37,7 +37,15 @@ public interface ExpressionPath {
   /**
    * Return the default StringParser for the scalar property.
    */
-  StringParser getStringParser();
+  StringParser stringParser();
+
+  /**
+   * Deprecated migrate to stringParser().
+   */
+  @Deprecated
+  default StringParser getStringParser() {
+    return stringParser();
+  }
 
   /**
    * For DateTime capable scalar types convert the long systemTimeMillis into
@@ -54,7 +62,15 @@ public interface ExpressionPath {
   /**
    * Return the underlying JDBC type or 0 if this is not a scalar type.
    */
-  int getJdbcType();
+  int jdbcType();
+
+  /**
+   * Deprecated migrate to jdbcType().
+   */
+  @Deprecated
+  default int getJdbcType() {
+    return jdbcType();
+  }
 
   /**
    * Return true if this is an ManyToOne or OneToOne associated bean property.
@@ -67,20 +83,52 @@ public interface ExpressionPath {
    * Typically used to produce id = ? expression strings.
    * </p>
    */
-  String getAssocIdExpression(String propName, String bindOperator);
+  String assocIdExpression(String propName, String bindOperator);
+
+  /**
+   * Deprecated migrate to assocIdExpression().
+   */
+  @Deprecated
+  default String getAssocIdExpression(String propName, String bindOperator) {
+    return assocIdExpression(propName, bindOperator);
+  }
 
   /**
    * Return the Id values for the given bean value.
    */
-  Object[] getAssocIdValues(EntityBean bean);
+  Object[] assocIdValues(EntityBean bean);
+
+  /**
+   * Deprecated migrate to assocIdValues().
+   */
+  @Deprecated
+  default Object[] getAssocIdValues(EntityBean bean) {
+    return assocIdValues(bean);
+  }
 
   /**
    * Return the underlying bean property.
    */
-  Property getProperty();
+  Property property();
+
+  /**
+   * Deprecated migrate to property().
+   */
+  @Deprecated
+  default Property getProperty() {
+    return property();
+  }
 
   /**
    * The ElPrefix plus name.
    */
-  String getElName();
+  String elName();
+
+  /**
+   * Deprecated migrate to elName().
+   */
+  @Deprecated
+  default String getElName() {
+    return elName();
+  }
 }

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

@@ -11,18 +11,42 @@ public interface Property {
    * Return the name of the property.
    */
   @Nonnull
-  String getName();
+  String name();
+
+  /**
+   * Deprecated migrate to name().
+   */
+  @Deprecated
+  default String getName() {
+    return name();
+  }
 
   /**
    * Return the type of the property.
    */
   @Nonnull
-  Class<?> getPropertyType();
+  Class<?> type();
+
+  /**
+   * Deprecated migrate to type().
+   */
+  @Deprecated
+  default Class<?> getPropertyType() {
+    return type();
+  }
 
   /**
    * Return the value of the property on the given bean.
    */
-  Object getVal(Object bean);
+  Object value(Object bean);
+
+  /**
+   * Deprecated migrate to value().
+   */
+  @Deprecated
+  default Object getVal(Object bean) {
+    return value(bean);
+  }
 
   /**
    * Return true if this is a OneToMany or ManyToMany property.

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

@@ -16,32 +16,80 @@ public interface SpiServer extends Database {
   /**
    * Return the DatabaseConfig.
    */
-  DatabaseConfig getServerConfig();
+  DatabaseConfig config();
+
+  /**
+   * Migrate to config().
+   */
+  @Deprecated
+  default DatabaseConfig getServerConfig() {
+    return config();
+  }
 
   /**
    * Return the DatabasePlatform for this database.
    */
-  DatabasePlatform getDatabasePlatform();
+  DatabasePlatform databasePlatform();
+
+  /**
+   * Migrate to config().
+   */
+  @Deprecated
+  default DatabasePlatform getDatabasePlatform() {
+    return databasePlatform();
+  }
 
   /**
    * Return all the bean types registered on this server instance.
    */
-  List<? extends BeanType<?>> getBeanTypes();
+  List<? extends BeanType<?>> beanTypes();
+
+  /**
+   * Migrate to beanTypes().
+   */
+  @Deprecated
+  default List<? extends BeanType<?>> getBeanTypes() {
+    return beanTypes();
+  }
 
   /**
    * Return the bean type for a given entity bean class.
    */
-  <T> BeanType<T> getBeanType(Class<T> beanClass);
+  <T> BeanType<T> beanType(Class<T> beanClass);
+
+  /**
+   * Migrate to beanType().
+   */
+  @Deprecated
+  default <T> BeanType<T> getBeanType(Class<T> beanClass) {
+    return beanType(beanClass);
+  }
 
   /**
    * Return the bean types mapped to the given base table.
    */
-  List<? extends BeanType<?>> getBeanTypes(String baseTableName);
+  List<? extends BeanType<?>> beanTypes(String baseTableName);
+
+  /**
+   * Migrate to beanTypes().
+   */
+  @Deprecated
+  default List<? extends BeanType<?>> getBeanTypes(String baseTableName) {
+    return beanTypes(baseTableName);
+  }
 
   /**
    * Return the bean type for a given doc store queueId.
    */
-  BeanType<?> getBeanTypeForQueueId(String queueId);
+  BeanType<?> beanTypeForQueueId(String queueId);
+
+  /**
+   * Migrate to beanTypes().
+   */
+  @Deprecated
+  default BeanType<?> getBeanTypeForQueueId(String queueId) {
+    return beanTypeForQueueId(queueId);
+  }
 
   /**
    * Return a BeanLoader.

ebean-api/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java

@@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory;
  */
 public class DefaultCsvCallback<T> implements CsvCallback<T> {
 
-  private static final Logger logger = LoggerFactory.getLogger(DefaultCsvCallback.class);
+  private static final Logger log = LoggerFactory.getLogger(DefaultCsvCallback.class);
 
   /**
    * The transaction to use (if not using CsvCallback).
@@ -124,13 +124,11 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
    */
   @Override
   public void processBean(int row, String[] line, T bean) {
-
     // assumes single bean or Cascade.PERSIST will save any
     // related beans (e.g. customer -> customer.billingAddress
     server.save(bean, transaction);
-
     if (logInfoFrequency > 0 && (row % logInfoFrequency == 0)) {
-      logger.info("processed " + row + " rows");
+      log.debug("processed {} rows", row);
     }
   }
 
@@ -139,11 +137,9 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
    */
   @Override
   public void end(int row) {
-
     commitTransactionIfCreated();
-
     exeTime = System.currentTimeMillis() - startTime;
-    logger.info("Csv finished, rows[" + row + "] exeMillis[" + exeTime + "]");
+    log.info("Csv finished, rows[{}] exeMillis[{}]", row, exeTime);
   }
 
   /**
@@ -159,23 +155,20 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
    * and batch size.
    */
   protected void initTransactionIfRequired() {
-
     transaction = server.currentTransaction();
     if (transaction == null || !transaction.isActive()) {
-
       transaction = server.beginTransaction();
       createdTransaction = true;
       if (persistBatchSize > 1) {
-        logger.info("Creating transaction, batchSize[" + persistBatchSize + "]");
+        log.debug("Creating transaction, batchSize[{}]", persistBatchSize);
         transaction.setBatchMode(true);
         transaction.setBatchSize(persistBatchSize);
         transaction.setGetGeneratedKeys(false);
-
       } else {
         // explicitly turn off JDBC batching in case
         // is has been turned on globally
         transaction.setBatchMode(false);
-        logger.info("Creating transaction with no JDBC batching");
+        log.debug("Creating transaction with no JDBC batching");
       }
     }
   }
@@ -187,7 +180,7 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
   protected void commitTransactionIfCreated() {
     if (createdTransaction) {
       transaction.commit();
-      logger.info("Committed transaction");
+      log.debug("Committed transaction");
     }
   }
 
@@ -198,7 +191,7 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
   protected void rollbackTransactionIfCreated(Throwable e) {
     if (createdTransaction) {
       transaction.rollback(e);
-      logger.info("Rolled back transaction");
+      log.debug("Rolled back transaction");
     }
   }
 

ebean-api/src/main/java/io/ebean/util/JdbcClose.java

@@ -13,7 +13,7 @@ import java.sql.Statement;
  */
 public class JdbcClose {
 
-  private static final Logger logger = LoggerFactory.getLogger(JdbcClose.class);
+  private static final Logger log = LoggerFactory.getLogger("io.ebean");
 
   /**
    * Close the resultSet logging if an error occurs.
@@ -24,7 +24,7 @@ public class JdbcClose {
         statement.close();
       }
     } catch (SQLException e) {
-      logger.warn("Error closing statement", e);
+      log.warn("Error closing statement", e);
     }
   }
 
@@ -37,7 +37,7 @@ public class JdbcClose {
         resultSet.close();
       }
     } catch (SQLException e) {
-      logger.warn("Error closing resultSet", e);
+      log.warn("Error closing resultSet", e);
     }
   }
 
@@ -50,7 +50,7 @@ public class JdbcClose {
         connection.close();
       }
     } catch (SQLException e) {
-      logger.warn("Error closing connection", e);
+      log.warn("Error closing connection", e);
     }
   }
 
@@ -63,7 +63,7 @@ public class JdbcClose {
         connection.rollback();
       }
     } catch (SQLException e) {
-      logger.warn("Error on connection rollback", e);
+      log.warn("Error on connection rollback", e);
     }
   }
 
@@ -76,7 +76,7 @@ public class JdbcClose {
         stmt.cancel();
       }
     } catch (SQLException e) {
-      logger.warn("Error on cancelling statement", e);
+      log.warn("Error on cancelling statement", e);
     }
   }
 }

ebean-api/src/main/java9/module-info.java

@@ -0,0 +1,58 @@
+module io.ebean.api {
+
+  uses io.ebean.config.AutoConfigure;
+  uses io.ebean.datasource.DataSourceAlertFactory;
+  uses io.ebean.metric.MetricFactory;
+  uses io.ebean.service.SpiContainerFactory;
+  uses io.ebean.service.SpiRawSqlService;
+  uses io.ebean.service.SpiProfileLocationFactory;
+  uses io.ebean.service.SpiFetchGroupService;
+
+  requires transitive java.sql;
+  requires transitive io.avaje.config;
+  requires transitive persistence.api;
+  requires transitive io.ebean.annotation;
+  requires transitive io.ebean.datasource.api;
+  requires transitive org.slf4j;
+
+  requires static io.ebean.types;
+  requires static io.avaje.jsr305x;
+  requires static com.fasterxml.jackson.core;
+  requires static javax.servlet.api;
+  requires static com.h2database;
+
+  exports io.ebean;
+  exports io.ebean.bean;
+  exports io.ebean.cache;
+  exports io.ebean.meta;
+  exports io.ebean.config;
+  exports io.ebean.config.dbplatform;
+  exports io.ebean.config.dbplatform.clickhouse;
+  exports io.ebean.config.dbplatform.h2;
+  exports io.ebean.config.dbplatform.db2;
+  exports io.ebean.config.dbplatform.cockroach;
+  exports io.ebean.config.dbplatform.hana;
+  exports io.ebean.config.dbplatform.hsqldb;
+  exports io.ebean.config.dbplatform.mariadb;
+  exports io.ebean.config.dbplatform.mysql;
+  exports io.ebean.config.dbplatform.nuodb;
+  exports io.ebean.config.dbplatform.oracle;
+  exports io.ebean.config.dbplatform.postgres;
+  exports io.ebean.config.dbplatform.sqlanywhere;
+  exports io.ebean.config.dbplatform.sqlite;
+  exports io.ebean.config.dbplatform.sqlserver;
+  exports io.ebean.event;
+  exports io.ebean.event.readaudit;
+  exports io.ebean.event.changelog;
+  exports io.ebean.common;
+  exports io.ebean.docstore;
+  exports io.ebean.plugin;
+  exports io.ebean.metric;
+  exports io.ebean.search;
+  exports io.ebean.service;
+  exports io.ebean.text;
+  exports io.ebean.text.json;
+  exports io.ebean.text.csv;
+  exports io.ebean.util;
+
+}

ebean-api/src/main/resources/META-INF/MANIFEST.MF

@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: io.ebean.api

ebean-api/src/test/java/io/ebean/config/dbplatform/DbDefaultValueTest.java

@@ -1,6 +1,6 @@
 package io.ebean.config.dbplatform;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Types;
 import java.time.LocalDate;

ebean-autotune/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.12.0</version>
   </parent>
 <!--  <parent>-->
 <!--    <groupId>org.avaje</groupId>-->
@@ -14,7 +14,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.11.1</tag>
+    <tag>ebean-parent-12.12.0</tag>
   </scm>
 
   <name>ebean autotune</name>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.11.1</version>
+      <version>12.12.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -46,9 +46,9 @@
     </dependency>
 
     <dependency>
-      <groupId>org.avaje.composite</groupId>
+      <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.1</version>
+      <version>1.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -59,27 +59,16 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.19</version>
+        <version>2.24</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
-            <!-- other tiles ... -->
-            <tile>io.ebean.tile:enhancement:12.6.0</tile>
+            <tile>io.ebean.tile:enhancement:12.11.3</tile>
+            <tile>io.avaje.tile:moditech-module:1.0</tile>
           </tiles>
         </configuration>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.5</version>
-        <configuration>
-          <archive>
-            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-
     </plugins>
   </build>
 </project>

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

@@ -59,7 +59,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
     this.tuningFile = config.getQueryTuningFile();
     this.profilingFile = config.getProfilingFile();
     this.profilingUpdateFrequency = config.getProfilingUpdateFrequency();
-    this.serverName = server.getName();
+    this.serverName = server.name();
     this.profileManager = new ProfileManager(config, server);
     this.queryTuner = new BaseQueryTuner(config, server, profileManager);
     this.skipGarbageCollectionOnShutdown = config.isSkipGarbageCollectionOnShutdown();
@@ -77,7 +77,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
       loadTuningFile();
       if (isRuntimeTuningUpdates()) {
         // periodically gather and update query tuning
-        server.getBackgroundExecutor().scheduleWithFixedDelay(new ProfilingUpdate(), profilingUpdateFrequency, profilingUpdateFrequency, TimeUnit.SECONDS);
+        server.backgroundExecutor().scheduleWithFixedDelay(new ProfilingUpdate(), profilingUpdateFrequency, profilingUpdateFrequency, TimeUnit.SECONDS);
       }
     }
   }

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

@@ -111,7 +111,7 @@ public class ProfileManager implements ProfilingListener {
   public AutoTuneCollection profilingCollection(boolean reset) {
     AutoTuneCollection req = new AutoTuneCollection();
     for (ProfileOrigin origin : profileMap.values()) {
-      BeanDescriptor<?> desc = server.getBeanDescriptorById(origin.getOrigin().getBeanType());
+      BeanDescriptor<?> desc = server.descriptorById(origin.getOrigin().getBeanType());
       if (desc != null) {
         origin.profilingCollection(desc, req, reset);
       }

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

@@ -43,14 +43,14 @@ public class ProfileOriginNodeUsage {
     try {
       BeanDescriptor<?> desc = rootDesc;
       if (path != null) {
-        ElPropertyValue elGetValue = rootDesc.getElGetValue(path);
+        ElPropertyValue elGetValue = rootDesc.elGetValue(path);
         if (elGetValue == null) {
-          logger.warn("AutoTune: Can't find join for path[" + path + "] for " + rootDesc.getName());
+          logger.warn("AutoTune: Can't find join for path[" + path + "] for " + rootDesc.name());
           return;
         } else {
-          BeanProperty beanProperty = elGetValue.getBeanProperty();
+          BeanProperty beanProperty = elGetValue.beanProperty();
           if (beanProperty instanceof BeanPropertyAssoc<?>) {
-            desc = ((BeanPropertyAssoc<?>) beanProperty).getTargetDescriptor();
+            desc = ((BeanPropertyAssoc<?>) beanProperty).targetDescriptor();
           }
         }
       }
@@ -61,7 +61,7 @@ public class ProfileOriginNodeUsage {
       for (String propName : aggregateUsed) {
         BeanProperty beanProp = desc.findPropertyFromPath(propName);
         if (beanProp == null) {
-          logger.warn("AutoTune: Can't find property[" + propName + "] for " + desc.getName());
+          logger.warn("AutoTune: Can't find property[" + propName + "] for " + desc.name());
 
         } else {
           if (beanProp.isId()) {
@@ -76,24 +76,24 @@ public class ProfileOriginNodeUsage {
               // (which is the default for Lob's so typical).
             } else {
               addedToPath = true;
-              pathProps.addToPath(path, beanProp.getName());
+              pathProps.addToPath(path, beanProp.name());
             }
           }
         }
       }
 
       if ((modified || addVersionProperty) && desc != null) {
-        BeanProperty versionProp = desc.getVersionProperty();
+        BeanProperty versionProp = desc.versionProperty();
         if (versionProp != null) {
           addedToPath = true;
-          pathProps.addToPath(path, versionProp.getName());
+          pathProps.addToPath(path, versionProp.name());
         }
       }
 
       if (toOneIdProperty != null && !addedToPath) {
         // add ToOne property to parent path
-        ElPropertyValue assocOne = rootDesc.getElGetValue(path);
-        pathProps.addToPath(SplitName.parent(path), assocOne.getName());
+        ElPropertyValue assocOne = rootDesc.elGetValue(path);
+        pathProps.addToPath(SplitName.parent(path), assocOne.name());
       }
     } finally {
       lock.unlock();

ebean-autotune/src/main/java9/module-info.java

@@ -0,0 +1,15 @@
+import io.ebeaninternal.server.autotune.AutoTuneServiceProvider;
+import io.ebeaninternal.server.autotune.service.AutoTuneServiceFactory;
+
+/**
+ * Provider of AutoTuneServiceProvider
+ */
+module io.ebean.autotune {
+
+  provides AutoTuneServiceProvider with AutoTuneServiceFactory;
+
+  requires io.ebean.api;
+  requires io.ebean.core;
+  requires java.xml;
+  requires java.xml.bind;
+}

ebean-autotune/src/main/resources/META-INF/MANIFEST.MF

@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: io.ebean.autotune

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

@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.autotune.service;
 
 import io.ebeaninternal.server.autotune.model.Autotune;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.InputStream;

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

@@ -5,7 +5,7 @@ import io.ebean.bean.ObjectGraphNode;
 import io.ebean.bean.ObjectGraphOrigin;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.querydefn.OrmQueryDetail;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tests.autofetch.BaseTestCase;
 import org.tests.model.basic.Order;
 

ebean-autotune/src/test/java/org/tests/autofetch/BaseTestCase.java

@@ -11,6 +11,6 @@ public class BaseTestCase {
   }
 
   protected <T> BeanDescriptor<T> getBeanDescriptor(Class<T> cls) {
-    return spiEbeanServer().getBeanDescriptor(cls);
+    return spiEbeanServer().descriptor(cls);
   }
 }

ebean-bom/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.12.0</version>
   </parent>
 
   <name>ebean bom</name>
@@ -12,16 +12,6 @@
   <artifactId>ebean-bom</artifactId>
   <packaging>pom</packaging>
 
-  <properties>
-    <ebean-ddl-runner.version>1.0</ebean-ddl-runner.version>
-    <ebean-migration-auto.version>1.1</ebean-migration-auto.version>
-    <ebean-migration.version>12.11.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.11.0</ebean-agent.version>
-    <ebean-maven-plugin.version>12.11.0</ebean-maven-plugin.version>
-  </properties>
-
   <dependencyManagement>
 
     <dependencies>
@@ -81,88 +71,88 @@
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean</artifactId>
-        <version>12.11.1</version>
+        <version>12.12.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-api</artifactId>
-        <version>12.11.1</version>
+        <version>12.12.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core</artifactId>
-        <version>12.11.1</version>
+        <version>12.12.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-core-type</artifactId>
-        <version>12.11.1</version>
+        <version>12.12.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-ddl-generator</artifactId>
-        <version>12.11.1</version>
+        <version>12.12.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-api</artifactId>
-        <version>12.11.1</version>
+        <version>12.12.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-externalmapping-xml</artifactId>
-        <version>12.11.1</version>
+        <version>12.12.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-autotune</artifactId>
-        <version>12.11.1</version>
+        <version>12.12.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-querybean</artifactId>
-        <version>12.11.1</version>
+        <version>12.12.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>querybean-generator</artifactId>
-        <version>12.11.1</version>
+        <version>12.12.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>kotlin-querybean-generator</artifactId>
-        <version>12.11.1</version>
+        <version>12.12.0</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-test</artifactId>
-        <version>12.11.1</version>
+        <version>12.12.0</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-postgis</artifactId>
-        <version>12.11.1</version>
+        <version>12.12.0</version>
       </dependency>
 
       <dependency>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-redis</artifactId>
-        <version>12.11.1</version>
+        <version>12.12.0</version>
       </dependency>
 
     </dependencies>

ebean-core-type/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.12.0</version>
   </parent>
 
   <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.1</version>
+      <version>12.12.0</version>
     </dependency>
 
     <dependency>
@@ -28,4 +28,19 @@
 
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.repaint.maven</groupId>
+        <artifactId>tiles-maven-plugin</artifactId>
+        <version>2.24</version>
+        <extensions>true</extensions>
+        <configuration>
+          <tiles>
+            <tile>io.avaje.tile:moditech-module:1.0</tile>
+          </tiles>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

ebean-core-type/src/main/java9/module-info.java

@@ -0,0 +1,10 @@
+module io.ebean.core.type {
+
+  exports io.ebean.core.type;
+
+  requires transitive java.sql;
+  requires transitive io.ebean.api;
+
+  requires static com.fasterxml.jackson.core;
+
+}

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.11.1</version>
+    <version>12.12.0</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -15,35 +15,21 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>ebean-parent-12.11.1</tag>
+    <tag>ebean-parent-12.12.0</tag>
   </scm>
 
-  <profiles>
-    <profile>
-      <id>db2</id>
-      <dependencies>
-        <!-- https://mvnrepository.com/artifact/com.ibm.db2/jcc -->
-        <dependency>
-          <groupId>com.ibm.db2</groupId>
-          <artifactId>jcc</artifactId>
-          <version>11.5.5.0</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
   <dependencies>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddl-runner</artifactId>
-      <version>1.0</version>
+      <version>1.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>classpath-scanner</artifactId>
-      <version>6.0</version>
+      <version>6.2</version>
     </dependency>
 
     <dependency>
@@ -52,45 +38,22 @@
       <version>1.1</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>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-ddl-generator</artifactId>
-      <version>12.11.0</version>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- test scope for supporting ebean-ddl-generator -->
-    <dependency>
-      <groupId>org.glassfish.jaxb</groupId>
-      <artifactId>jaxb-runtime</artifactId>
-      <version>2.3.2</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.11.1</version>
+      <version>12.12.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.11.1</version>
+      <version>12.12.0</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.11.1</version>
+      <version>12.12.0</version>
     </dependency>
 
     <dependency>
@@ -105,8 +68,8 @@
     -->
     <dependency>
       <groupId>io.avaje</groupId>
-      <artifactId>avaje-jsr305</artifactId>
-      <version>1.0</version>
+      <artifactId>avaje-jsr305-x</artifactId>
+      <version>1.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -121,8 +84,8 @@
 
     <dependency>
       <groupId>javax.transaction</groupId>
-      <artifactId>jta</artifactId>
-      <version>1.1</version>
+      <artifactId>javax.transaction-api</artifactId>
+      <version>1.3</version>
       <optional>true</optional>
     </dependency>
 
@@ -130,7 +93,7 @@
     <dependency>
       <groupId>javax.validation</groupId>
       <artifactId>validation-api</artifactId>
-      <version>1.1.0.Final</version>
+      <version>2.0.1.Final</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -147,12 +110,12 @@
       <optional>true</optional>
     </dependency>
 
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-      <version>1.3.2</version>
-      <optional>true</optional>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>javax.annotation</groupId>-->
+<!--      <artifactId>javax.annotation-api</artifactId>-->
+<!--      <version>1.3.2</version>-->
+<!--      <optional>true</optional>-->
+<!--    </dependency>-->
 
     <!-- Jackson core used internally by Ebean -->
     <dependency>
@@ -186,114 +149,22 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>com.nuodb.jdbc</groupId>
-      <artifactId>nuodb-jdbc</artifactId>
-      <version>20.2.0</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.oracle.ojdbc</groupId>
-      <artifactId>ojdbc10</artifactId>
-      <version>19.3.0.0</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-test-docker</artifactId>
-      <version>4.1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <version>1.2.3</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.xerial</groupId>
-      <artifactId>sqlite-jdbc</artifactId>
-      <version>3.15.1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>2.3.4</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.microsoft.sqlserver</groupId>
-      <artifactId>mssql-jdbc</artifactId>
-      <version>7.2.2.jre8</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <version>8.0.17</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mariadb.jdbc</groupId>
-      <artifactId>mariadb-java-client</artifactId>
-      <version>2.6.0</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.sap.cloud.db.jdbc</groupId>
-      <artifactId>ngdbc</artifactId>
-      <version>2.3.48</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>3.0.0</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.avaje.composite</groupId>
-      <artifactId>junit</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.7</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>io.avaje</groupId>
-      <artifactId>mod-uuid</artifactId>
-      <version>1.1</version>
+      <artifactId>junit</artifactId>
+      <version>1.0</version>
       <scope>test</scope>
     </dependency>
 
   </dependencies>
 
-
   <build>
     <plugins>
 
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.10.0</version>
+        <version>${ebean-maven-plugin.version}</version>
         <executions>
           <execution>
             <id>test</id>
@@ -336,17 +207,6 @@
         </configuration>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.5</version>
-        <configuration>
-          <archive>
-            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
@@ -368,6 +228,18 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>io.repaint.maven</groupId>
+        <artifactId>tiles-maven-plugin</artifactId>
+        <version>2.24</version>
+        <extensions>true</extensions>
+        <configuration>
+          <tiles>
+            <tile>io.avaje.tile:moditech-module:1.0</tile>
+          </tiles>
+        </configuration>
+      </plugin>
+
     </plugins>
 
   </build>

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

@@ -6,7 +6,7 @@ import java.util.List;
 /**
  * The results of bean cache hit.
  */
-public class BeanCacheResult<T> {
+public final class BeanCacheResult<T> {
 
   private final List<Entry<T>> list = new ArrayList<>();
 
@@ -27,7 +27,7 @@ public class BeanCacheResult<T> {
   /**
    * Bean and cache key pair.
    */
-  static class Entry<T> {
+  static final class Entry<T> {
 
     private final T bean;
     private final Object key;

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

@@ -7,7 +7,7 @@ import java.io.IOException;
 /**
  * Context used to read binary format messages.
  */
-public class BinaryReadContext {
+public final class BinaryReadContext {
 
   private final DataInputStream in;
 

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

@@ -6,10 +6,9 @@ import java.io.IOException;
 /**
  * Context used to write binary message (like RemoteTransactionEvent).
  */
-public class BinaryWriteContext {
+public final class BinaryWriteContext {
 
   private final DataOutputStream out;
-
   private long counter;
 
   public BinaryWriteContext(DataOutputStream out) {

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

@@ -13,35 +13,28 @@ import java.util.Map.Entry;
  * Supports ordered or named parameters.
  * </p>
  */
-public class BindParams implements Serializable {
+public final class BindParams implements Serializable {
 
   private static final long serialVersionUID = 4541081933302086285L;
 
   private final List<Param> positionedParameters = new ArrayList<>();
-
   private final Map<String, Param> namedParameters = new LinkedHashMap<>();
-
   /**
    * This is the sql. For named parameters this is the sql after the named
    * parameters have been replaced with question mark place holders and the
    * parameters have been ordered by addNamedParamInOrder().
    */
   private String preparedSql;
-
   /**
    * Bind hash and count used to detect when the bind values have changed such
    * that the generated SQL (with named parameters) needs to be recalculated.
    */
   private String bindHash;
-
   /**
    * Helper to add positioned parameters in order.
    */
   private int addPos;
 
-  public BindParams() {
-  }
-
   /**
    * Reset positioned parameters (usually due to bind parameter expansion).
    */

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

@@ -9,7 +9,7 @@ import java.util.List;
  * The equals/hashCode implementation must meet the requirement that the query bind values
  * match for L2 query cache hit (given the query plan hash is already a match).
  */
-public class BindValuesKey {
+public final class BindValuesKey {
 
   private final List<Object> values = new ArrayList<>();
 

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.api;
 
-import io.ebeaninternal.server.expression.IdInExpression;
+import io.ebeaninternal.server.expression.IdInCommon;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -11,13 +11,12 @@ import java.util.Set;
 /**
  * Used for bean cache lookup with where ids in expression.
  */
-public class CacheIdLookupMany<T> implements CacheIdLookup<T> {
-
-  private final IdInExpression idInExpression;
+public final class CacheIdLookupMany<T> implements CacheIdLookup<T> {
 
+  private final IdInCommon idInExpression;
   private int remaining;
 
-  public CacheIdLookupMany(IdInExpression idInExpression) {
+  public CacheIdLookupMany(IdInCommon idInExpression) {
     this.idInExpression = idInExpression;
   }
 
@@ -35,15 +34,12 @@ public class CacheIdLookupMany<T> implements CacheIdLookup<T> {
    */
   @Override
   public List<T> removeHits(BeanCacheResult<T> cacheResult) {
-
     Set<Object> hitIds = new HashSet<>();
     List<T> beans = new ArrayList<>(hitIds.size());
-
     for (BeanCacheResult.Entry<T> hit : cacheResult.hits()) {
       hitIds.add(hit.getKey());
       beans.add(hit.getBean());
     }
-
     this.remaining = idInExpression.removeIds(hitIds);
     return beans;
   }

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

@@ -7,7 +7,7 @@ import java.util.List;
 /**
  * Used for bean cache lookup with a single id value.
  */
-public class CacheIdLookupSingle<T> implements CacheIdLookup<T> {
+public final class CacheIdLookupSingle<T> implements CacheIdLookup<T> {
 
   private final Object idValue;
   private boolean found;

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

@@ -0,0 +1,13 @@
+package io.ebeaninternal.api;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Common loggers used in ebean-core.
+ */
+public final class CoreLog {
+
+  public static final Logger log = LoggerFactory.getLogger("io.ebean.core");
+  public static final Logger internal = LoggerFactory.getLogger("io.ebean.internal");
+}

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

@@ -6,7 +6,7 @@ import io.ebean.annotation.Platform;
  * Helper to indicate that an EbeanServer should come up offline
  * typically for DDL generation purposes.
  */
-public class DbOffline {
+public final class DbOffline {
 
   private static final String KEY = "ebean.dboffline";
 

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

@@ -8,7 +8,7 @@ import io.ebean.metric.TimedMetric;
 /**
  * Extra metrics collected to measure internal behaviour.
  */
-public class ExtraMetrics {
+public final class ExtraMetrics {
 
   private final TimedMetric bindCapture;
   private final TimedMetric planCollect;

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

@@ -3,7 +3,7 @@ package io.ebeaninternal.api;
 /**
  * A hash key for a query including both the query plan and bind values.
  */
-public class HashQuery {
+public final class HashQuery {
 
   private final CQueryPlanKey planHash;
   private final BindValuesKey bindValuesKey;

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

@@ -6,7 +6,7 @@ import io.ebean.TxScope;
 /**
  * Helper object to make AOP generated code simpler.
  */
-public class HelpScopeTrans {
+public final class HelpScopeTrans {
   private static boolean enabled = true;
 
   /**

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

@@ -11,15 +11,15 @@ import java.util.List;
  */
 public interface LoadBeanBuffer {
 
-  int getBatchSize();
+  int batchSize();
 
-  List<EntityBeanIntercept> getBatch();
+  List<EntityBeanIntercept> batch();
 
-  BeanDescriptor<?> getBeanDescriptor();
+  BeanDescriptor<?> descriptor();
 
-  PersistenceContext getPersistenceContext();
+  PersistenceContext persistenceContext();
 
-  String getFullPath();
+  String fullPath();
 
   void configureQuery(SpiQuery<?> query, String lazyLoadProperty);
 

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

@@ -1,7 +1,8 @@
 package io.ebeaninternal.api;
 
-import io.ebean.bean.EntityBean;
+import io.ebean.CacheMode;
 import io.ebean.bean.EntityBeanIntercept;
+import io.ebeaninternal.api.SpiQuery.Mode;
 import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 
@@ -13,87 +14,60 @@ import java.util.Set;
 /**
  * Request for loading ManyToOne and OneToOne relationships.
  */
-public class LoadBeanRequest extends LoadRequest {
+public final class LoadBeanRequest extends LoadRequest {
 
   private final List<EntityBeanIntercept> batch;
-
   private final LoadBeanBuffer loadBuffer;
-
   private final String lazyLoadProperty;
-
   private final boolean loadCache;
-
-  private boolean loadedFromCache;
+  private final boolean alreadyLoaded;
 
   /**
    * Construct for lazy load request.
    */
-  public LoadBeanRequest(LoadBeanBuffer LoadBuffer, EntityBeanIntercept ebi, boolean loadCache) {
-    this(LoadBuffer, null, true, ebi.getLazyLoadProperty(), loadCache);
-    this.loadedFromCache = ebi.isLoadedFromCache();
+  public LoadBeanRequest(LoadBeanBuffer loadBuffer, EntityBeanIntercept ebi, boolean loadCache) {
+    this(loadBuffer, null, true, ebi.getLazyLoadProperty(), ebi.isLoaded(), loadCache || ebi.isLoadedFromCache());
   }
 
   /**
    * Construct for secondary query.
    */
-  public LoadBeanRequest(LoadBeanBuffer LoadBuffer, OrmQueryRequest<?> parentRequest) {
-    this(LoadBuffer, parentRequest, false, null, false);
+  public LoadBeanRequest(LoadBeanBuffer loadBuffer, OrmQueryRequest<?> parentRequest) {
+    this(loadBuffer, parentRequest, false, null, false, false);
   }
 
   private LoadBeanRequest(LoadBeanBuffer loadBuffer, OrmQueryRequest<?> parentRequest, boolean lazy,
-                          String lazyLoadProperty, boolean loadCache) {
-
+                          String lazyLoadProperty, boolean alreadyLoaded, boolean loadCache) {
     super(parentRequest, lazy);
     this.loadBuffer = loadBuffer;
-    this.batch = loadBuffer.getBatch();
+    this.batch = loadBuffer.batch();
     this.lazyLoadProperty = lazyLoadProperty;
+    this.alreadyLoaded = alreadyLoaded;
     this.loadCache = loadCache;
   }
 
   @Override
-  public Class<?> getBeanType() {
-    return loadBuffer.getBeanDescriptor().getBeanType();
+  public Class<?> beanType() {
+    return loadBuffer.descriptor().type();
   }
 
-  /**
-   * Return true if the beans invoking lazy loading were previously loaded from cache.
-   */
-  public boolean isLoadedFromCache() {
-    return loadedFromCache;
-  }
-
-  private boolean isLoadCache() {
-    return loadCache;
-  }
-
-  public String getDescription() {
-    return "path:" + loadBuffer.getFullPath() + " batch:" + batch.size();
+  public String description() {
+    return loadBuffer.fullPath();
   }
 
   /**
    * Return the batch of beans to actually load.
    */
-  public List<EntityBeanIntercept> getBatch() {
+  public List<EntityBeanIntercept> batch() {
     return batch;
   }
 
-  /**
-   * Return the load context.
-   */
-  private LoadBeanBuffer getLoadContext() {
-    return loadBuffer;
-  }
-
-  public int getBatchSize() {
-    return getLoadContext().getBatchSize();
-  }
-
   /**
    * Return the list of Id values for the beans in the lazy load buffer.
    */
   public List<Object> getIdList() {
     List<Object> idList = new ArrayList<>();
-    BeanDescriptor<?> desc = loadBuffer.getBeanDescriptor();
+    BeanDescriptor<?> desc = loadBuffer.descriptor();
     for (EntityBeanIntercept ebi : batch) {
       idList.add(desc.getId(ebi.getOwner()));
     }
@@ -104,16 +78,21 @@ public class LoadBeanRequest extends LoadRequest {
    * Configure the query for lazy loading execution.
    */
   public void configureQuery(SpiQuery<?> query, List<Object> idList) {
-    query.setMode(SpiQuery.Mode.LAZYLOAD_BEAN);
-    query.setPersistenceContext(loadBuffer.getPersistenceContext());
-    String mode = isLazy() ? "+lazy" : "+query";
-    query.setLoadDescription(mode, getDescription());
-
-    if (isLazy()) {
-      // cascade the batch size (if set) for further lazy loading
-      query.setLazyLoadBatchSize(getBatchSize());
+    query.setMode(Mode.LAZYLOAD_BEAN);
+    query.setPersistenceContext(loadBuffer.persistenceContext());
+    query.setLoadDescription(lazy ? "+lazy" : "+query", description());
+    if (lazy) {
+      query.setLazyLoadBatchSize(loadBuffer.batchSize());
+      if (alreadyLoaded) {
+        query.setBeanCacheMode(CacheMode.OFF);
+      }
+    } else {
+      query.setBeanCacheMode(CacheMode.OFF);
     }
     loadBuffer.configureQuery(query, lazyLoadProperty);
+    if (loadCache) {
+      query.setBeanCacheMode(CacheMode.PUT);
+    }
     if (idList.size() == 1) {
       query.where().idEq(idList.get(0));
     } else {
@@ -126,13 +105,12 @@ public class LoadBeanRequest extends LoadRequest {
    */
   public void postLoad(List<?> list) {
     Set<Object> loadedIds = new HashSet<>();
-    BeanDescriptor<?> desc = loadBuffer.getBeanDescriptor();
+    BeanDescriptor<?> desc = loadBuffer.descriptor();
     // collect Ids and maybe load bean cache
     for (Object bean : list) {
-      EntityBean loadedBean = (EntityBean) bean;
-      loadedIds.add(desc.getId(loadedBean));
+      loadedIds.add(desc.id(bean));
     }
-    if (isLoadCache()) {
+    if (loadCache) {
       desc.cacheBeanPutAll(list);
     }
     if (lazyLoadProperty != null) {

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

@@ -1,5 +1,6 @@
 package io.ebeaninternal.api;
 
+import io.ebean.CacheMode;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.core.BindPadding;
@@ -7,7 +8,6 @@ import io.ebeaninternal.server.core.OrmQueryRequest;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,16 +15,13 @@ import java.util.List;
 /**
  * Request for loading Associated Many Beans.
  */
-public class LoadManyRequest extends LoadRequest {
+public final class LoadManyRequest extends LoadRequest {
 
-  private static final Logger logger = LoggerFactory.getLogger(LoadManyRequest.class);
+  private static final Logger log = CoreLog.log;
 
   private final List<BeanCollection<?>> batch;
-
   private final LoadManyBuffer loadContext;
-
   private final boolean onlyIds;
-
   private final boolean loadCache;
 
   /**
@@ -50,96 +47,58 @@ public class LoadManyRequest extends LoadRequest {
   }
 
   @Override
-  public Class<?> getBeanType() {
-    return loadContext.getBeanDescriptor().getBeanType();
+  public Class<?> beanType() {
+    return loadContext.getBeanDescriptor().type();
   }
 
-  public String getDescription() {
-    return "path:" + loadContext.getFullPath() + " size:" + batch.size();
-  }
-
-  /**
-   * Return the batch of collections to actually load.
-   */
-  public List<BeanCollection<?>> getBatch() {
-    return batch;
-  }
-
-  /**
-   * Return true if lazy loading should only load the id values.
-   * <p>
-   * This for use when lazy loading is invoked on methods such as clear() and removeAll() where it
-   * generally makes sense to only fetch the Id values as the other property information is not
-   * used.
-   */
-  private boolean isOnlyIds() {
-    return onlyIds;
-  }
-
-  /**
-   * Return true if we should load the Collection ids into the cache.
-   */
-  private boolean isLoadCache() {
-    return loadCache;
-  }
-
-  /**
-   * Return the batch size used for this load context.
-   */
-  public int getBatchSize() {
-    return loadContext.getBatchSize();
+  public String description() {
+    return loadContext.getFullPath();
   }
 
   private List<Object> parentIdList(SpiEbeanServer server) {
     List<Object> idList = new ArrayList<>();
-    BeanPropertyAssocMany<?> many = getMany();
+    BeanPropertyAssocMany<?> many = many();
     for (BeanCollection<?> bc : batch) {
-      idList.add(many.getParentId(bc.getOwnerBean()));
+      idList.add(many.parentId(bc.getOwnerBean()));
       bc.setLoader(server); // don't use the load buffer again
     }
-    if (many.getTargetDescriptor().isPadInExpression()) {
+    if (many.targetDescriptor().isPadInExpression()) {
       BindPadding.padIds(idList);
     }
     return idList;
   }
 
-  private BeanPropertyAssocMany<?> getMany() {
+  private BeanPropertyAssocMany<?> many() {
     return loadContext.getBeanProperty();
   }
 
   public SpiQuery<?> createQuery(SpiEbeanServer server) {
-    BeanPropertyAssocMany<?> many = getMany();
+    BeanPropertyAssocMany<?> many = many();
     SpiQuery<?> query = many.newQuery(server);
-    String orderBy = many.getLazyFetchOrderBy();
+    String orderBy = many.lazyFetchOrderBy();
     if (orderBy != null) {
       query.order(orderBy);
     }
-
-    String extraWhere = many.getExtraWhere();
+    String extraWhere = many.extraWhere();
     if (extraWhere != null) {
       // replace special ${ta} placeholder with the base table alias
       // which is always t0 and add the extra where clause
       query.where().raw(extraWhere.replace("${ta}", "t0").replace("${mta}", "int_"));
     }
-
     query.setLazyLoadForParents(many);
     many.addWhereParentIdIn(query, parentIdList(server), loadContext.isUseDocStore());
     query.setPersistenceContext(loadContext.getPersistenceContext());
-
-    String mode = isLazy() ? "+lazy" : "+query";
-    query.setLoadDescription(mode, getDescription());
-
-    if (isLazy()) {
-      // cascade the batch size (if set) for further lazy loading
-      query.setLazyLoadBatchSize(getBatchSize());
+    query.setLoadDescription(lazy ? "+lazy" : "+query", description());
+    if (lazy) {
+      query.setLazyLoadBatchSize(loadContext.getBatchSize());
+    } else {
+      query.setBeanCacheMode(CacheMode.OFF);
     }
-
-    // potentially changes the joins and selected properties
+    // potentially changes the joins, selected properties, cache mode
     loadContext.configureQuery(query);
-
-    if (isOnlyIds()) {
-      // override to just select the Id values
-      query.select(many.getTargetIdProperty());
+    if (onlyIds) {
+      // lazy loading invoked via clear() and removeAll()
+      query.select(many.targetIdProperty());
     }
     return query;
   }
@@ -149,19 +108,18 @@ public class LoadManyRequest extends LoadRequest {
    */
   public void postLoad() {
     BeanDescriptor<?> desc = loadContext.getBeanDescriptor();
-    BeanPropertyAssocMany<?> many = getMany();
+    BeanPropertyAssocMany<?> many = many();
     // check for BeanCollection's that where never processed
     // in the +query or +lazy load due to no rows (predicates)
     for (BeanCollection<?> bc : batch) {
       if (bc.checkEmptyLazyLoad()) {
-        if (logger.isDebugEnabled()) {
+        if (log.isDebugEnabled()) {
           EntityBean ownerBean = bc.getOwnerBean();
           Object parentId = desc.getId(ownerBean);
-          logger.debug("BeanCollection after lazy load was empty. type:" + ownerBean.getClass().getName() + " id:" + parentId + " owner:" + ownerBean);
+          log.debug("BeanCollection after lazy load was empty. type:" + ownerBean.getClass().getName() + " id:" + parentId + " owner:" + ownerBean);
         }
-      } else if (isLoadCache() && many.isUseCache()) {
-        Object parentId = desc.getId(bc.getOwnerBean());
-        desc.cacheManyPropPut(many, bc, parentId);
+      } else if (loadCache && many.isUseCache()) {
+        desc.cacheManyPropPut(many, bc, desc.getId(bc.getOwnerBean()));
       }
     }
   }

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

@@ -9,22 +9,19 @@ import io.ebeaninternal.server.core.OrmQueryRequest;
 public abstract class LoadRequest {
 
   protected final OrmQueryRequest<?> parentRequest;
-
   protected final Transaction transaction;
-
   protected final boolean lazy;
 
-  public LoadRequest(OrmQueryRequest<?> parentRequest, boolean lazy) {
-
+  LoadRequest(OrmQueryRequest<?> parentRequest, boolean lazy) {
     this.parentRequest = parentRequest;
-    this.transaction = parentRequest == null ? null : parentRequest.getTransaction();
+    this.transaction = parentRequest == null ? null : parentRequest.transaction();
     this.lazy = lazy;
   }
 
   /**
    * Return the associated bean type for this load request.
    */
-  public abstract Class<?> getBeanType();
+  public abstract Class<?> beanType();
 
   /**
    * Return true if this is a lazy load and false if it is a secondary query.
@@ -39,7 +36,7 @@ public abstract class LoadRequest {
    * Lazy loading queries run in their own transaction.
    * </p>
    */
-  public Transaction getTransaction() {
+  public Transaction transaction() {
     return transaction;
   }
 
@@ -48,6 +45,6 @@ public abstract class LoadRequest {
    * So one of - findIterate(), findEach(), findEachWhile() or findVisit().
    */
   public boolean isParentFindIterate() {
-    return parentRequest != null && parentRequest.getQuery().getType() == SpiQuery.Type.ITERATE;
+    return parentRequest != null && parentRequest.query().getType() == SpiQuery.Type.ITERATE;
   }
 }

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

@@ -9,7 +9,9 @@ import io.ebeaninternal.server.query.SqlJoinType;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
@@ -17,16 +19,13 @@ import java.util.TreeSet;
  * Holds the joins needs to support the many where predicates.
  * These joins are independent of any 'fetch' joins on the many.
  */
-public class ManyWhereJoins implements Serializable {
+public final class ManyWhereJoins implements Serializable {
 
   private static final long serialVersionUID = -6490181101871795417L;
 
   private final TreeMap<String, PropertyJoin> joins = new TreeMap<>();
-
-  private List<String> formulaJoinProperties;
-
+  private Map<String, List<String>> formulaJoinProperties;
   private boolean aggregation;
-
   /**
    * 'Mode' indicating that joins added while this is true are required to be outer joins.
    */
@@ -52,15 +51,15 @@ public class ManyWhereJoins implements Serializable {
    */
   public void add(ElPropertyDeploy elProp) {
 
-    String join = elProp.getElPrefix();
-    BeanProperty p = elProp.getBeanProperty();
+    String join = elProp.elPrefix();
+    BeanProperty p = elProp.beanProperty();
     if (p instanceof BeanPropertyAssocMany<?>) {
-      join = addManyToJoin(join, p.getName());
+      join = addManyToJoin(join, p.name());
     }
     if (join != null) {
       addJoin(join);
       if (p != null) {
-        String secondaryTableJoinPrefix = p.getSecondaryTableJoinPrefix();
+        String secondaryTableJoinPrefix = p.secondaryTableJoinPrefix();
         if (secondaryTableJoinPrefix != null) {
           addJoin(join + "." + secondaryTableJoinPrefix);
         }
@@ -124,25 +123,25 @@ public class ManyWhereJoins implements Serializable {
    * In findCount query found a formula property with a join clause so building a select clause
    * specifically for the findCount query.
    */
-  public void addFormulaWithJoin(String propertyName) {
+  public void addFormulaWithJoin(String prefix, String name) {
     if (formulaJoinProperties == null) {
-      formulaJoinProperties = new ArrayList<>();
+      formulaJoinProperties = new HashMap<>();
     }
-    formulaJoinProperties.add(propertyName);
+    formulaJoinProperties.computeIfAbsent(prefix, k -> new ArrayList<>()).add(name);
   }
 
   /**
    * Return true if the query select includes a formula with join.
    */
-  public boolean isFormulaWithJoin() {
-    return formulaJoinProperties != null;
+  public boolean isFormulaWithJoin(String prefix) {
+    return formulaJoinProperties != null && formulaJoinProperties.containsKey(prefix);
   }
 
   /**
    * Return the formula properties to build the select clause for a findCount query.
    */
-  public List<String> getFormulaJoinProperties() {
-    return formulaJoinProperties;
+  public List<String> getFormulaJoinProperties(String prefix) {
+    return formulaJoinProperties.get(prefix);
   }
 
   /**

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

@@ -1,12 +0,0 @@
-package io.ebeaninternal.api;
-
-import java.io.Serializable;
-
-/**
- * Object used as a synchronization monitor that is serializable.
- */
-public class Monitor implements Serializable {
-
-  private static final long serialVersionUID = -2741687226680981940L;
-
-}

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

@@ -11,7 +11,7 @@ import java.util.Map;
 /**
  * Natural key entry with name value pairs for each of the properties making up the key.
  */
-class NaturalKeyEntryBasic implements NaturalKeyEntry {
+final class NaturalKeyEntryBasic implements NaturalKeyEntry {
 
   private final Map<String,Object> map = new HashMap<>();
   private final String key;

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

@@ -1,6 +1,6 @@
 package io.ebeaninternal.api;
 
-class NaturalKeyEntrySimple implements NaturalKeyEntry {
+final class NaturalKeyEntrySimple implements NaturalKeyEntry {
 
   private final String key;
   private final Object val;

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

@@ -3,7 +3,7 @@ package io.ebeaninternal.api;
 /**
  * A property value pair in a natural key lookup.
  */
-public class NaturalKeyEq {
+public final class NaturalKeyEq {
 
   final String property;
   final Object value;

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

@@ -11,28 +11,22 @@ import java.util.Set;
 /**
  * Collects the data for processing the natural key cache processing.
  */
-public class NaturalKeyQueryData<T> {
+public final class NaturalKeyQueryData<T> {
 
   private final BeanNaturalKey naturalKey;
-
   /**
    * Only one of IN or IN PAIRS is allowed.
    */
   private boolean hasIn;
-
   // IN Pairs clause - only one allowed
   private String inProperty0, inProperty1;
   private List<Pairs.Entry> inPairs;
-
   // IN clause - only one allowed
   private List<Object> inValues;
   private String inProperty;
-
   // normal EQ expressions
   private List<NaturalKeyEq> eqList;
-
   private NaturalKeySet set;
-
   private int hitCount;
 
   public NaturalKeyQueryData(BeanNaturalKey naturalKey) {

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

@@ -4,8 +4,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
-public class NaturalKeySet {
-
+public final class NaturalKeySet {
 
   private final Map<Object, NaturalKeyEntry> map = new LinkedHashMap<>();
 

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

@@ -2,7 +2,7 @@ package io.ebeaninternal.api;
 
 import io.ebeaninternal.server.type.bindcapture.BindCapture;
 
-class NoopQueryBindCapture implements SpiQueryBindCapture {
+final class NoopQueryBindCapture implements SpiQueryBindCapture {
 
   @Override
   public boolean collectFor(long timeMicros) {

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

@@ -6,7 +6,7 @@ import io.ebean.meta.QueryPlanRequest;
 import java.util.Collections;
 import java.util.List;
 
-class NoopQueryPlanManager implements QueryPlanManager {
+final class NoopQueryPlanManager implements QueryPlanManager {
 
   @Override
   public void setDefaultThreshold(long thresholdMicros) {

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

@@ -3,7 +3,7 @@ package io.ebeaninternal.api;
 import io.ebean.annotation.Platform;
 import io.ebean.util.StringHelper;
 
-public class PlatformMatch {
+public final class PlatformMatch {
 
   /**
    * Return true if the script platforms is a match/supported for the given platform.
@@ -15,7 +15,6 @@ public class PlatformMatch {
     if (platforms == null || platforms.trim().isEmpty()) {
       return true;
     }
-
     // match on base platform name and platform name
     for (String name : StringHelper.splitNames(platforms)) {
       if (name.equalsIgnoreCase(platform.base().name()) || name.equalsIgnoreCase(platform.name())) {

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

@@ -5,16 +5,9 @@ import io.ebeaninternal.server.query.SqlJoinType;
 /**
  * Represents a join required for a given property and whether than needs to be an outer join.
  */
-public class PropertyJoin {
+public final class PropertyJoin {
 
-  /**
-   * The property name.
-   */
   private final String property;
-
-  /**
-   * Set to true if the property needs to be an outer join.
-   */
   private final SqlJoinType joinType;
 
   public PropertyJoin(String property, SqlJoinType joinType) {

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

@@ -7,7 +7,7 @@ import java.util.ArrayList;
 /**
  * Used internally to handle the scoping of transactions for methods.
  */
-public class ScopeTrans {
+public final class ScopeTrans {
 
   private static final int OPCODE_ATHROW = 191;
 
@@ -15,43 +15,32 @@ public class ScopeTrans {
    * The transaction in scope (can be null).
    */
   private final SpiTransaction transaction;
-
   /**
    * If true by default rollback on Checked exceptions.
    */
   private final boolean rollbackOnChecked;
-
   /**
    * True if the transaction was created and hence should be committed
    * on finally if it hasn't already been rolled back.
    */
   private final boolean created;
-
   /**
    * Explicit set of Exceptions that DO NOT cause a rollback to occur.
    */
   private final ArrayList<Class<? extends Throwable>> noRollbackFor;
-
   /**
    * Explicit set of Exceptions that DO cause a rollback to occur.
    */
   private final ArrayList<Class<? extends Throwable>> rollbackFor;
-
   private Boolean restoreBatch;
-
   private Boolean restoreBatchOnCascade;
-
   private int restoreBatchSize;
-
   private Boolean restoreBatchGeneratedKeys;
-
   private boolean restoreBatchFlushOnQuery;
-
   /**
    * Flag set when a rollback has occurred.
    */
   private boolean rolledBack;
-
   /**
    * Flag set when nested commit has occurred.
    */

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

@@ -10,15 +10,13 @@ import javax.persistence.PersistenceException;
  *
  * These can be nested and internally they are pushed and popped from a stack.
  */
-public class ScopedTransaction extends SpiTransactionProxy {
+public final class ScopedTransaction extends SpiTransactionProxy {
 
   private final TransactionScopeManager manager;
-
   /**
    * Stack of 'nested' transactions.
    */
   private final ArrayStack<ScopeTrans> stack = new ArrayStack<>();
-
   private ScopeTrans current;
 
   /**

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

@@ -8,6 +8,6 @@ public interface SpiBeanTypeManager {
   /**
    * Return the bean type for the given entity class.
    */
-  SpiBeanType getBeanType(Class<?> entityType);
+  SpiBeanType beanType(Class<?> entityType);
 
 }

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

@@ -36,11 +36,6 @@ public interface SpiDtoQuery<T> extends DtoQuery<T>, SpiSqlBinding {
    */
   boolean isRelaxedMode();
 
-  /**
-   * Return the label for the query.
-   */
-  String getLabel();
-
   /**
    * Return the label with fallback to profile location label.
    */

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

@@ -8,6 +8,7 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetricVisitor;
+import io.ebean.plugin.SpiServer;
 import io.ebeaninternal.api.SpiQuery.Type;
 import io.ebeaninternal.server.core.SpiResultSet;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
@@ -23,7 +24,7 @@ import java.util.stream.Stream;
 /**
  * Service Provider extension to EbeanServer.
  */
-public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollectionLoader {
+public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer, BeanCollectionLoader {
 
   /**
    * Return true if the L2 cache has been disabled.
@@ -50,16 +51,6 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollect
    */
   Object currentTenantId();
 
-  /**
-   * Return the server configuration.
-   */
-  DatabaseConfig getServerConfig();
-
-  /**
-   * Return the DatabasePlatform for this server.
-   */
-  DatabasePlatform getDatabasePlatform();
-
   /**
    * Create an object to represent the current CallStack.
    * <p>
@@ -72,7 +63,7 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollect
   /**
    * Return the PersistenceContextScope to use defined at query or server level.
    */
-  PersistenceContextScope getPersistenceContextScope(SpiQuery<?> query);
+  PersistenceContextScope persistenceContextScope(SpiQuery<?> query);
 
   /**
    * Clear the query execution statistics.
@@ -82,32 +73,32 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollect
   /**
    * Return the transaction manager.
    */
-  SpiTransactionManager getTransactionManager();
+  SpiTransactionManager transactionManager();
 
   /**
    * Return all the descriptors.
    */
-  List<BeanDescriptor<?>> getBeanDescriptors();
+  List<BeanDescriptor<?>> descriptors();
 
   /**
    * Return the BeanDescriptor for a given type of bean.
    */
-  <T> BeanDescriptor<T> getBeanDescriptor(Class<T> type);
+  <T> BeanDescriptor<T> descriptor(Class<T> type);
 
   /**
    * Return BeanDescriptor using it's unique id.
    */
-  BeanDescriptor<?> getBeanDescriptorById(String className);
+  BeanDescriptor<?> descriptorById(String className);
 
   /**
    * Return BeanDescriptor using it's unique doc store queueId.
    */
-  BeanDescriptor<?> getBeanDescriptorByQueueId(String queueId);
+  BeanDescriptor<?> descriptorByQueueId(String queueId);
 
   /**
    * Return BeanDescriptors mapped to this table.
    */
-  List<BeanDescriptor<?>> getBeanDescriptors(String tableName);
+  List<BeanDescriptor<?>> descriptors(String tableName);
 
   /**
    * Process committed changes from another framework.
@@ -179,7 +170,7 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollect
   /**
    * Return the default batch size for lazy loading.
    */
-  int getLazyLoadBatchSize();
+  int lazyLoadBatchSize();
 
   /**
    * Return true if the type is known as an Entity or Xml type or a List Set or
@@ -190,18 +181,18 @@ public interface SpiEbeanServer extends ExtendedServer, EbeanServer, BeanCollect
   /**
    * Return the ReadAuditLogger to use for logging all read audit events.
    */
-  ReadAuditLogger getReadAuditLogger();
+  ReadAuditLogger readAuditLogger();
 
   /**
    * Return the ReadAuditPrepare used to populate the read audit events with
    * user context information (user id, user ip address etc).
    */
-  ReadAuditPrepare getReadAuditPrepare();
+  ReadAuditPrepare readAuditPrepare();
 
   /**
    * Return the DataTimeZone to use when reading/writing timestamps via JDBC.
    */
-  DataTimeZone getDataTimeZone();
+  DataTimeZone dataTimeZone();
 
   /**
    * Check for slow query event.