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

* ADD: failing testcase for orderColumn when tree depth > 1

* FIX: no update with @OrderColumn on treeDepth > 1 and avoid needless updates

* ADD: failing testcase for removing models in oneToMany relation with @OrderColumn

Signed-off-by: Jonas Pöhler (JPo) <jonas.poehler@foconis.de>

* ADD: failing test for faulty element reordering in a entityBean tree with version

Signed-off-by: Jonas Pöhler (JPo) <jonas.poehler@foconis.de>

* FIX: incorrect behaviour when reordering or removing elements from collection with @OrderColumn.

Signed-off-by: Jonas Pöhler (JPo) <jonas.poehler@foconis.de>

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>12.1.14-SNAPSHOT</version>
+  <version>12.2.6</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -22,7 +22,7 @@
 
   <scm>
     <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>ebean-12.2.6</tag>
   </scm>
 
   <profiles>
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>config</artifactId>
-      <version>1.0</version>
+      <version>1.2</version>
     </dependency>
 
     <!--
@@ -72,22 +72,22 @@
     to assist with IDE auto-completion with Ebean API
     -->
     <dependency>
-      <groupId>io.ebean</groupId>
-      <artifactId>ebean-jsr305</artifactId>
-      <version>1.1</version>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-jsr305</artifactId>
+      <version>1.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>persistence-api</artifactId>
-      <version>2.2.2</version>
+      <version>2.2.4</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-annotation</artifactId>
-      <version>6.9</version>
+      <version>6.11</version>
     </dependency>
 
     <dependency>
@@ -292,7 +292,7 @@
       <plugin>
         <groupId>io.ebean</groupId>
         <artifactId>ebean-maven-plugin</artifactId>
-        <version>12.1.12</version>
+        <version>12.2.4</version>
         <executions>
           <execution>
             <id>test</id>

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

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

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

@@ -313,7 +313,7 @@ public interface Transaction extends AutoCloseable {
    * <h3>getGeneratedKeys</h3>
    * <p>
    * Often with large batch inserts we want to turn off getGeneratedKeys. We do
-   * this via {@link #setBatchGetGeneratedKeys(boolean)}.
+   * this via {@link #setGetGeneratedKeys(boolean)}.
    * Also note that some JDBC drivers do not support getGeneratedKeys in JDBC batch mode.
    * </p>
    * <pre>{@code
@@ -342,7 +342,7 @@ public interface Transaction extends AutoCloseable {
    * </p>
    * <p>
    * We use {@link #flush()} to explicitly flush the batch and we can use
-   * {@link #setBatchFlushOnQuery(boolean)} and {@link #setBatchFlushOnMixed(boolean)}
+   * {@link #setFlushOnQuery(boolean)} and {@link #setFlushOnMixed(boolean)}
    * to control the automatic flushing behaviour.
    * </p>
    * <p>
@@ -432,7 +432,15 @@ public interface Transaction extends AutoCloseable {
    * number of objects and you don't care about getting back the ids.
    * </p>
    */
-  void setBatchGetGeneratedKeys(boolean getGeneratedKeys);
+  void setGetGeneratedKeys(boolean getGeneratedKeys);
+
+  /**
+   * Deprecated renamed to setGetGeneratedKeys().
+   */
+  @Deprecated
+  default void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
+    setGetGeneratedKeys(getGeneratedKeys);
+  }
 
   /**
    * By default when mixing UpdateSql (or CallableSql) with Beans the batch is
@@ -449,7 +457,15 @@ public interface Transaction extends AutoCloseable {
    * have a 2 step process (delayed binding).
    * </p>
    */
-  void setBatchFlushOnMixed(boolean batchFlushOnMixed);
+  void setFlushOnMixed(boolean batchFlushOnMixed);
+
+  /**
+   * Deprecated renamed to setFlushOnMixed().
+   */
+  @Deprecated
+  default void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
+    setFlushOnMixed(batchFlushOnMixed);
+  }
 
   /**
    * By default executing a query will automatically flush any batched
@@ -459,7 +475,15 @@ public interface Transaction extends AutoCloseable {
    * execute a query and the batch will not be automatically flushed.
    * </p>
    */
-  void setBatchFlushOnQuery(boolean batchFlushOnQuery);
+  void setFlushOnQuery(boolean batchFlushOnQuery);
+
+  /**
+   * Deprecated renamed to setFlushOnQuery().
+   */
+  @Deprecated
+  default void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
+    setFlushOnQuery(batchFlushOnQuery);
+  }
 
   /**
    * Return true if the batch (of persisted beans or executed UpdateSql etc)
@@ -468,7 +492,15 @@ public interface Transaction extends AutoCloseable {
    * The default is for this to be true.
    * </p>
    */
-  boolean isBatchFlushOnQuery();
+  boolean isFlushOnQuery();
+
+  /**
+   * Deprecated renamed to isFlushOnQuery().
+   */
+  @Deprecated
+  default boolean isBatchFlushOnQuery() {
+    return isFlushOnQuery();
+  }
 
   /**
    * The batch will be flushing automatically but you can use this to explicitly

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

@@ -40,6 +40,8 @@ public final class EntityBeanIntercept implements Serializable {
 
   private String ebeanServerName;
 
+  private boolean deletedFromCollection;
+
   /**
    * The actual entity bean that 'owns' this intercept.
    */
@@ -913,6 +915,7 @@ public final class EntityBeanIntercept implements Serializable {
   }
 
   private void preGetterCallback(int propertyIndex) {
+    PreGetterCallback preGetterCallback = this.preGetterCallback;
     if (preGetterCallback != null) {
       preGetterCallback.preGetterTrigger(propertyIndex);
     }
@@ -1137,6 +1140,17 @@ public final class EntityBeanIntercept implements Serializable {
     this.sortOrder = sortOrder;
   }
 
+  /**
+   * Set if the entity was deleted from a BeanCollection.
+   */
+  public void setDeletedFromCollection(final boolean deletedFromCollection) {
+    this.deletedFromCollection = deletedFromCollection;
+  }
+
+  public boolean isOrphanDelete() {
+    return deletedFromCollection && !isNew();
+  }
+
   /**
    * Set the load error that happened on this property.
    */

src/main/java/io/ebean/common/ModifyHolder.java

@@ -1,5 +1,7 @@
 package io.ebean.common;
 
+import io.ebean.bean.EntityBean;
+
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.LinkedHashSet;
@@ -54,6 +56,11 @@ class ModifyHolder<E> implements Serializable {
   void modifyAddition(E bean) {
     if (bean != null) {
       touched = true;
+
+      if (bean instanceof EntityBean) {
+        ((EntityBean) bean)._ebean_getIntercept().setDeletedFromCollection(false);
+      }
+
       // If it is to delete then just remove the deletion
       if (!undoDeletion(bean)) {
         // Insert
@@ -70,6 +77,11 @@ class ModifyHolder<E> implements Serializable {
   void modifyRemoval(Object bean) {
     if (bean != null) {
       touched = true;
+
+      if (bean instanceof EntityBean) {
+        ((EntityBean) bean)._ebean_getIntercept().setDeletedFromCollection(true);
+      }
+
       // If it is to be added then just remove the addition
       if (!undoAddition(bean)) {
         modifyDeletions.add((E) bean);

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

@@ -222,8 +222,8 @@ public abstract class AbstractNamingConvention implements NamingConvention {
    * Return true if this class is part of entity inheritance.
    */
   protected boolean hasInheritance(Class<?> supCls) {
-    return AnnotationUtil.findAnnotationRecursive(supCls, Inheritance.class) != null
-        || AnnotationUtil.findAnnotation(supCls, DiscriminatorValue.class) != null;
+    return AnnotationUtil.typeHas(supCls, Inheritance.class)
+        || AnnotationUtil.has(supCls, DiscriminatorValue.class);
   }
 
 
@@ -255,16 +255,12 @@ public abstract class AbstractNamingConvention implements NamingConvention {
    * Gets the table name from annotation.
    */
   protected TableName getTableNameFromAnnotation(Class<?> beanClass) {
-
-    final Table t = AnnotationUtil.findAnnotationRecursive(beanClass, Table.class);
-
-    // Take the annotation if defined
-    if (t != null && !isEmpty(t.name())) {
+    final Table table = AnnotationUtil.typeGet(beanClass, Table.class);
+    if (table != null && !isEmpty(table.name())) {
       // Note: empty catalog and schema are converted to null
       // Only need to convert quoted identifiers from annotations
-      return new TableName(quoteIdentifiers(t.catalog()), quoteIdentifiers(t.schema()), quoteIdentifiers(t.name()));
+      return new TableName(quoteIdentifiers(table.catalog()), quoteIdentifiers(table.schema()), quoteIdentifiers(table.name()));
     }
-
     // No annotation
     return null;
   }

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

@@ -139,7 +139,7 @@ public class ServerConfig {
    * Having this on and registering entity classes means we don't need to manually
    * write that code or use classpath scanning to find entity classes.
    */
-  private boolean loadModuleInfo;
+  private boolean loadModuleInfo = true;
 
   /**
    * List of interesting classes such as entities, embedded, ScalarTypes,
@@ -475,6 +475,11 @@ public class ServerConfig {
 
   private String enabledL2Regions;
 
+  /**
+   * Set to true to effectively disable L2 cache plugins.
+   */
+  private boolean localOnlyL2Cache;
+
   /**
    * Should the javax.validation.constraints.NotNull enforce a notNull column in DB.
    * If set to false, use io.ebean.annotation.NotNull or Column(nullable=true).
@@ -2860,6 +2865,7 @@ public class ServerConfig {
     collectQueryPlanThresholdMicros = p.getLong("collectQueryPlanThresholdMicros", collectQueryPlanThresholdMicros);
     docStoreOnly = p.getBoolean("docStoreOnly", docStoreOnly);
     disableL2Cache = p.getBoolean("disableL2Cache", disableL2Cache);
+    localOnlyL2Cache = p.getBoolean("localOnlyL2Cache", localOnlyL2Cache);
     enabledL2Regions = p.get("enabledL2Regions", enabledL2Regions);
     notifyL2CacheInForeground = p.getBoolean("notifyL2CacheInForeground", notifyL2CacheInForeground);
     explicitTransactionBeginMode = p.getBoolean("explicitTransactionBeginMode", explicitTransactionBeginMode);
@@ -3100,6 +3106,20 @@ public class ServerConfig {
     this.disableL2Cache = disableL2Cache;
   }
 
+  /**
+   * Return true to use local only L2 cache. Effectively ignore l2 cache plugin like ebean-redis etc.
+   */
+  public boolean isLocalOnlyL2Cache() {
+    return localOnlyL2Cache;
+  }
+
+  /**
+   * Force the use of local only L2 cache. Effectively ignore l2 cache plugin like ebean-redis etc.
+   */
+  public void setLocalOnlyL2Cache(boolean localOnlyL2Cache) {
+    this.localOnlyL2Cache = localOnlyL2Cache;
+  }
+
   /**
    * Returns if we use javax.validation.constraints.NotNull
    */
@@ -3298,6 +3318,17 @@ public class ServerConfig {
     return loadModuleInfo && classes.isEmpty();
   }
 
+  /**
+   * Set false to turn off automatic registration of entity beans.
+   * <p>
+   * When using query beans that also generates a module info class that
+   * can register the entity bean classes (to avoid classpath scanning).
+   * This is on by default and setting this to false turns it off.
+   */
+  public void setLoadModuleInfo(boolean loadModuleInfo) {
+    this.loadModuleInfo = loadModuleInfo;
+  }
+
   public enum UuidVersion {
     VERSION4,
     VERSION1,

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

@@ -146,7 +146,7 @@ public class DatabasePlatform {
 
   protected String truncateTable = "truncate table %s";
 
-  protected String columnAliasPrefix = "c";
+  protected String columnAliasPrefix;
 
   /**
    * Use a BackTick ` at the beginning and end of table or column names that you

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

@@ -116,7 +116,7 @@ public class DbPlatformTypeMapping {
 
     } else {
       put(DbType.VARCHAR, new DbPlatformType("varchar", 255));
-      put(DbType.DECIMAL, new DbPlatformType("decimal", 38));
+      put(DbType.DECIMAL, new DbPlatformType("decimal", 16, 3));
       put(DbType.VARBINARY, new DbPlatformType("varbinary", 255));
       put(DbType.BINARY, new DbPlatformType("binary", 255));
       put(DbType.CHAR, new DbPlatformType("char", 1));

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

@@ -16,10 +16,8 @@ public class ClickHousePlatform extends DatabasePlatform {
     //this.dbEncrypt =
     //this.historySupport =
     //this.exceptionTranslator =
-
     this.nativeUuidType = true;
     this.dbDefaultValue.setNow("now()");
-    this.columnAliasPrefix = null;
 
     this.dbIdentity.setIdType(IdType.IDENTITY);
     this.dbIdentity.setSupportsGetGeneratedKeys(false);
@@ -34,7 +32,7 @@ public class ClickHousePlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.SMALLINT, new DbPlatformType("UInt16", false));
     dbTypeMap.put(DbType.INTEGER, new DbPlatformType("UInt32", false));
     dbTypeMap.put(DbType.BIGINT, new DbPlatformType("UInt64", false));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("Decimal", 16,4));
+    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("Decimal", 16, 3));
     dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("Float64", false));
 
     dbTypeMap.put(DbType.DATE, new DbPlatformType("Date", false));

src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java

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

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

@@ -26,7 +26,6 @@ public class H2Platform extends DatabasePlatform {
     this.supportsDeleteTableAlias = true;
     this.inlineSqlUpdateLimit = true;
     this.dbDefaultValue.setNow("now()");
-    this.columnAliasPrefix = null;
     this.exceptionTranslator =
       new SqlErrorCodes()
         .addAcquireLock("50200","HYT00")

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

@@ -17,7 +17,6 @@ public class HanaPlatform extends DatabasePlatform {
     this.sqlLimiter = new HanaSqlLimiter();
     this.persistBatchOnCascade = PersistBatch.NONE;
     this.supportsResultSetConcurrencyModeUpdatable = false;
-    this.columnAliasPrefix = null;
     this.historySupport = new HanaHistorySupport();
     this.basicSqlLimiter = new HanaBasicSqlLimiter();
 

src/main/java/io/ebean/config/dbplatform/mysql/MySqlPlatform.java

@@ -31,7 +31,6 @@ public class MySqlPlatform extends DatabasePlatform {
     this.inlineSqlUpdateLimit = true;
     this.dbEncrypt = new MySqlDbEncrypt();
     this.historySupport = new MySqlHistorySupport();
-    this.columnAliasPrefix = null;
     this.dbIdentity.setIdType(IdType.IDENTITY);
     this.dbIdentity.setSupportsGetGeneratedKeys(true);
     this.dbIdentity.setSupportsIdentity(true);

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

@@ -23,7 +23,6 @@ public class NuoDbPlatform extends DatabasePlatform {
     this.idInExpandedForm = true;
     this.supportsResultSetConcurrencyModeUpdatable = false;
     this.supportsDeleteTableAlias = true;
-    this.columnAliasPrefix = null;
     this.likeClauseRaw = "like ?";
     this.historySupport = new NuoDbHistorySupport();
     //this.dbEncrypt = ...

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

@@ -22,7 +22,6 @@ public class OraclePlatform extends DatabasePlatform {
   public OraclePlatform() {
     super();
     this.platform = Platform.ORACLE;
-    this.columnAliasPrefix = null;
     this.supportsDeleteTableAlias = true;
     this.maxTableNameLength = 30;
     this.maxConstraintNameLength = 30;
@@ -63,8 +62,7 @@ public class OraclePlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("number", 19, 4));
     dbTypeMap.put(DbType.SMALLINT, new DbPlatformType("number", 5));
     dbTypeMap.put(DbType.TINYINT, new DbPlatformType("number", 3));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("number", 38));
-
+    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("number", 16, 3));
     dbTypeMap.put(DbType.VARCHAR, new DbPlatformType("varchar2", 255));
 
     dbTypeMap.put(DbType.LONGVARBINARY, new DbPlatformType("blob"));

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

@@ -34,7 +34,6 @@ public class PostgresPlatform extends DatabasePlatform {
     this.blobDbType = Types.LONGVARBINARY;
     this.clobDbType = Types.VARCHAR;
     this.nativeUuidType = true;
-    this.columnAliasPrefix = null;
     this.truncateTable = "truncate table %s cascade";
     this.dbEncrypt = new PostgresDbEncrypt();
     this.historySupport = new PostgresHistorySupport();
@@ -71,7 +70,6 @@ public class PostgresPlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false));
     dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("float"));
     dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint"));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("decimal", 38));
     dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("timestamptz"));
 
     dbTypeMap.put(DbType.BINARY, dbBytea);

src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywherePlatform.java

@@ -32,8 +32,7 @@ public class SqlAnywherePlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.REAL, new DbPlatformType("float(16)"));
     dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("float(32)"));
     dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint"));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("numeric", 28));
-
+    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("numeric", 16, 3));
     dbTypeMap.put(DbType.BLOB, new DbPlatformType("binary(4500)"));
     dbTypeMap.put(DbType.CLOB, new DbPlatformType("long varchar"));
     dbTypeMap.put(DbType.LONGVARBINARY, new DbPlatformType("long binary"));

src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer17Platform.java

@@ -12,7 +12,6 @@ public class SqlServer17Platform extends SqlServerBasePlatform {
   public SqlServer17Platform() {
     super();
     this.platform = Platform.SQLSERVER17;
-    this.columnAliasPrefix = null;
     this.nativeUuidType = true;
     this.dbTypeMap.put(DbType.UUID, new DbPlatformType("uniqueidentifier", false));
   }

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

@@ -62,9 +62,7 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
     dbTypeMap.put(DbType.REAL, new DbPlatformType("float(16)"));
     dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("float(32)"));
     dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint"));
-    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("numeric", 28));
-
-
+    dbTypeMap.put(DbType.DECIMAL, new DbPlatformType("numeric", 16, 3));
     dbTypeMap.put(DbType.DATE, new DbPlatformType("date"));
     dbTypeMap.put(DbType.TIME, new DbPlatformType("time"));
     dbTypeMap.put(DbType.TIMESTAMP, new DbPlatformType("datetime2"));

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

@@ -171,7 +171,7 @@ public class DefaultCsvCallback<T> implements CsvCallback<T> {
         logger.info("Creating transaction, batchSize[" + persistBatchSize + "]");
         transaction.setBatchMode(true);
         transaction.setBatchSize(persistBatchSize);
-        transaction.setBatchGetGeneratedKeys(false);
+        transaction.setGetGeneratedKeys(false);
 
       } else {
         // explicitly turn off JDBC batching in case

src/main/java/io/ebean/util/AnnotationUtil.java

@@ -1,304 +1,98 @@
 package io.ebean.util;
 
-import io.ebean.annotation.Formula;
-import io.ebean.annotation.Platform;
-import io.ebean.annotation.Where;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Method;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
-import java.util.Objects;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 
 /**
- * Annotation utility methods to find annotations recursively - taken from the spring framework.
+ * Annotation utility methods to find annotations.
  */
 public class AnnotationUtil {
 
   /**
    * Determine if the supplied {@link Annotation} is defined in the core JDK {@code java.lang.annotation} package.
    */
-  public static boolean isInJavaLangAnnotationPackage(Annotation annotation) {
-    return annotation.annotationType().getName().startsWith("java.lang.annotation");
+  public static boolean notJavaLang(Annotation annotation) {
+    return !annotation.annotationType().getName().startsWith("java.lang.annotation");
   }
 
   /**
-   * Find a single {@link Annotation} of {@code annotationType} on the supplied {@link AnnotatedElement}.
-   * <p>
-   * Meta-annotations will be searched if the annotation is not <em>directly present</em> on the supplied element.
-   * <p>
-   * <strong>Warning</strong>: this method operates generically on annotated elements. In other words, this method
-   * does not execute specialized search algorithms for classes or methods. It only traverses through Annotations!
-   * It also does not filter out platform dependent annotations!
+   * Simple get on field or method with no meta-annotations or platform filtering.
    */
-  @SuppressWarnings("unchecked")
-  public static <A extends Annotation> A findAnnotation(AnnotatedElement annotatedElement, Class<A> annotationType) {
-    if (annotationType == null) {
-      return null;
-    }
-    // check if directly present, if not, start search for meta-annotations.
-    Annotation[] anns = annotatedElement.getAnnotations();
-    if (anns.length == 0) {
-      return null; // no annotations present, so searching for meta annotations not required
-    }
-
-    // As we need the anns array anyway, we iterate over this instead
-    // of using annotatedElement.getAnnotation(...) which is synchronized internally
-    for (Annotation ann : anns) {
-      if (ann.annotationType() == annotationType) {
-        return (A) ann;
-      }
-    }
-
-    return findAnnotation(anns, annotationType, new HashSet<>());
-
+  public static <A extends Annotation> A get(AnnotatedElement element, Class<A> annotation) {
+    return element.getAnnotation(annotation);
   }
 
   /**
-   * Find a single {@link Annotation} of {@code annotationType} on the supplied class.
-   * <p>Meta-annotations will be searched if the annotation is not directly present on
-   * the supplied element.
-   * <p><strong>Note</strong>: this method searches for annotations at class & superClass(es)!
+   * Simple has with no meta-annotations or platform filtering.
    */
-  @SuppressWarnings("unchecked")
-  public static <A extends Annotation> A findAnnotationRecursive(Class<?> clazz, Class<A> annotationType) {
-    if (annotationType == null) {
-      return null;
-    }
+  public static <A extends Annotation> boolean has(AnnotatedElement element, Class<A> annotation) {
+    return get(element, annotation) != null;
+  }
 
+  /**
+   * On class get the annotation - includes inheritance.
+   */
+  public static <A extends Annotation> A typeGet(Class<?> clazz, Class<A> annotationType) {
     while (clazz != null && clazz != Object.class) {
-      // check if directly present, if not, start search for meta-annotations.
-      Annotation[] anns = clazz.getAnnotations();
-      if (anns.length != 0) {
-        for (Annotation ann : anns) {
-          if (ann.annotationType() == annotationType) {
-            return (A) ann;
-          }
-        }
-
-        A ann = findAnnotation(anns, annotationType, new HashSet<>());
-        if (ann != null) {
-          return ann;
-        }
+      final A val = clazz.getAnnotation(annotationType);
+      if (val != null) {
+        return val;
       }
-      // no meta-annotation present at this class - traverse to superclass
       clazz = clazz.getSuperclass();
     }
     return null;
-
   }
 
   /**
-   * Finds the first annotation of a type for this platform. (if annotation is platform specific, otherwise first
-   * found annotation is returned)
+   * On class get all the annotations - includes inheritance.
    */
-  public static <A extends Annotation> A findAnnotation(AnnotatedElement annotatedElement, Class<A> annotationType, Platform platform) {
-    if (annotationType == null) {
-      return null;
+  public static <A extends Annotation> Set<A> typeGetAll(Class<?> clazz, Class<A> annotationType) {
+    Set<A> result = new LinkedHashSet<>();
+    typeGetAllCollect(clazz, annotationType, result);
+    return result;
+  }
+
+  private static <A extends Annotation> void typeGetAllCollect(Class<?> clazz, Class<A> annotationType, Set<A> result) {
+    while (clazz != null && clazz != Object.class) {
+      final A val = clazz.getAnnotation(annotationType);
+      if (val != null) {
+        result.add(val);
+      }
+      clazz = clazz.getSuperclass();
     }
-    Set<A> anns = findAnnotations(annotatedElement, annotationType);
-    return getPlatformMatchingAnnotation(anns, platform);
   }
 
   /**
-   * Finds all annotations recusively for a class and its superclasses or interfaces.
+   * On class simple check for annotation - includes inheritance.
    */
-  public static <A extends Annotation> Set<A> findAnnotationsRecursive(Class<?> clazz, Class<A> annotationType) {
-    Objects.requireNonNull(annotationType);
-    Set<A> ret = new LinkedHashSet<>();
+  public static <A extends Annotation> boolean typeHas(Class<?> clazz, Class<A> annotation) {
+    return typeGet(clazz, annotation) != null;
+  }
+
+  /**
+   * Find all the annotations for the filter searching meta-annotations.
+   */
+  public static Set<Annotation> metaFindAllFor(AnnotatedElement element, Set<Class<?>> filter) {
     Set<Annotation> visited = new HashSet<>();
-    Set<Class<?>> visitedInterfaces = new HashSet<>();
-    while (clazz != null && !clazz.getName().startsWith("java.lang.")) {
-      findMetaAnnotationsRecursive(clazz, annotationType, ret, visited, visitedInterfaces);
-      clazz = clazz.getSuperclass();
+    Set<Annotation> result = new LinkedHashSet<>();
+    for (Annotation ann : element.getAnnotations()) {
+      metaAdd(ann, filter, visited, result);
     }
-    return ret;
+    return result;
   }
 
-  /**
-   * Searches the interfaces for annotations.
-   */
-  private static <A extends Annotation> void findMetaAnnotationsRecursive(Class<?> clazz,
-      Class<A> annotationType, Set<A> ret,
-      Set<Annotation> visited, Set<Class<?>> visitedInterfaces) {
-    findMetaAnnotations(clazz, annotationType, ret, visited);
-    for (Class<?> iface : clazz.getInterfaces()) {
-      if (!iface.getName().startsWith("java.lang.") && visitedInterfaces.add(iface)) {
-        findMetaAnnotationsRecursive(iface, annotationType, ret, visited, visitedInterfaces);
-      }
-    }
-  }
-
-  /**
-   * Perform the search algorithm avoiding endless recursion by tracking which
-   * annotations have already been visited.
-   */
-  @SuppressWarnings("unchecked")
-  private static <A extends Annotation> A findAnnotation(Annotation[] anns, Class<A> annotationType, Set<Annotation> visited) {
-
-
-    for (Annotation ann : anns) {
-      if (!isInJavaLangAnnotationPackage(ann) && visited.add(ann)) {
-        Annotation[] metaAnns = ann.annotationType().getAnnotations();
-        for (Annotation metaAnn : metaAnns) {
-          if (metaAnn.annotationType() == annotationType) {
-            return (A) metaAnn;
-          }
-        }
-        if (metaAnns.length > 0) {
-          A annotation = findAnnotation(metaAnns, annotationType, visited);
-          if (annotation != null) {
-            return annotation;
-          }
-        }
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Find all {@link Annotation}s of {@code annotationType} on the supplied {@link AnnotatedElement}.
-   * <p>
-   * Meta-annotations will be searched if the annotation is not <em>directly present</em> on the supplied element.
-   * <p>
-   * <strong>Warning</strong>: this method operates generically on annotated elements. In other words, this method
-   * does not execute specialized search algorithms for classes or methods. It only traverses through Annotations!
-   */
-  public static <A extends Annotation> Set<A> findAnnotations(AnnotatedElement annotatedElement, Class<A> annotationType) {
-    if (annotationType == null) {
-      return null;
-    }
-    Set<A> ret = new LinkedHashSet<>();
-    findMetaAnnotations(annotatedElement, annotationType, ret, new HashSet<>());
-    return ret;
-  }
-
-  /**
-   * Perform the search algorithm avoiding endless recursion by tracking which
-   * annotations have already been visited.
-   */
-  @SuppressWarnings("unchecked")
-  private static <A extends Annotation> void findMetaAnnotations(AnnotatedElement annotatedElement, Class<A> annotationType, Set<A> ret, Set<Annotation> visited) {
-
-    Annotation[] anns = annotatedElement.getAnnotations();
-    for (Annotation ann : anns) {
-      if (!isInJavaLangAnnotationPackage(ann) && visited.add(ann)) {
-        if (ann.annotationType() == annotationType) {
-          ret.add((A) ann);
-        } else {
-          Method repeatableValueMethod = getRepeatableValueMethod(ann, annotationType);
-          if (repeatableValueMethod != null) {
-            try {
-              A[] repeatedAnns = (A[]) repeatableValueMethod.invoke(ann);
-              for (Annotation repeatedAnn : repeatedAnns) {
-                ret.add((A) repeatedAnn);
-                findMetaAnnotations(repeatedAnn.annotationType(), annotationType, ret, visited);
-              }
-            } catch (Exception e) { // catch all exceptions (thrown by invoke)
-              throw new RuntimeException(e);
-            }
-          } else {
-            findMetaAnnotations(ann.annotationType(), annotationType, ret, visited);
-          }
+  private static void metaAdd(Annotation ann, Set<Class<?>> filter, Set<Annotation> visited, Set<Annotation> result) {
+    if (notJavaLang(ann) && visited.add(ann)) {
+      if (filter.contains(ann.annotationType())) {
+        result.add(ann);
+      } else {
+        for (Annotation metaAnn : ann.annotationType().getAnnotations()) {
+          metaAdd(metaAnn, filter, visited, result);
         }
       }
     }
   }
-
-  // caches for getRepeatableValueMethod
-  private static Method getNullMethod() {
-    try {
-      return AnnotationUtil.class.getDeclaredMethod("getNullMethod");
-    } catch (NoSuchMethodException e) {
-      return null;
-    }
-  }
-
-  private static final ConcurrentMap<Annotation, Method> valueMethods = new ConcurrentHashMap<>();
-  // only a non-null-marker the valueMethods - Cache
-  private static final Method nullMethod = getNullMethod();
-
-
-  /**
-   * Returns the <code>value()</code> method for a possible containerAnnotation.
-   * Method is retuned only, if its signature is <code>array of containingType</code>.
-   */
-  private static <A extends Annotation> Method getRepeatableValueMethod(
-    Annotation containerAnnotation, Class<A> containingType) {
-
-    Method method = valueMethods.get(containerAnnotation);
-    if (method == null) {
-      try {
-        method = containerAnnotation.annotationType().getMethod("value");
-      } catch (NoSuchMethodException e) {
-        method = nullMethod;
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-      Method prev = valueMethods.putIfAbsent(containerAnnotation, method);
-      method = prev == null ? method : prev;
-    }
-    if (method != nullMethod) {
-      Class<?> retType = method.getReturnType();
-      if (retType.isArray() && retType.getComponentType() == containingType) {
-        return method;
-      }
-    }
-    return null;
-  }
-
-
-  /**
-   * Finds a suitable annotation from <code>Set<T> anns</code> for this platform.
-   * To distinguish between platforms, annotation type <code>T</code> must define
-   * a method withthis signature:
-   * <p>
-   * <code>Class<? extends DatabasePlatform>[] platforms() default {};</code>
-   * </p>
-   * The finding rules are:
-   * <ol>
-   * <li>Check if T has method "platforms" if not, return <code>ann[0]</code></code>
-   * <li>find the annotation that is defined for <code>databasePlatform</code></li>
-   * <li>otherwise return the annotation for default platform (platforms = {})</li>
-   * <li>return null
-   * </ol>
-   * (This mechanism is currently used by {@link Where} and {@link Formula})
-   */
-  public static <T extends Annotation> T getPlatformMatchingAnnotation(Set<T> anns, Platform matchPlatform) {
-    if (anns.isEmpty()) {
-      return null;
-    }
-    Method getPlatformsMethod = null;
-    T fallback = null;
-    for (T ann : anns) {
-      try {
-        if (getPlatformsMethod == null) {
-          getPlatformsMethod = ann.getClass().getMethod("platforms");
-        }
-        if (!Platform[].class.isAssignableFrom(getPlatformsMethod.getReturnType())) {
-          return ann;
-        }
-        Platform[] platforms = (Platform[]) getPlatformsMethod.invoke(ann);
-        if (platforms.length == 0) {
-          fallback = ann;
-        } else {
-          for (Platform platform : platforms) {
-            if (matchPlatform == platform) {
-              return ann;
-            }
-          }
-        }
-      } catch (NoSuchMethodException e) {
-        return ann; // not platform specific - return first one
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    }
-    return fallback;
-  }
-
 }

src/main/java/io/ebeaninternal/api/ScopeTrans.java

@@ -71,13 +71,13 @@ public class ScopeTrans {
         restoreBatchOnCascade = transaction.isBatchOnCascade();
         restoreBatchSize = transaction.getBatchSize();
         restoreBatchGeneratedKeys = transaction.getBatchGetGeneratedKeys();
-        restoreBatchFlushOnQuery = transaction.isBatchFlushOnQuery();
+        restoreBatchFlushOnQuery = transaction.isFlushOnQuery();
       }
       if (txScope.isBatchSet()) {
         transaction.setBatchMode(txScope.isBatchMode());
       }
       if (!txScope.isFlushOnQuery()) {
-        transaction.setBatchFlushOnQuery(false);
+        transaction.setFlushOnQuery(false);
       }
       if (txScope.isBatchOnCascadeSet()) {
         transaction.setBatchOnCascade(txScope.isBatchOnCascade());
@@ -86,7 +86,7 @@ public class ScopeTrans {
         transaction.setBatchSize(txScope.getBatchSize());
       }
       if (txScope.isSkipGeneratedKeys()) {
-        transaction.setBatchGetGeneratedKeys(false);
+        transaction.setGetGeneratedKeys(false);
       }
     }
 
@@ -136,7 +136,7 @@ public class ScopeTrans {
       transaction.commit();
     } else {
       nestedCommit = true;
-      transaction.setBatchFlushOnQuery(restoreBatchFlushOnQuery);
+      transaction.setFlushOnQuery(restoreBatchFlushOnQuery);
       if (restoreBatch != null) {
         transaction.setBatchMode(restoreBatch);
       }
@@ -147,7 +147,7 @@ public class ScopeTrans {
         transaction.setBatchSize(restoreBatchSize);
       }
       if (restoreBatchGeneratedKeys != null) {
-        transaction.setBatchGetGeneratedKeys(restoreBatchGeneratedKeys);
+        transaction.setGetGeneratedKeys(restoreBatchGeneratedKeys);
       }
     }
   }

src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java

@@ -269,8 +269,8 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
-    transaction.setBatchGetGeneratedKeys(getGeneratedKeys);
+  public void setGetGeneratedKeys(boolean getGeneratedKeys) {
+    transaction.setGetGeneratedKeys(getGeneratedKeys);
   }
 
   @Override
@@ -279,18 +279,18 @@ public abstract class SpiTransactionProxy implements SpiTransaction {
   }
 
   @Override
-  public void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
-    transaction.setBatchFlushOnMixed(batchFlushOnMixed);
+  public void setFlushOnMixed(boolean batchFlushOnMixed) {
+    transaction.setFlushOnMixed(batchFlushOnMixed);
   }
 
   @Override
-  public void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
-    transaction.setBatchFlushOnQuery(batchFlushOnQuery);
+  public void setFlushOnQuery(boolean batchFlushOnQuery) {
+    transaction.setFlushOnQuery(batchFlushOnQuery);
   }
 
   @Override
-  public boolean isBatchFlushOnQuery() {
-    return transaction.isBatchFlushOnQuery();
+  public boolean isFlushOnQuery() {
+    return transaction.isFlushOnQuery();
   }
 
   @Override

src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/util/PlatformTypeConverter.java

@@ -58,7 +58,7 @@ public class PlatformTypeConverter {
       } else {
         // scale - varchar(10)
         int scale = Integer.parseInt(columnDefinition.substring(open + 1, close));
-        return dbType.renderType(scale, 0) + suffix;
+        return dbType.renderType(scale, -1) + suffix;
       }
 
     } catch (IllegalArgumentException e) {

src/main/java/io/ebeaninternal/dbmigration/model/MCompoundUniqueConstraint.java

@@ -55,7 +55,7 @@ public class MCompoundUniqueConstraint {
   public MCompoundUniqueConstraint(AddUniqueConstraint change) {
     this.name = change.getConstraintName();
     this.columns = split(change.getColumnNames());
-    this.oneToOne = change.isOneToOne();
+    this.oneToOne = Boolean.TRUE.equals(change.isOneToOne());
     this.platforms = change.getPlatforms();
     this.nullableColumns = splitWithNull(change.getNullableColumns());
   }
@@ -63,7 +63,7 @@ public class MCompoundUniqueConstraint {
   public MCompoundUniqueConstraint(UniqueConstraint uq) {
     this.name = uq.getName();
     this.columns = split(uq.getColumnNames());
-    this.oneToOne = uq.isOneToOne();
+    this.oneToOne = Boolean.TRUE.equals(uq.isOneToOne());
     this.platforms = uq.getPlatforms();
     this.nullableColumns = splitWithNull(uq.getNullableColumns());
   }

src/main/java/io/ebeaninternal/server/cache/CachedBeanId.java

@@ -0,0 +1,54 @@
+package io.ebeaninternal.server.cache;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+/**
+ * Bean Id value plus discriminator type.
+ * <p>
+ * Put into L2 cache such that we know the type of a bean with inheritance.
+ */
+public class CachedBeanId implements Externalizable {
+
+  private String discValue;
+  private Object id;
+
+  public CachedBeanId(String discValue, Object id) {
+    this.discValue = discValue;
+    this.id = id;
+  }
+
+  /**
+   * Construct from serialisation.
+   */
+  public CachedBeanId() {
+  }
+
+  @Override
+  public void writeExternal(ObjectOutput out) throws IOException {
+    out.writeUTF(discValue);
+    out.writeObject(id);
+  }
+
+  @Override
+  public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    discValue = in.readUTF();
+    id = in.readObject();
+  }
+
+  @Override
+  public String toString() {
+    return discValue + ":" + id;
+  }
+
+  public String getDiscValue() {
+    return discValue;
+  }
+
+  public Object getId() {
+    return id;
+  }
+
+}

src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java

@@ -134,7 +134,7 @@ class DefaultCacheHolder {
   }
 
   private ServerCacheOptions getQueryOptions(Class<?> cls) {
-    CacheQueryTuning tuning = AnnotationUtil.findAnnotation(cls, CacheQueryTuning.class);
+    CacheQueryTuning tuning = AnnotationUtil.get(cls, CacheQueryTuning.class);
     if (tuning != null) {
       return new ServerCacheOptions(tuning).applyDefaults(queryDefault);
     }

src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegister.java

@@ -52,7 +52,7 @@ public class DefaultChangeLogRegister implements ChangeLogRegister {
    * Find and return the ChangeLog annotation in the inheritance hierarchy.
    */
   private ChangeLog getChangeLog(Class<?> beanType) {
-    return AnnotationUtil.findAnnotationRecursive(beanType, ChangeLog.class);
+    return AnnotationUtil.typeGet(beanType, ChangeLog.class);
   }
 
   /**

src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java

@@ -45,9 +45,9 @@ import io.ebeaninternal.server.changelog.DefaultChangeLogPrepare;
 import io.ebeaninternal.server.changelog.DefaultChangeLogRegister;
 import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
-import io.ebeaninternal.server.core.timezone.CloneDataTimeZone;
+import io.ebeaninternal.server.core.timezone.OracleDataTimeZone;
 import io.ebeaninternal.server.core.timezone.DataTimeZone;
-import io.ebeaninternal.server.core.timezone.LocalDataTimeZone;
+import io.ebeaninternal.server.core.timezone.MySqlDataTimeZone;
 import io.ebeaninternal.server.core.timezone.NoDataTimeZone;
 import io.ebeaninternal.server.core.timezone.SimpleDataTimeZone;
 import io.ebeaninternal.server.deploy.BeanDescriptorManager;
@@ -529,12 +529,12 @@ public class InternalConfiguration {
     String tz = serverConfig.getDataTimeZone();
     if (tz == null) {
       if (isMySql(getPlatform())) {
-        return new LocalDataTimeZone();
+        return new MySqlDataTimeZone();
       }
       return new NoDataTimeZone();
     }
     if (getPlatform().base() == Platform.ORACLE) {
-      return new CloneDataTimeZone(tz);
+      return new OracleDataTimeZone(tz);
     } else {
       return new SimpleDataTimeZone(tz);
     }
@@ -594,7 +594,9 @@ public class InternalConfiguration {
   }
 
   private ServerCachePlugin initServerCachePlugin() {
-
+    if (serverConfig.isLocalOnlyL2Cache()) {
+      return new DefaultServerCachePlugin();
+    }
     ServerCachePlugin plugin = serverConfig.getServerCachePlugin();
     if (plugin == null) {
       ServiceLoader<ServerCachePlugin> cacheFactories = ServiceLoader.load(ServerCachePlugin.class);

src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java

@@ -699,7 +699,7 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    * Create and return a new reference bean matching this beans Id value.
    */
   public T createReference() {
-    return beanDescriptor.createReference(getBeanId(), null);
+    return beanDescriptor.createRef(getBeanId(), null);
   }
 
   /**
@@ -1399,7 +1399,8 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
               changes.put(property.getName(), val);
               if (property.isNaturalKey()) {
                 updateNaturalKey = true;
-                changeSet.addNaturalKeyPut(beanDescriptor, key, val.toString());
+                String valStr = (val == null) ? null : val.toString();
+                changeSet.addNaturalKeyPut(beanDescriptor, key, valStr);
               }
             }
           }

src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java

@@ -473,6 +473,6 @@ public class BootupClasses implements ClassFilter {
    * Returns true if this class has the annotation (or meta annotation). Does not search recursively.
    */
   private boolean has(Class<?> cls, Class<? extends Annotation> ann) {
-    return AnnotationUtil.findAnnotation(cls, ann) != null;
+    return AnnotationUtil.has(cls, ann);
   }
 }

src/main/java/io/ebeaninternal/server/core/timezone/MySqlDataTimeZone.java

@@ -5,11 +5,11 @@ import java.util.Calendar;
 /**
  * Implementation of DataTimeZone when single Calendar instance is used with local timezone.
  */
-public class LocalDataTimeZone implements DataTimeZone {
+public class MySqlDataTimeZone implements DataTimeZone {
 
   protected final Calendar zone;
 
-  public LocalDataTimeZone() {
+  public MySqlDataTimeZone() {
     this.zone = Calendar.getInstance();
   }
 
@@ -19,7 +19,7 @@ public class LocalDataTimeZone implements DataTimeZone {
   }
 
   @Override
-    public Calendar getDateTimeZone() {
-      return zone; // workaround for MySQL. TODO: rename class to MySqlDataTimeZone!?
-    }
+  public Calendar getDateTimeZone() {
+    return zone;
+  }
 }

src/main/java/io/ebeaninternal/server/core/timezone/OracleDataTimeZone.java

@@ -8,9 +8,9 @@ import java.util.Calendar;
  * Used with Oracle JDBC driver as that wants to mutate the Calender.
  * </p>
  */
-public class CloneDataTimeZone extends SimpleDataTimeZone {
+public class OracleDataTimeZone extends SimpleDataTimeZone {
 
-  public CloneDataTimeZone(String zoneId) {
+  public OracleDataTimeZone(String zoneId) {
     super(zoneId);
   }
 

src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -2053,14 +2053,16 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Create a non read only reference bean without checking cacheSharableBeans.
    */
-  @SuppressWarnings("unchecked")
   public T createReference(Object id, PersistenceContext pc) {
+    if (inheritInfo != null && !inheritInfo.isConcrete()) {
+      return findReferenceBean(id, pc);
+    }
+    return createRef(id, pc);
+  }
 
+  @SuppressWarnings("unchecked")
+  public T createRef(Object id, PersistenceContext pc) {
     try {
-      if (inheritInfo != null && !inheritInfo.isConcrete()) {
-        return findReferenceBean(id, pc);
-      }
-
       EntityBean eb = createEntityBean();
       id = convertSetId(id, eb);
       EntityBeanIntercept ebi = eb._ebean_getIntercept();
@@ -2071,7 +2073,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
         ebi.setPersistenceContext(pc);
       }
       return (T) eb;
-
     } catch (Exception ex) {
       throw new PersistenceException(ex);
     }

src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java

@@ -44,9 +44,9 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.meta.DeployBeanTable;
+import io.ebeaninternal.server.deploy.meta.DeployIdentityMode;
 import io.ebeaninternal.server.deploy.meta.DeployOrderColumn;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
-import io.ebeaninternal.server.deploy.meta.DeployIdentityMode;
 import io.ebeaninternal.server.deploy.parse.DeployBeanInfo;
 import io.ebeaninternal.server.deploy.parse.DeployCreateProperties;
 import io.ebeaninternal.server.deploy.parse.DeployInherit;
@@ -357,7 +357,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    * Deploy returning the asOfTableMap (which is required by the SQL builders).
    */
   public Map<String, String> deploy(List<XmEbean> mappings) {
-
     try {
       createListeners();
       readEntityDeploymentInitial();
@@ -365,7 +364,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
       readEntityBeanTable();
       readEntityDeploymentAssociations();
       readInheritedIdGenerators();
-      setProfileIds();
       // creates the BeanDescriptors
       readEntityRelationships();
 
@@ -375,9 +373,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
       initialiseAll();
       readForeignKeys();
-
       readTableToDescriptor();
-
       logStatus();
 
       // clear collections we no longer need
@@ -778,18 +774,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     }
   }
 
-  /**
-   * Set profileIds based on descriptor full name order.
-   */
-  private void setProfileIds() {
-
-    List<? extends DeployBeanDescriptor<?>> deployDescriptors = deployInfoMap.values().stream()
-      .map(DeployBeanInfo::getDescriptor)
-      .collect(Collectors.toList());
-
-    deployDescriptors.sort(Comparator.comparing(DeployBeanDescriptor::getFullName));
-  }
-
   /**
    * Create the BeanTable from the deployment information gathered so far.
    */
@@ -1002,6 +986,15 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     orderProperty.setDbInsertable(orderColumn.isInsertable());
     orderProperty.setDbUpdateable(orderColumn.isUpdatable());
     orderProperty.setDbRead(true);
+    orderProperty.setOwningType(targetDesc.getBeanType());
+
+    final InheritInfo targetInheritInfo = targetDesc.getInheritInfo();
+    if (targetInheritInfo != null) {
+      for (InheritInfo child : targetInheritInfo.getChildren()) {
+        final DeployBeanDescriptor<?> childDescriptor = deployInfoMap.get(child.getType()).getDescriptor();
+        childDescriptor.setOrderColumn(orderProperty);
+      }
+    }
 
     targetDesc.setOrderColumn(orderProperty);
   }
@@ -1591,7 +1584,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
    */
   private boolean isMappedSuperWithNoProperties(Class<?> beanClass) {
     // do not search recursive here
-    MappedSuperclass annotation = AnnotationUtil.findAnnotation(beanClass, MappedSuperclass.class);
+    MappedSuperclass annotation = AnnotationUtil.get(beanClass, MappedSuperclass.class);
     if (annotation == null) {
       return false;
     }

src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java

@@ -13,6 +13,7 @@ import io.ebeaninternal.api.json.SpiJsonReader;
 import io.ebeaninternal.api.json.SpiJsonWriter;
 import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.cache.CachedBeanData;
+import io.ebeaninternal.server.cache.CachedBeanId;
 import io.ebeaninternal.server.core.DefaultSqlUpdate;
 import io.ebeaninternal.server.deploy.id.ImportedId;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
@@ -433,11 +434,19 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
     }
     if (embedded) {
       return targetDescriptor.cacheEmbeddedBeanExtract((EntityBean) ap);
+    } else if (targetInheritInfo != null) {
+      return createCacheBeanId(ap);
     } else {
       return targetDescriptor.getIdProperty().getCacheDataValue((EntityBean) ap);
     }
   }
 
+  private Object createCacheBeanId(Object bean) {
+    final BeanDescriptor<?> desc = targetDescriptor.descOf(bean.getClass());
+    final Object id = desc.getIdProperty().getCacheDataValue((EntityBean) bean);
+    return new CachedBeanId(desc.getDiscValue(), id);
+  }
+
   @Override
   public String format(Object value) {
     return targetDescriptor.getIdBinder().cacheKey(value);
@@ -451,19 +460,31 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
       if (embedded) {
         setValue(bean, targetDescriptor.cacheEmbeddedBeanLoad((CachedBeanData) cacheData, context));
       } else {
-        if (cacheData instanceof String) {
-          cacheData = targetDescriptor.getIdProperty().scalarType.parse((String) cacheData);
+        if (cacheData instanceof CachedBeanId) {
+          setValue(bean, refInheritBean((CachedBeanId) cacheData, context));
+        } else {
+          setValue(bean, refBean(targetDescriptor, cacheData, context));
         }
-        // cacheData is the id value, maybe already in persistence context
-        Object assocBean = targetDescriptor.contextGet(context, cacheData);
-        if (assocBean == null) {
-          assocBean = targetDescriptor.createReference(cacheData, context);
-        }
-        setValue(bean, assocBean);
       }
     }
   }
 
+  private Object refInheritBean(CachedBeanId cacheId, PersistenceContext context) {
+    final InheritInfo rowInheritInfo = targetInheritInfo.readType(cacheId.getDiscValue());
+    return refBean(rowInheritInfo.desc(), cacheId.getId(), context);
+  }
+
+  private Object refBean(BeanDescriptor<?> desc, Object id, PersistenceContext context) {
+    if (id instanceof String) {
+      id = desc.getIdProperty().scalarType.parse((String) id);
+    }
+    Object bean = desc.contextGet(context, id);
+    if (bean == null) {
+      bean = desc.createRef(id, context);
+    }
+    return bean;
+  }
+
   @Override
   public ScalarDataReader<?> getIdReader() {
     return targetDescriptor.getIdProperty();
@@ -640,14 +661,12 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
 
   @Override
   public void addTenant(SpiQuery<?> query, Object tenantId) {
-    T refBean = targetDescriptor.createReference(tenantId, null);
-    query.where().eq(name, refBean);
+    query.where().eq(name, targetDescriptor.createRef(tenantId, null));
   }
 
   @Override
   public void setTenantValue(EntityBean entityBean, Object tenantId) {
-    T refBean = targetDescriptor.createReference(tenantId, null);
-    setValue(entityBean, refBean);
+    setValue(entityBean, targetDescriptor.createRef(tenantId, null));
   }
 
   @Override

src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java

@@ -4,10 +4,13 @@ import io.ebean.annotation.CreatedTimestamp;
 import io.ebean.annotation.DocCode;
 import io.ebean.annotation.DocProperty;
 import io.ebean.annotation.DocSortable;
+import io.ebean.annotation.Formula;
+import io.ebean.annotation.Platform;
 import io.ebean.annotation.SoftDelete;
 import io.ebean.annotation.UpdatedTimestamp;
 import io.ebean.annotation.WhenCreated;
 import io.ebean.annotation.WhenModified;
+import io.ebean.annotation.Where;
 import io.ebean.annotation.WhoCreated;
 import io.ebean.annotation.WhoModified;
 import io.ebean.config.ScalarTypeConverter;
@@ -31,11 +34,13 @@ import javax.persistence.EmbeddedId;
 import javax.persistence.FetchType;
 import javax.persistence.Id;
 import javax.persistence.Version;
+import javax.validation.constraints.Size;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.sql.Types;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -190,11 +195,6 @@ public class DeployBeanProperty {
 
   private final DeployDocPropertyOptions docMapping = new DeployDocPropertyOptions();
 
-  /**
-   * The method used to read the property.
-   */
-  private Method readMethod;
-
   private int propertyIndex;
 
   private BeanPropertyGetter getter;
@@ -232,6 +232,8 @@ public class DeployBeanProperty {
 
   private List<DbMigrationInfo> dbMigrationInfos;
 
+  private Set<Annotation> metaAnnotations;
+
   public DeployBeanProperty(DeployBeanDescriptor<?> desc, Class<?> propertyType, ScalarType<?> scalarType, ScalarTypeConverter<?, ?> typeConverter) {
     this.desc = desc;
     this.propertyType = propertyType;
@@ -261,29 +263,29 @@ public class DeployBeanProperty {
     if (field == null) {
       return 0;
     }
-    if (AnnotationUtil.findAnnotation(field, Id.class) != null) {
+    if (AnnotationUtil.get(field, Id.class) != null) {
       return ID_ORDER;
-    } else if (AnnotationUtil.findAnnotation(field, EmbeddedId.class) != null) {
+    } else if (AnnotationUtil.get(field, EmbeddedId.class) != null) {
       return ID_ORDER;
     } else if (undirectionalShadow) {
       return UNIDIRECTIONAL_ORDER;
     } else if (isAuditProperty()) {
       return AUDITCOLUMN_ORDER;
-    } else if (AnnotationUtil.findAnnotation(field, Version.class) != null) {
+    } else if (AnnotationUtil.get(field, Version.class) != null) {
       return VERSIONCOLUMN_ORDER;
-    } else if (AnnotationUtil.findAnnotation(field, SoftDelete.class) != null) {
+    } else if (AnnotationUtil.get(field, SoftDelete.class) != null) {
       return VERSIONCOLUMN_ORDER;
     }
     return 0;
   }
 
   private boolean isAuditProperty() {
-    return (AnnotationUtil.findAnnotation(field, WhenCreated.class) != null
-      || AnnotationUtil.findAnnotation(field, WhenModified.class) != null
-      || AnnotationUtil.findAnnotation(field, WhoModified.class) != null
-      || AnnotationUtil.findAnnotation(field, WhoCreated.class) != null
-      || AnnotationUtil.findAnnotation(field, UpdatedTimestamp.class) != null
-      || AnnotationUtil.findAnnotation(field, CreatedTimestamp.class) != null);
+    return (AnnotationUtil.has(field, WhenCreated.class)
+      || AnnotationUtil.has(field, WhenModified.class)
+      || AnnotationUtil.has(field, WhoModified.class)
+      || AnnotationUtil.has(field, WhoCreated.class)
+      || AnnotationUtil.has(field, UpdatedTimestamp.class)
+      || AnnotationUtil.has(field, CreatedTimestamp.class));
   }
 
   public String getFullBeanName() {
@@ -453,13 +455,6 @@ public class DeployBeanProperty {
     }
   }
 
-  /**
-   * Return the getter method.
-   */
-  public Method getReadMethod() {
-    return readMethod;
-  }
-
   /**
    * Set to the owning type form a Inheritance heirarchy.
    */
@@ -672,7 +667,7 @@ public class DeployBeanProperty {
    */
   private String aggregationJoin(int pos, String dbColumn) {
     String p0 = aggregation.substring(0, pos + 1);
-    aggregationParsed =  p0 + "${ta}." + dbColumn + aggregation.substring(aggregation.length() - 1);
+    aggregationParsed = p0 + "${ta}." + dbColumn + aggregation.substring(aggregation.length() - 1);
     return aggregationParsed;
   }
 
@@ -906,17 +901,6 @@ public class DeployBeanProperty {
     this.isTransient = true;
   }
 
-  /**
-   * Set the bean read method.
-   * <p>
-   * NB: That a BeanReflectGetter is used to actually perform the getting of
-   * property values from a bean. This is due to performance considerations.
-   * </p>
-   */
-  public void setReadMethod(Method readMethod) {
-    this.readMethod = readMethod;
-  }
-
   /**
    * Return the property type.
    */
@@ -1122,7 +1106,7 @@ public class DeployBeanProperty {
    */
   public Object /*AnnotatedField*/ getJacksonField() {
     com.fasterxml.jackson.databind.introspect.AnnotatedClass jac =
-        (com.fasterxml.jackson.databind.introspect.AnnotatedClass) getDesc().getJacksonAnnotatedClass();
+      (com.fasterxml.jackson.databind.introspect.AnnotatedClass) getDesc().getJacksonAnnotatedClass();
     for (com.fasterxml.jackson.databind.introspect.AnnotatedField candidate : jac.fields()) {
       if (candidate.getName().equals(getName())) {
         return candidate;
@@ -1130,4 +1114,102 @@ public class DeployBeanProperty {
     }
     return null;
   }
+
+  public void initMetaAnnotations(Set<Class<?>> metaAnnotationsFilter) {
+    metaAnnotations = AnnotationUtil.metaFindAllFor(field, metaAnnotationsFilter);
+  }
+
+  @SuppressWarnings("unchecked")
+  public <A extends Annotation> A getMetaAnnotation(Class<A> annotationType) {
+    for (Annotation ann : metaAnnotations) {
+      if (ann.annotationType() == annotationType) {
+        return (A) ann;
+      }
+    }
+    return null;
+  }
+
+  @SuppressWarnings("unchecked")
+  public <A extends Annotation> List<A> getMetaAnnotations(Class<A> annotationType) {
+    List<A> result = new ArrayList<>();
+    for (Annotation ann : metaAnnotations) {
+      if (ann.annotationType() == annotationType) {
+        result.add((A) ann);
+      }
+    }
+    return result;
+  }
+
+  public List<Size> getMetaAnnotationSize() {
+    final List<Size> size = getMetaAnnotations(Size.class);
+    final List<Size.List> lists = getMetaAnnotations(Size.List.class);
+    for (Size.List list : lists) {
+      Collections.addAll(size, list.value());
+    }
+    return size;
+  }
+
+  public Formula getMetaAnnotationFormula(Platform platform) {
+    Formula fallback = null;
+    for (Annotation ann : metaAnnotations) {
+      if (ann.annotationType() == Formula.class) {
+        Formula formula = (Formula) ann;
+        final Platform[] platforms = formula.platforms();
+        if (platforms.length == 0) {
+          fallback = formula;
+        } else if (matchPlatform(platforms, platform)) {
+          return formula;
+        }
+
+      } else if (ann.annotationType() == Formula.List.class) {
+        Formula.List formulaList = (Formula.List) ann;
+        for (Formula formula : formulaList.value()) {
+          final Platform[] platforms = formula.platforms();
+          if (platforms.length == 0) {
+            fallback = formula;
+          } else if (matchPlatform(platforms, platform)) {
+            return formula;
+          }
+        }
+      }
+    }
+    return fallback;
+  }
+
+  public Where getMetaAnnotationWhere(Platform platform) {
+    Where fallback = null;
+    for (Annotation ann : metaAnnotations) {
+      if (ann.annotationType() == Where.class) {
+        Where where = (Where) ann;
+        final Platform[] platforms = where.platforms();
+        if (platforms.length == 0) {
+          fallback = where;
+        } else if (matchPlatform(where.platforms(), platform)) {
+          return where;
+        }
+
+      } else if (ann.annotationType() == Where.List.class) {
+        Where.List whereList = (Where.List) ann;
+        for (Where where : whereList.value()) {
+          final Platform[] platforms = where.platforms();
+          if (platforms.length == 0) {
+            fallback = where;
+          } else if (matchPlatform(where.platforms(), platform)) {
+            return where;
+          }
+        }
+      }
+    }
+    return fallback;
+  }
+
+  private boolean matchPlatform(Platform[] platforms, Platform match) {
+    for (Platform platform : platforms) {
+      if (platform == match) {
+        return true;
+      }
+    }
+    return false;
+  }
+
 }

src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java

@@ -125,7 +125,7 @@ class AnnotationAssocManys extends AnnotationParser {
       prop.setMapKey(mapKey.name());
     }
 
-    Where where = get(prop, Where.class);
+    Where where = prop.getMetaAnnotationWhere(platform);
     if (where != null) {
       prop.setExtraWhere(where.clause());
     }
@@ -138,8 +138,8 @@ class AnnotationAssocManys extends AnnotationParser {
     // check for manually defined joins
     BeanTable beanTable = prop.getBeanTable();
 
-    Set<JoinColumn> joinColumns = getAll(prop, JoinColumn.class);
-    if (joinColumns != null) {
+    Set<JoinColumn> joinColumns = annotationJoinColumns(prop);
+    if (!joinColumns.isEmpty()) {
       prop.getTableJoin().addJoinColumn(util, true, joinColumns, beanTable);
     }
 
@@ -194,7 +194,7 @@ class AnnotationAssocManys extends AnnotationParser {
     if (!elementCollection.targetClass().equals(void.class)) {
       prop.setTargetType(elementCollection.targetClass());
     }
-    Column column = get(prop, Column.class);
+    Column column = prop.getMetaAnnotation(Column.class);
     if (column != null) {
       prop.setDbColumn(column.name());
       prop.setDbLength(column.length());

src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java

@@ -82,7 +82,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
       prop.setId();
       prop.setNullable(false);
     }
-    Column column = get(prop, Column.class);
+    Column column = prop.getMetaAnnotation(Column.class);
     if (column != null && !isEmpty(column.name())) {
       // have this in for AssocOnes used on
       // Sql based beans...
@@ -100,7 +100,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
       prop.setForeignKey(new PropertyForeignKey(dbForeignKey));
     }
 
-    Where where = get(prop, Where.class);
+    Where where = prop.getMetaAnnotationWhere(platform);
     if (where != null) {
       // not expecting this to be used on assoc one properties
       prop.setExtraWhere(where.clause());
@@ -131,12 +131,11 @@ public class AnnotationAssocOnes extends AnnotationParser {
 
     // check for manually defined joins
     BeanTable beanTable = prop.getBeanTable();
-    for (JoinColumn joinColumn : getAll(prop, JoinColumn.class)) {
+    for (JoinColumn joinColumn : annotationJoinColumns(prop)) {
       setFromJoinColumn(prop, beanTable, joinColumn);
       checkForNoConstraint(prop, joinColumn);
     }
 
-
     JoinTable joinTable = get(prop, JoinTable.class);
     if (joinTable != null) {
       for (JoinColumn joinColumn : joinTable.joinColumns()) {

src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java

@@ -1,16 +1,27 @@
 package io.ebeaninternal.server.deploy.parse;
 
+import io.ebean.annotation.Aggregation;
+import io.ebean.annotation.Avg;
+import io.ebean.annotation.DbMigration;
+import io.ebean.annotation.Index;
+import io.ebean.annotation.Indices;
+import io.ebean.annotation.Max;
+import io.ebean.annotation.Min;
 import io.ebean.annotation.Platform;
+import io.ebean.annotation.Sum;
 import io.ebean.config.NamingConvention;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
+import javax.persistence.AttributeOverride;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumns;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
+import java.util.Collections;
 import java.util.Set;
 
 /**
@@ -41,7 +52,7 @@ import java.util.Set;
 abstract class AnnotationBase {
 
   final DatabasePlatform databasePlatform;
-  private final Platform platform;
+  protected final Platform platform;
   final NamingConvention namingConvention;
   final DeployUtil util;
 
@@ -64,68 +75,43 @@ abstract class AnnotationBase {
     return s == null || s.trim().isEmpty();
   }
 
-  /**
-   * Return the annotation for the property.
-   * <p>
-   * Looks first at the field and then at the getter method. It searches for meta-annotations, but not
-   * recursively in the class hierarchy.
-   * </p>
-   * <p>
-   * If a <code>repeatable</code> annotation class is specified and the annotation is platform
-   * specific then the platform specific annotation is returned. Otherwise the first annotation
-   * is returned. Note that you need no longer handle "java 1.6 repeatable containers"
-   * like {@link JoinColumn} / {@link JoinColumns} yourself.
-   * </p>
-   * <p>
-   */
   <T extends Annotation> T get(DeployBeanProperty prop, Class<T> annClass) {
-    T a = null;
-    Field field = prop.getField();
-    if (field != null) {
-      a = AnnotationUtil.findAnnotation(field, annClass, platform);
-    }
-    if (a == null) {
-      Method method = prop.getReadMethod();
-      if (method != null) {
-        a = AnnotationUtil.findAnnotation(method, annClass, platform);
-      }
-    }
-    return a;
+    return AnnotationUtil.get(prop.getField(), annClass);
   }
 
-  /**
-   * Return all annotations for this property. Annotations are not filtered by platfrom and you'll get
-   * really all annotations that are directly, indirectly or meta-present.
-   */
-  <T extends Annotation> Set<T> getAll(DeployBeanProperty prop, Class<T> annClass) {
-    Set<T> ret = null;
-    Field field = prop.getField();
-    if (field != null) {
-      ret = AnnotationUtil.findAnnotations(field, annClass);
-    }
-    Method method = prop.getReadMethod();
-    if (method != null) {
-      if (ret != null) {
-        ret.addAll(AnnotationUtil.findAnnotations(method, annClass));
-      } else {
-        ret = AnnotationUtil.findAnnotations(method, annClass);
-      }
-    }
-    return ret;
+  <T extends Annotation> boolean has(DeployBeanProperty prop, Class<T> annClass) {
+    return AnnotationUtil.has(prop.getField(), annClass);
   }
 
-  /**
-   * Return the annotation for the property.
-   * <p>
-   * Looks first at the field and then at the getter method. then at class level.
-   * (This is used for SequenceGenerator e.g.)
-   * </p>
-   */
-  <T extends Annotation> T find(DeployBeanProperty prop, Class<T> annClass) {
-    T a = get(prop, annClass);
-    if (a == null) {
-      a = AnnotationUtil.findAnnotation(prop.getOwningType(), annClass, platform);
+  Set<JoinColumn> annotationJoinColumns(DeployBeanProperty prop) {
+    return AnnotationFind.joinColumns(prop.getField());
+  }
+
+  Set<AttributeOverride> annotationAttributeOverrides(DeployBeanProperty prop) {
+    return AnnotationFind.attributeOverrides(prop.getField());
+  }
+
+  Set<Index> annotationIndexes(DeployBeanProperty prop) {
+    return AnnotationFind.indexes(prop.getField());
+  }
+
+  Set<DbMigration> annotationDbMigrations(DeployBeanProperty prop) {
+    return AnnotationFind.dbMigrations(prop.getField());
+  }
+
+  Set<Index> annotationClassIndexes(Class<?> cls) {
+    Set<Index> result = AnnotationUtil.typeGetAll(cls, Index.class);
+    for (Indices index : AnnotationUtil.typeGetAll(cls, Indices.class)) {
+      Collections.addAll(result, index.value());
     }
-    return a;
+    return result;
+  }
+
+  Set<NamedQuery> annotationClassNamedQuery(Class<?> cls) {
+    Set<NamedQuery> result = AnnotationUtil.typeGetAll(cls, NamedQuery.class);
+    for (NamedQueries queries : AnnotationUtil.typeGetAll(cls, NamedQueries.class)) {
+      Collections.addAll(result, queries.value());
+    }
+    return result;
   }
 }

src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java

@@ -31,8 +31,7 @@ import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
 
-import static io.ebean.util.AnnotationUtil.findAnnotationRecursive;
-import static io.ebean.util.AnnotationUtil.findAnnotationsRecursive;
+import static io.ebean.util.AnnotationUtil.typeGet;
 
 /**
  * Read the class level deployment annotations.
@@ -62,9 +61,8 @@ public class AnnotationClass extends AnnotationParser {
    * Parse any AttributeOverride set on the class.
    */
   void parseAttributeOverride() {
-
     Class<?> cls = descriptor.getBeanType();
-    AttributeOverride override = findAnnotationRecursive(cls, AttributeOverride.class);
+    AttributeOverride override = typeGet(cls, AttributeOverride.class);
     if (override != null) {
       String propertyName = override.name();
       Column column = override.column();
@@ -104,16 +102,15 @@ public class AnnotationClass extends AnnotationParser {
   }
 
   private void read(Class<?> cls) {
-
     // maybe doc store only so check for this before @Entity
-    DocStore docStore = findAnnotationRecursive(cls, DocStore.class);
+    DocStore docStore = typeGet(cls, DocStore.class);
     if (docStore != null) {
       descriptor.readDocStore(docStore);
       descriptor.setEntityType(EntityType.DOC);
       descriptor.setName(cls.getSimpleName());
     }
 
-    Entity entity = findAnnotationRecursive(cls, Entity.class);
+    Entity entity = typeGet(cls, Entity.class);
     if (entity != null) {
       descriptor.setEntityType(EntityType.ORM);
       if (entity.name().isEmpty()) {
@@ -123,37 +120,37 @@ public class AnnotationClass extends AnnotationParser {
       }
     }
 
-    Identity identity = findAnnotationRecursive(cls, Identity.class);
+    Identity identity = typeGet(cls, Identity.class);
     if (identity != null) {
       descriptor.setIdentityMode(identity);
     }
 
-    IdClass idClass = findAnnotationRecursive(cls, IdClass.class);
+    IdClass idClass = typeGet(cls, IdClass.class);
     if (idClass != null) {
       descriptor.setIdClass(idClass.value());
     }
 
-    Embeddable embeddable = findAnnotationRecursive(cls, Embeddable.class);
+    Embeddable embeddable = typeGet(cls, Embeddable.class);
     if (embeddable != null) {
       descriptor.setEntityType(EntityType.EMBEDDED);
       descriptor.setName("Embeddable:" + cls.getSimpleName());
     }
 
-    for (Index index : findAnnotationsRecursive(cls, Index.class)) {
+    for (Index index : annotationClassIndexes(cls)) {
       descriptor.addIndex(new IndexDefinition(convertColumnNames(index.columnNames()), index.name(),
         index.unique(), index.platforms(), index.concurrent(), index.definition()));
     }
 
-    UniqueConstraint uc = findAnnotationRecursive(cls, UniqueConstraint.class);
+    UniqueConstraint uc = typeGet(cls, UniqueConstraint.class);
     if (uc != null) {
       descriptor.addIndex(new IndexDefinition(convertColumnNames(uc.columnNames())));
     }
 
-    View view = findAnnotationRecursive(cls, View.class);
+    View view = typeGet(cls, View.class);
     if (view != null) {
       descriptor.setView(view.name(), view.dependentTables());
     }
-    Table table = findAnnotationRecursive(cls, Table.class);
+    Table table = typeGet(cls, Table.class);
     if (table != null) {
       UniqueConstraint[] uniqueConstraints = table.uniqueConstraints();
       for (UniqueConstraint c : uniqueConstraints) {
@@ -161,54 +158,54 @@ public class AnnotationClass extends AnnotationParser {
       }
     }
 
-    StorageEngine storage = findAnnotationRecursive(cls, StorageEngine.class);
+    StorageEngine storage = typeGet(cls, StorageEngine.class);
     if (storage != null) {
       descriptor.setStorageEngine(storage.value());
     }
 
-    DbPartition partition = findAnnotationRecursive(cls, DbPartition.class);
+    DbPartition partition = typeGet(cls, DbPartition.class);
     if (partition != null) {
       descriptor.setPartitionMeta(new PartitionMeta(partition.mode(), partition.property()));
     }
 
-    Draftable draftable = findAnnotationRecursive(cls, Draftable.class);
+    Draftable draftable = typeGet(cls, Draftable.class);
     if (draftable != null) {
       descriptor.setDraftable();
     }
 
-    DraftableElement draftableElement = findAnnotationRecursive(cls, DraftableElement.class);
+    DraftableElement draftableElement = typeGet(cls, DraftableElement.class);
     if (draftableElement != null) {
       descriptor.setDraftableElement();
     }
 
-    ReadAudit readAudit = findAnnotationRecursive(cls, ReadAudit.class);
+    ReadAudit readAudit = typeGet(cls, ReadAudit.class);
     if (readAudit != null) {
       descriptor.setReadAuditing();
     }
 
-    History history = findAnnotationRecursive(cls, History.class);
+    History history = typeGet(cls, History.class);
     if (history != null) {
       descriptor.setHistorySupport();
     }
 
-    DbComment comment = findAnnotationRecursive(cls, DbComment.class);
+    DbComment comment = typeGet(cls, DbComment.class);
     if (comment != null) {
       descriptor.setDbComment(comment.value());
     }
 
     if (!disableL2Cache) {
-      Cache cache = findAnnotationRecursive(cls, Cache.class);
+      Cache cache = typeGet(cls, Cache.class);
       if (cache != null) {
         descriptor.setCache(cache);
       } else {
-        InvalidateQueryCache invalidateQueryCache = findAnnotationRecursive(cls, InvalidateQueryCache.class);
+        InvalidateQueryCache invalidateQueryCache = typeGet(cls, InvalidateQueryCache.class);
         if (invalidateQueryCache != null) {
           descriptor.setInvalidateQueryCache(invalidateQueryCache.region());
         }
       }
     }
 
-    for (NamedQuery namedQuery : findAnnotationsRecursive(cls, NamedQuery.class)) {
+    for (NamedQuery namedQuery : annotationClassNamedQuery(cls)) {
       descriptor.addNamedQuery(namedQuery.name(), namedQuery.query());
     }
   }

src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java

@@ -106,8 +106,8 @@ public class AnnotationFields extends AnnotationParser {
    */
   @Override
   public void parse() {
-
     for (DeployBeanProperty prop : descriptor.propertiesAll()) {
+      prop.initMetaAnnotations(readConfig.getMetaAnnotations());
       if (prop instanceof DeployBeanPropertyAssoc<?>) {
         readAssocOne((DeployBeanPropertyAssoc<?>) prop);
       } else {
@@ -123,13 +123,11 @@ public class AnnotationFields extends AnnotationParser {
 
     readJsonAnnotations(prop);
 
-    Id id = get(prop, Id.class);
-    if (id != null) {
+    if (has(prop, Id.class)) {
       readIdAssocOne(prop);
     }
 
-    EmbeddedId embeddedId = get(prop, EmbeddedId.class);
-    if (embeddedId != null) {
+    if (has(prop, EmbeddedId.class)) {
       prop.setId();
       prop.setNullable(false);
       prop.setEmbedded();
@@ -140,7 +138,7 @@ public class AnnotationFields extends AnnotationParser {
     if (docEmbedded != null) {
       prop.setDocStoreEmbedded(docEmbedded.doc());
       if (descriptor.isDocStoreOnly()) {
-        if (get(prop, ManyToOne.class) == null) {
+        if (has(prop, ManyToOne.class)) {
           prop.setEmbedded();
           prop.setDbInsertable(true);
           prop.setDbUpdateable(true);
@@ -155,20 +153,20 @@ public class AnnotationFields extends AnnotationParser {
       readEmbeddedAttributeOverrides((DeployBeanPropertyAssocOne<?>) prop);
     }
 
-    Formula formula = get(prop, Formula.class);
+    Formula formula = prop.getMetaAnnotationFormula(platform);
     if (formula != null) {
       prop.setSqlFormula(formula.select(), formula.join());
     }
 
     initWhoProperties(prop);
-    readDbMigration(prop);
+    initDbMigration(prop);
   }
 
   private void initWhoProperties(DeployBeanProperty prop) {
-    if (get(prop, WhoModified.class) != null) {
+    if (has(prop, WhoModified.class)) {
       generatedPropFactory.setWhoModified(prop);
     }
-    if (get(prop, WhoCreated.class) != null) {
+    if (has(prop, WhoCreated.class)) {
       generatedPropFactory.setWhoCreated(prop);
     }
   }
@@ -188,7 +186,7 @@ public class AnnotationFields extends AnnotationParser {
     prop.setDbInsertable(true);
     prop.setDbUpdateable(true);
 
-    Column column = get(prop, Column.class);
+    Column column = prop.getMetaAnnotation(Column.class);
     if (column != null) {
       readColumn(column, prop);
     }
@@ -200,6 +198,32 @@ public class AnnotationFields extends AnnotationParser {
       prop.setDbColumn(namingConvention.getColumnFromProperty(beanType, prop.getName()));
     }
 
+    initIdentity(prop);
+    initTenantId(prop);
+    initDbJson(prop);
+    initFormula(prop);
+    initVersion(prop);
+    initWhen(prop);
+    initWhoProperties(prop);
+    initDbMigration(prop);
+
+    // Want to process last so we can use with @Formula
+    if (has(prop, Transient.class)) {
+      // it is not a persistent property.
+      prop.setDbRead(false);
+      prop.setDbInsertable(false);
+      prop.setDbUpdateable(false);
+      prop.setTransient();
+    }
+
+    initEncrypt(prop);
+
+    for (Index index : annotationIndexes(prop)) {
+      addIndex(prop, index);
+    }
+  }
+
+  private void initIdentity(DeployBeanProperty prop) {
     Id id = get(prop, Id.class);
     GeneratedValue gen = get(prop, GeneratedValue.class);
     if (gen != null) {
@@ -219,7 +243,7 @@ public class AnnotationFields extends AnnotationParser {
     if (temporal != null) {
       readTemporal(temporal, prop);
 
-    } else if (get(prop, Lob.class) != null) {
+    } else if (has(prop, Lob.class)) {
       util.setLobType(prop);
     }
 
@@ -228,53 +252,58 @@ public class AnnotationFields extends AnnotationParser {
       prop.setDbLength(length.value());
     }
 
-    io.ebean.annotation.NotNull nonNull = get(prop, io.ebean.annotation.NotNull.class);
-    if (nonNull != null) {
+    if (has(prop, io.ebean.annotation.NotNull.class)) {
+      prop.setNullable(false);
+    }
+  }
+
+  private void initValidation(DeployBeanProperty prop) {
+    NotNull notNull = get(prop, NotNull.class);
+    if (notNull != null && isEbeanValidationGroups(notNull.groups())) {
+      // Not null on all validation groups so enable
+      // DDL generation of Not Null Constraint
       prop.setNullable(false);
     }
 
-    if (validationAnnotations) {
-      NotNull notNull = get(prop, NotNull.class);
-      if (notNull != null && isEbeanValidationGroups(notNull.groups())) {
-        // Not null on all validation groups so enable
-        // DDL generation of Not Null Constraint
-        prop.setNullable(false);
+    if (!prop.isLob()) {
+      // take the max size of all @Size annotations
+      int maxSize = -1;
+      for (Size size : prop.getMetaAnnotationSize()) {
+        if (size.max() < Integer.MAX_VALUE) {
+          maxSize = Math.max(maxSize, size.max());
+        }
       }
-
-      if (!prop.isLob()) {
-        // take the max size of all @Size annotations
-        int maxSize = -1;
-        for (Size size : getAll(prop, Size.class)) {
-          if (size.max() < Integer.MAX_VALUE) {
-            maxSize = Math.max(maxSize, size.max());
-          }
-        }
-        if (maxSize != -1) {
-          prop.setDbLength(maxSize);
-        }
+      if (maxSize != -1) {
+        prop.setDbLength(maxSize);
       }
     }
+  }
 
-    if (get(prop, TenantId.class) != null) {
+  private void initTenantId(DeployBeanProperty prop) {
+    if (validationAnnotations) {
+      initValidation(prop);
+    }
+    if (has(prop, TenantId.class)) {
       prop.setTenantId();
     }
-    if (get(prop, Draft.class) != null) {
+    if (has(prop, Draft.class)) {
       prop.setDraft();
     }
-    if (get(prop, DraftOnly.class) != null) {
+    if (has(prop, DraftOnly.class)) {
       prop.setDraftOnly();
     }
-    if (get(prop, DraftDirty.class) != null) {
+    if (has(prop, DraftDirty.class)) {
       prop.setDraftDirty();
     }
-    if (get(prop, DraftReset.class) != null) {
+    if (has(prop, DraftReset.class)) {
       prop.setDraftReset();
     }
-    SoftDelete softDelete = get(prop, SoftDelete.class);
-    if (softDelete != null) {
+    if (has(prop, SoftDelete.class)) {
       prop.setSoftDelete();
     }
+  }
 
+  private void initDbJson(DeployBeanProperty prop) {
     DbComment comment = get(prop, DbComment.class);
     if (comment != null) {
       prop.setDbComment(comment.value());
@@ -296,7 +325,9 @@ public class AnnotationFields extends AnnotationParser {
     if (dbArray != null) {
       util.setDbArray(prop, dbArray);
     }
+  }
 
+  private void initFormula(DeployBeanProperty prop) {
     DocCode docCode = get(prop, DocCode.class);
     if (docCode != null) {
       prop.setDocCode(docCode);
@@ -309,19 +340,19 @@ public class AnnotationFields extends AnnotationParser {
     if (docProperty != null) {
       prop.setDocProperty(docProperty);
     }
-
-    Formula formula = get(prop, Formula.class);
+    Formula formula = prop.getMetaAnnotationFormula(platform);
     if (formula != null) {
       prop.setSqlFormula(formula.select(), formula.join());
     }
 
-    Aggregation aggregation = get(prop, Aggregation.class);
+    final Aggregation aggregation = prop.getMetaAnnotation(Aggregation.class);
     if (aggregation != null) {
       prop.setAggregation(aggregation.value().replace("$1", prop.getName()));
     }
+  }
 
-    Version version = get(prop, Version.class);
-    if (version != null) {
+  private void initVersion(DeployBeanProperty prop) {
+    if (has(prop, Version.class)) {
       // explicitly specify a version column
       prop.setVersionColumn();
       generatedPropFactory.setVersion(prop);
@@ -337,35 +368,19 @@ public class AnnotationFields extends AnnotationParser {
       // use the default Lob fetchType
       prop.setFetchType(defaultLobFetchType);
     }
+  }
 
-    if (get(prop, WhenCreated.class) != null || get(prop, CreatedTimestamp.class) != null) {
+  private void initWhen(DeployBeanProperty prop) {
+    if (has(prop, WhenCreated.class) || has(prop, CreatedTimestamp.class)) {
       generatedPropFactory.setInsertTimestamp(prop);
     }
-
-    if (get(prop, WhenModified.class) != null || get(prop, UpdatedTimestamp.class) != null) {
+    if (has(prop, WhenModified.class) || has(prop, UpdatedTimestamp.class)) {
       generatedPropFactory.setUpdateTimestamp(prop);
     }
+  }
 
-    initWhoProperties(prop);
-
-    if (get(prop, HistoryExclude.class) != null) {
-      prop.setExcludedFromHistory();
-    }
-
-    readDbMigration(prop);
-
-    // Want to process last so we can use with @Formula
-    Transient t = get(prop, Transient.class);
-    if (t != null) {
-      // it is not a persistent property.
-      prop.setDbRead(false);
-      prop.setDbInsertable(false);
-      prop.setDbUpdateable(false);
-      prop.setTransient();
-    }
-
+  private void initEncrypt(DeployBeanProperty prop) {
     if (!prop.isTransient()) {
-
       EncryptDeploy encryptDeploy = util.getEncryptDeploy(info.getDescriptor().getBaseTableFull(), prop.getDbColumn());
       if (encryptDeploy == null || encryptDeploy.getMode() == Mode.MODE_ANNOTATION) {
         Encrypted encrypted = get(prop, Encrypted.class);
@@ -376,24 +391,22 @@ public class AnnotationFields extends AnnotationParser {
         setEncryption(prop, encryptDeploy.isDbEncrypt(), encryptDeploy.getDbLength());
       }
     }
-
-    Set<Index> indices = getAll(prop, Index.class);
-    for (Index index : indices) {
-      addIndex(prop, index);
-    }
   }
 
   private void readIdentity(Identity identity) {
     descriptor.setIdentityMode(identity);
   }
 
-  private void readDbMigration(DeployBeanProperty prop) {
+  private void initDbMigration(DeployBeanProperty prop) {
+    if (has(prop, HistoryExclude.class)) {
+      prop.setExcludedFromHistory();
+    }
     DbDefault dbDefault = get(prop, DbDefault.class);
     if (dbDefault != null) {
       prop.setDbColumnDefault(dbDefault.value());
     }
 
-    Set<DbMigration> dbMigration = getAll(prop, DbMigration.class);
+    Set<DbMigration> dbMigration = annotationDbMigrations(prop);
     dbMigration.forEach(ann -> prop.addDbMigrationInfo(
       new DbMigrationInfo(ann.preAdd(), ann.postAdd(), ann.preAlter(), ann.postAlter(), ann.platforms())));
   }
@@ -445,15 +458,13 @@ public class AnnotationFields extends AnnotationParser {
       prop.setJsonSerialize(jsonIgnore.serialize());
       prop.setJsonDeserialize(jsonIgnore.deserialize());
     }
-    if (get(prop, UnmappedJson.class) != null) {
+    if (has(prop, UnmappedJson.class)) {
       prop.setUnmappedJson();
     }
   }
 
   private boolean hasRelationshipItem(DeployBeanProperty prop) {
-    return get(prop, OneToMany.class) != null ||
-      get(prop, ManyToOne.class) != null ||
-      get(prop, OneToOne.class) != null;
+    return has(prop, OneToMany.class) || has(prop, ManyToOne.class) || has(prop, OneToOne.class);
   }
 
   private void setEncryption(DeployBeanProperty prop, boolean dbEncString, int dbLen) {
@@ -528,7 +539,7 @@ public class AnnotationFields extends AnnotationParser {
     }
     descriptor.setIdGeneratedValue();
 
-    SequenceGenerator seq = find(prop, SequenceGenerator.class);
+    SequenceGenerator seq = get(prop, SequenceGenerator.class);
     if (seq != null) {
       String seqName = seq.sequenceName();
       if (seqName.isEmpty()) {

src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java

@@ -0,0 +1,75 @@
+package io.ebeaninternal.server.deploy.parse;
+
+import io.ebean.annotation.DbMigration;
+import io.ebean.annotation.Index;
+import io.ebean.annotation.Indices;
+
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import java.lang.reflect.Field;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import static io.ebean.util.AnnotationUtil.get;
+
+public class AnnotationFind {
+
+  public static Set<JoinColumn> joinColumns(Field field) {
+    final JoinColumn col = get(field, JoinColumn.class);
+    if (col != null) {
+      return Collections.singleton(col);
+    }
+    final JoinColumns cols = get(field, JoinColumns.class);
+    if (cols != null) {
+      Set<JoinColumn> result = new LinkedHashSet<>();
+      Collections.addAll(result, cols.value());
+      return result;
+    }
+    return Collections.emptySet();
+  }
+
+  public static Set<AttributeOverride> attributeOverrides(Field field) {
+    final AttributeOverride ann = get(field, AttributeOverride.class);
+    if (ann != null) {
+      return Collections.singleton(ann);
+    }
+    final AttributeOverrides collection = get(field, AttributeOverrides.class);
+    if (collection != null) {
+      Set<AttributeOverride> result = new LinkedHashSet<>();
+      Collections.addAll(result, collection.value());
+      return result;
+    }
+    return Collections.emptySet();
+  }
+
+  public static Set<Index> indexes(Field field) {
+    final Index ann = get(field, Index.class);
+    if (ann != null) {
+      return Collections.singleton(ann);
+    }
+    final Indices collection = get(field, Indices.class);
+    if (collection != null) {
+      Set<Index> result = new LinkedHashSet<>();
+      Collections.addAll(result, collection.value());
+      return result;
+    }
+    return Collections.emptySet();
+  }
+
+  public static Set<DbMigration> dbMigrations(Field field) {
+    final DbMigration ann = get(field, DbMigration.class);
+    if (ann != null) {
+      return Collections.singleton(ann);
+    }
+    final DbMigration.List collection = get(field, DbMigration.List.class);
+    if (collection != null) {
+      Set<DbMigration> result = new LinkedHashSet<>();
+      Collections.addAll(result, collection.value());
+      return result;
+    }
+    return Collections.emptySet();
+  }
+}

src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java

@@ -87,7 +87,7 @@ public abstract class AnnotationParser extends AnnotationBase {
    */
   void readEmbeddedAttributeOverrides(DeployBeanPropertyAssocOne<?> prop) {
 
-    Set<AttributeOverride> attrOverrides = getAll(prop, AttributeOverride.class);
+    Set<AttributeOverride> attrOverrides = annotationAttributeOverrides(prop);
     if (!attrOverrides.isEmpty()) {
       HashMap<String, String> propMap = new HashMap<>(attrOverrides.size());
       for (AttributeOverride attrOverride : attrOverrides) {
@@ -95,7 +95,6 @@ public abstract class AnnotationParser extends AnnotationBase {
       }
       prop.getDeployEmbedded().putAll(propMap);
     }
-
   }
 
   void readColumn(Column columnAnn, DeployBeanProperty prop) {

src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationSql.java

@@ -16,8 +16,7 @@ class AnnotationSql extends AnnotationParser {
   @Override
   public void parse() {
     Class<?> cls = descriptor.getBeanType();
-    Sql sql = AnnotationUtil.findAnnotationRecursive(cls, Sql.class);
-    if (sql != null) {
+    if (AnnotationUtil.typeHas(cls, Sql.class)) {
       descriptor.setEntityType(BeanDescriptor.EntityType.SQL);
     }
   }

src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java

@@ -23,7 +23,6 @@ import javax.persistence.ManyToOne;
 import javax.persistence.PersistenceException;
 import javax.persistence.Transient;
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -53,7 +52,6 @@ public class DeployCreateProperties {
    * Create the appropriate properties for a bean.
    */
   public void createProperties(DeployBeanDescriptor<?> desc) {
-
     createProperties(desc, desc.getBeanType(), 0);
     desc.sortProperties();
   }
@@ -89,22 +87,14 @@ public class DeployCreateProperties {
       // ignore all fields on model (_$dbName)
       return;
     }
-    boolean scalaObject = desc.isScalaObject();
 
     try {
-      Method[] declaredMethods = beanType.getDeclaredMethods();
       Field[] fields = beanType.getDeclaredFields();
 
       for (int i = 0; i < fields.length; i++) {
-
         Field field = fields[i];
         if (!ignoreField(field)) {
-          String fieldName = getFieldName(field, beanType);
-          String initFieldName = initCap(fieldName);
-
-          Method getter = findGetter(field, initFieldName, declaredMethods, scalaObject);
-
-          DeployBeanProperty prop = createProp(desc, field, beanType, getter);
+          DeployBeanProperty prop = createProp(desc, field, beanType);
           if (prop != null) {
             // set a order that gives priority to inherited properties
             // push Id/EmbeddedId up and CreatedTimestamp/UpdatedTimestamp down
@@ -137,68 +127,6 @@ public class DeployCreateProperties {
     }
   }
 
-  /**
-   * Make the first letter of the string upper case.
-   */
-  private String initCap(String str) {
-    if (str.length() > 1) {
-      return Character.toUpperCase(str.charAt(0)) + str.substring(1);
-    } else {
-      // only a single char
-      return str.toUpperCase();
-    }
-  }
-
-  /**
-   * Return the bean spec field name (trim of "is" from boolean types)
-   */
-  private String getFieldName(Field field, Class<?> beanType) {
-
-    String name = field.getName();
-
-    if ((Boolean.class.equals(field.getType()) || boolean.class.equals(field.getType()))
-      && name.startsWith("is") && name.length() > 2) {
-
-      // it is a boolean type field starting with "is"
-      char c = name.charAt(2);
-      if (Character.isUpperCase(c)) {
-        String msg = "trimming off 'is' from boolean field name " + name + " in class " + beanType.getName();
-        logger.info(msg);
-
-        return name.substring(2);
-      }
-    }
-    return name;
-  }
-
-  /**
-   * Find a public non-static getter method that matches this field (according to bean-spec rules).
-   */
-  private Method findGetter(Field field, String initFieldName, Method[] declaredMethods, boolean scalaObject) {
-
-    String methGetName = "get" + initFieldName;
-    String methIsName = "is" + initFieldName;
-    String scalaGet = field.getName();
-
-    for (Method m : declaredMethods) {
-      if ((scalaObject && m.getName().equals(scalaGet)) || m.getName().equals(methGetName)
-        || m.getName().equals(methIsName)) {
-
-        Class<?>[] params = m.getParameterTypes();
-        if (params.length == 0) {
-          if (field.getType().equals(m.getReturnType())) {
-            int modifiers = m.getModifiers();
-            if (Modifier.isPublic(modifiers) && !Modifier.isStatic(modifiers)) {
-              // we find it...
-              return m;
-            }
-          }
-        }
-      }
-    }
-    return null;
-  }
-
   @SuppressWarnings({"unchecked"})
   private DeployBeanProperty createManyType(DeployBeanDescriptor<?> desc, Class<?> targetType, ManyType manyType) {
 
@@ -218,7 +146,7 @@ public class DeployCreateProperties {
 
     Class<?> propertyType = field.getType();
 
-    ManyToOne manyToOne = AnnotationUtil.findAnnotation(field, ManyToOne.class);
+    ManyToOne manyToOne = AnnotationUtil.get(field, ManyToOne.class);
     if (manyToOne != null) {
       Class<?> tt = manyToOne.targetEntity();
       if (!tt.equals(void.class)) {
@@ -235,8 +163,7 @@ public class DeployCreateProperties {
       // List, Set or Map based object
       Class<?> targetType = determineTargetType(field);
       if (targetType == null) {
-        Transient transAnnotation = AnnotationUtil.findAnnotation(field, Transient.class);
-        if (transAnnotation != null) {
+        if (AnnotationUtil.has(field, Transient.class)) {
           // not supporting this field (generic type used)
           return null;
         }
@@ -271,21 +198,18 @@ public class DeployCreateProperties {
    * Return true if the field has one of the special mappings.
    */
   private boolean isSpecialScalarType(Field field) {
-    return (AnnotationUtil.findAnnotation(field, DbJson.class) != null)
-      || (AnnotationUtil.findAnnotation(field, DbJsonB.class) != null)
-      || (AnnotationUtil.findAnnotation(field, DbArray.class) != null)
-      || (AnnotationUtil.findAnnotation(field, DbMap.class) != null)
-      || (AnnotationUtil.findAnnotation(field, UnmappedJson.class) != null);
+    return (AnnotationUtil.has(field, DbJson.class))
+      || (AnnotationUtil.has(field, DbJsonB.class))
+      || (AnnotationUtil.has(field, DbArray.class))
+      || (AnnotationUtil.has(field, DbMap.class))
+      || (AnnotationUtil.has(field, UnmappedJson.class));
   }
 
   private boolean isTransientField(Field field) {
-
-    Transient t = AnnotationUtil.findAnnotation(field, Transient.class);
-    return (t != null);
+    return AnnotationUtil.has(field, Transient.class);
   }
 
-  private DeployBeanProperty createProp(DeployBeanDescriptor<?> desc, Field field, Class<?> beanType, Method getter) {
-
+  private DeployBeanProperty createProp(DeployBeanDescriptor<?> desc, Field field, Class<?> beanType) {
     DeployBeanProperty prop = createProp(desc, field);
     if (prop == null) {
       // transient annotation on unsupported type
@@ -293,9 +217,6 @@ public class DeployCreateProperties {
     } else {
       prop.setOwningType(beanType);
       prop.setName(field.getName());
-
-      // interested in the getter for reading annotations
-      prop.setReadMethod(getter);
       prop.setField(field);
       return prop;
     }

src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java

@@ -8,7 +8,6 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 import javax.persistence.DiscriminatorColumn;
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Inheritance;
-import java.lang.annotation.Annotation;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -110,11 +109,11 @@ public class DeployInherit {
       info.setParent(parent);
     }
 
-    Inheritance ia = AnnotationUtil.findAnnotationRecursive(cls, Inheritance.class);
+    Inheritance ia = AnnotationUtil.typeGet(cls, Inheritance.class);
     if (ia != null) {
       ia.strategy();
     }
-    DiscriminatorColumn da = AnnotationUtil.findAnnotationRecursive(cls, DiscriminatorColumn.class);
+    DiscriminatorColumn da = AnnotationUtil.typeGet(cls, DiscriminatorColumn.class);
     if (da != null) {
       // lowercase the discriminator column for RawSql and JSON
       info.setColumnName(da.name().toLowerCase());
@@ -124,7 +123,7 @@ public class DeployInherit {
     }
 
     if (!info.isAbstract()) {
-      DiscriminatorValue dv = AnnotationUtil.findAnnotation(cls, DiscriminatorValue.class); // do not search recursive
+      DiscriminatorValue dv = AnnotationUtil.get(cls, DiscriminatorValue.class); // do not search recursive
       if (dv != null) {
         info.setDiscriminatorValue(dv.value());
       } else {
@@ -144,17 +143,7 @@ public class DeployInherit {
   }
 
   private boolean isInheritanceClass(Class<?> cls) {
-    while (true) {
-      if (cls.equals(Object.class)) {
-        return false;
-      }
-      Annotation a = AnnotationUtil.findAnnotationRecursive(cls, Inheritance.class);
-      if (a != null) {
-        return true;
-      }
-      // search up the inheritance heirarchy
-      cls = cls.getSuperclass();
-    }
+    return AnnotationUtil.typeHas(cls, Inheritance.class);
   }
 
 }

src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaJacksonAnnotation.java

@@ -0,0 +1,8 @@
+package io.ebeaninternal.server.deploy.parse;
+
+class InitMetaJacksonAnnotation {
+
+  static void init(ReadAnnotationConfig readConfig) {
+    readConfig.addMetaAnnotation(com.fasterxml.jackson.annotation.JacksonAnnotation.class);
+  }
+}

src/main/java/io/ebeaninternal/server/deploy/parse/InitMetaValidationAnnotation.java

@@ -0,0 +1,11 @@
+package io.ebeaninternal.server.deploy.parse;
+
+import javax.validation.constraints.Size;
+
+class InitMetaValidationAnnotation {
+
+  static void init(ReadAnnotationConfig readConfig) {
+    readConfig.addMetaAnnotation(Size.class);
+    readConfig.addMetaAnnotation(Size.List.class);
+  }
+}

src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java

@@ -1,8 +1,15 @@
 package io.ebeaninternal.server.deploy.parse;
 
+import io.ebean.annotation.Aggregation;
+import io.ebean.annotation.Formula;
+import io.ebean.annotation.Where;
 import io.ebean.config.ServerConfig;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory;
 
+import javax.persistence.Column;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Configuration used when reading the deployment annotations.
  */
@@ -17,6 +24,8 @@ class ReadAnnotationConfig {
   private final boolean jacksonAnnotations;
   private final boolean idGeneratorAutomatic;
 
+  private final Set<Class<?>> metaAnnotations = new HashSet<>();
+
   ReadAnnotationConfig(GeneratedPropertyFactory generatedPropFactory, String asOfViewSuffix, String versionsBetweenSuffix, ServerConfig serverConfig) {
 
     this.generatedPropFactory = generatedPropFactory;
@@ -28,6 +37,16 @@ class ReadAnnotationConfig {
 
     this.javaxValidationAnnotations = generatedPropFactory.getClassLoadConfig().isJavaxValidationAnnotationsPresent();
     this.jacksonAnnotations = generatedPropFactory.getClassLoadConfig().isJacksonAnnotationsPresent();
+    this.metaAnnotations.add(Column.class);
+    this.metaAnnotations.add(Formula.class);
+    this.metaAnnotations.add(Formula.List.class);
+    this.metaAnnotations.add(Where.class);
+    this.metaAnnotations.add(Where.List.class);
+    this.metaAnnotations.add(Aggregation.class);
+  }
+
+  public void addMetaAnnotation(Class<?> annotation) {
+    metaAnnotations.add(annotation);
   }
 
   GeneratedPropertyFactory getGeneratedPropFactory() {
@@ -61,4 +80,8 @@ class ReadAnnotationConfig {
   boolean isJacksonAnnotations() {
     return jacksonAnnotations;
   }
+
+  public Set<Class<?>> getMetaAnnotations() {
+    return metaAnnotations;
+  }
 }

src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotations.java

@@ -14,6 +14,12 @@ public class ReadAnnotations {
 
   public ReadAnnotations(GeneratedPropertyFactory generatedPropFactory, String asOfViewSuffix, String versionsBetweenSuffix, ServerConfig serverConfig) {
     this.readConfig = new ReadAnnotationConfig(generatedPropFactory, asOfViewSuffix, versionsBetweenSuffix, serverConfig);
+    if (readConfig.isJavaxValidationAnnotations()) {
+      InitMetaValidationAnnotation.init(readConfig);
+    }
+    if (readConfig.isJacksonAnnotations()) {
+      InitMetaJacksonAnnotation.init(readConfig);
+    }
   }
 
   /**

src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java

@@ -18,6 +18,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
@@ -68,10 +69,9 @@ public class SaveManyBeans extends SaveManyBase {
         resetModifyState();
       }
     } else {
-      if (isModifyListenMode()) {
-        // delete any removed beans via private owned. Needs to occur before
-        // a 'deleteMissingChildren' statement occurs
-        removeAssocManyPrivateOwned();
+      if (isModifyListenMode() || many.hasOrderColumn()) {
+        // delete any removed beans / orphans
+        removeAssocManyOrphans();
       }
       if (cascade) {
         // potentially deletes 'missing children' for 'stateless update'
@@ -108,7 +108,7 @@ public class SaveManyBeans extends SaveManyBase {
     BeanProperty orderColumn = null;
     boolean hasOrderColumn = many.hasOrderColumn();
     if (hasOrderColumn) {
-      if (!insertedParent && canSkipForOrderColumn()) {
+      if (!insertedParent && canSkipForOrderColumn() && saveRecurseSkippable) {
         return;
       }
       orderColumn = targetDescriptor.getOrderColumn();
@@ -157,7 +157,7 @@ public class SaveManyBeans extends SaveManyBase {
         if (many.hasJoinTable()) {
           skipSavingThisBean = targetDescriptor.isReference(ebi);
         } else {
-          if (orderColumn != null) {
+          if (orderColumn != null && !Objects.equals(sortOrder, orderColumn.getValue(detail))) {
             orderColumn.setValue(detail, sortOrder);
             ebi.setDirty(true);
           }
@@ -178,6 +178,11 @@ public class SaveManyBeans extends SaveManyBase {
 
         if (!skipSavingThisBean) {
           persister.saveRecurse(detail, transaction, parentBean, request.getFlags());
+          if (many.hasOrderColumn()) {
+            // Clear the bean from the PersistenceContext (L1 cache), because the order of referenced beans might have changed
+            final BeanDescriptor<?> beanDescriptor = many.getBeanDescriptor();
+            beanDescriptor.contextClear(transaction.getPersistenceContext(), beanDescriptor.getId(parentBean));
+          }
         }
       }
     }
@@ -334,20 +339,25 @@ public class SaveManyBeans extends SaveManyBase {
     transaction.depth(-1);
   }
 
-  private void removeAssocManyPrivateOwned() {
-
+  private void removeAssocManyOrphans() {
     // check that the list is not null and if it is a BeanCollection
     // check that is has been populated (don't trigger lazy loading)
     if (value instanceof BeanCollection<?>) {
-
       BeanCollection<?> c = (BeanCollection<?>) value;
       Set<?> modifyRemovals = c.getModifyRemovals();
-      modifyListenReset(c);
+      if (insertedParent) {
+        // after insert set the modify listening mode for private owned etc
+        c.setModifyListening(many.getModifyListenMode());
+      }
+      // We must not reset when we still have to update other entities in the collection and set their new orderColumn value
+      if (!many.hasOrderColumn()) {
+        c.modifyReset();
+      }
       if (modifyRemovals != null && !modifyRemovals.isEmpty()) {
         for (Object removedBean : modifyRemovals) {
           if (removedBean instanceof EntityBean) {
             EntityBean eb = (EntityBean) removedBean;
-            if (!eb._ebean_getIntercept().isNew()) {
+            if (eb._ebean_intercept().isOrphanDelete()) {
               // only delete if the bean was loaded meaning that it is known to exist in the DB
               persister.deleteRequest(persister.createDeleteRemoved(removedBean, transaction, request.getFlags()));
             }

src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java

@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.persist.dml;
 
+import io.ebean.annotation.Platform;
 import io.ebean.bean.EntityBean;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebeaninternal.server.core.PersistRequestBean;
@@ -44,7 +45,10 @@ final class InsertMeta {
 
   private final String[] identityDbColumns;
 
+  private final Platform platform;
+
   InsertMeta(DatabasePlatform dbPlatform, BeanDescriptor<?> desc, Bindable shadowFKey, BindableId id, BindableList all) {
+    this.platform = dbPlatform.getPlatform();
     this.discriminator = getDiscriminator(desc);
     this.id = id;
     this.all = all;
@@ -162,7 +166,11 @@ final class InsertMeta {
 
     request.append("insert into ").append(table);
     if (nullId && noColumnsForInsert(draftTable)) {
-      request.append(" default values");
+      if (this.platform.base() == Platform.MYSQL) {
+        request.append(" values (default)");
+      } else {
+        request.append(" default values");
+      }
       return request.toString();
     }
 

src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java

@@ -54,7 +54,7 @@ public class DefaultOrmQueryEngine implements OrmQueryEngine {
   private <T> void flushJdbcBatchOnQuery(OrmQueryRequest<T> request) {
 
     SpiTransaction t = request.getTransaction();
-    if (t.isBatchFlushOnQuery()) {
+    if (t.isFlushOnQuery()) {
       // before we perform a query, we need to flush any
       // previous persist requests that are queued/batched.
       // The query may read data affected by those requests.

src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java

@@ -302,11 +302,11 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
+  public void setGetGeneratedKeys(boolean getGeneratedKeys) {
   }
 
   @Override
-  public void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
+  public void setFlushOnMixed(boolean batchFlushOnMixed) {
   }
 
   /**
@@ -325,12 +325,12 @@ class ImplicitReadOnlyTransaction implements SpiTransaction, TxnProfileEventCode
   }
 
   @Override
-  public boolean isBatchFlushOnQuery() {
+  public boolean isFlushOnQuery() {
     return false;
   }
 
   @Override
-  public void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
+  public void setFlushOnQuery(boolean batchFlushOnQuery) {
   }
 
   /**

src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java

@@ -589,7 +589,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
+  public void setGetGeneratedKeys(boolean getGeneratedKeys) {
     this.batchGetGeneratedKeys = getGeneratedKeys;
     if (batchControl != null) {
       batchControl.setGetGeneratedKeys(getGeneratedKeys);
@@ -597,7 +597,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
+  public void setFlushOnMixed(boolean batchFlushOnMixed) {
     this.batchFlushOnMixed = batchFlushOnMixed;
     if (batchControl != null) {
       batchControl.setBatchFlushOnMixed(batchFlushOnMixed);
@@ -624,12 +624,12 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
   }
 
   @Override
-  public boolean isBatchFlushOnQuery() {
+  public boolean isFlushOnQuery() {
     return batchFlushOnQuery;
   }
 
   @Override
-  public void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
+  public void setFlushOnQuery(boolean batchFlushOnQuery) {
     this.batchFlushOnQuery = batchFlushOnQuery;
   }
 

src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java

@@ -233,19 +233,19 @@ class NoTransaction implements SpiTransaction {
   }
 
   @Override
-  public void setBatchGetGeneratedKeys(boolean getGeneratedKeys) {
+  public void setGetGeneratedKeys(boolean getGeneratedKeys) {
   }
 
   @Override
-  public void setBatchFlushOnMixed(boolean batchFlushOnMixed) {
+  public void setFlushOnMixed(boolean batchFlushOnMixed) {
   }
 
   @Override
-  public void setBatchFlushOnQuery(boolean batchFlushOnQuery) {
+  public void setFlushOnQuery(boolean batchFlushOnQuery) {
   }
 
   @Override
-  public boolean isBatchFlushOnQuery() {
+  public boolean isFlushOnQuery() {
     return false;
   }
 

src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java

@@ -459,7 +459,7 @@ public final class DefaultTypeManager implements TypeManager {
    * are annotated with the @JacksonAnnotation meta annotation. So detection is easy.
    */
   private boolean checkJacksonAnnotations(DeployBeanProperty prop) {
-    return AnnotationUtil.findAnnotation(prop.getField(), com.fasterxml.jackson.annotation.JacksonAnnotation.class) != null;
+    return prop.getMetaAnnotation(com.fasterxml.jackson.annotation.JacksonAnnotation.class) != null;
   }
 
   private DocPropertyType getDocType(Type genericType) {
@@ -606,7 +606,7 @@ public final class DefaultTypeManager implements TypeManager {
 
     Field[] fields = enumType.getDeclaredFields();
     for (Field field : fields) {
-      EnumValue enumValue = AnnotationUtil.findAnnotation(field, EnumValue.class);
+      EnumValue enumValue = AnnotationUtil.get(field, EnumValue.class);
       if (enumValue != null) {
         nameValueMap.put(field.getName(), enumValue.value());
         if (integerType && !isIntegerType(enumValue.value())) {
@@ -680,7 +680,7 @@ public final class DefaultTypeManager implements TypeManager {
 
     Method[] methods = enumType.getMethods();
     for (Method method : methods) {
-      DbEnumValue dbValue = AnnotationUtil.findAnnotation(method, DbEnumValue.class);
+      DbEnumValue dbValue = AnnotationUtil.get(method, DbEnumValue.class);
       if (dbValue != null) {
         boolean integerValues = DbEnumType.INTEGER == dbValue.storage();
         return createEnumScalarTypeDbValue(enumType, method, integerValues, dbValue.length());

src/test/java/io/ebean/EbeanServer_refresh.java

@@ -22,8 +22,8 @@ public class EbeanServer_refresh {
     map.put("tableName", "e_basic");
 
     EbeanServer server = Ebean.getDefaultServer();
-    server.script().run("/scripts/test-script.sql");
-    server.script().run("/scripts/test-script-2.sql", map);
+    DB.script().run("/scripts/test-script.sql");
+    DB.script().run("/scripts/test-script-2.sql", map);
     server.script().run(this.getClass().getResource("/scripts/test-script.sql"));
     server.script().run(this.getClass().getResource("/scripts/test-script-2.sql"), map);
 

src/test/java/io/ebean/config/ServerConfigTest.java

@@ -138,8 +138,11 @@ public class ServerConfigTest {
     assertEquals(JsonConfig.DateTime.ISO8601, serverConfig.getJsonDateTime());
     assertEquals(JsonConfig.Date.ISO8601, serverConfig.getJsonDate());
     assertTrue(serverConfig.getPlatformConfig().isCaseSensitiveCollation());
-    assertFalse(serverConfig.isAutoLoadModuleInfo());
+    assertTrue(serverConfig.isAutoLoadModuleInfo());
     assertEquals(Long.MAX_VALUE, serverConfig.getCollectQueryPlanThresholdMicros());
+
+    serverConfig.setLoadModuleInfo(false);
+    assertFalse(serverConfig.isAutoLoadModuleInfo());
   }
 
   @Test

src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java

@@ -49,7 +49,7 @@ public class DatabasePlatformTest {
   public void defaultTypesForDecimalAndVarchar() {
 
     DatabasePlatform dbPlatform = new DatabasePlatform();
-    assertEquals(defaultDecimalDefn(dbPlatform), "decimal(38)");
+    assertEquals(defaultDecimalDefn(dbPlatform), "decimal(16,3)");
     assertEquals(defaultDefn(DbType.VARCHAR, dbPlatform), "varchar(255)");
   }
 

src/test/java/io/ebean/config/dbplatform/H2PlatformTest.java

@@ -20,6 +20,7 @@ public class H2PlatformTest {
     assertThat(ddl.convert("varchar(20)")).isEqualTo("varchar(20)");
     assertThat(ddl.convert("decimal(10)")).isEqualTo("decimal(10)");
     assertThat(ddl.convert("decimal(8,4)")).isEqualTo("decimal(8,4)");
+    assertThat(ddl.convert("decimal")).isEqualTo("decimal(16,3)");
     assertThat(ddl.convert("boolean")).isEqualTo("boolean");
     assertThat(ddl.convert("bit")).isEqualTo("bit");
   }

src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java

@@ -27,6 +27,7 @@ public class HanaPlatformTest {
     assertThat(ddl.convert("varchar(20)")).isEqualTo("nvarchar(20)");
     assertThat(ddl.convert("decimal(10)")).isEqualTo("decimal(10)");
     assertThat(ddl.convert("decimal(8,4)")).isEqualTo("decimal(8,4)");
+    assertThat(ddl.convert("decimal")).isEqualTo("decimal(16,3)");
     assertThat(ddl.convert("boolean")).isEqualTo("boolean");
     assertThat(ddl.convert("bit")).isEqualTo("smallint");
     assertThat(ddl.convert("tinyint")).isEqualTo("smallint");

src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java

@@ -21,6 +21,7 @@ public class MySqlPlatformTest {
     assertThat(ddl.convert("varchar(20)")).isEqualTo("varchar(20)");
     assertThat(ddl.convert("boolean")).isEqualTo("tinyint(1)");
     assertThat(ddl.convert("bit")).isEqualTo("tinyint(1)");
+    assertThat(ddl.convert("decimal")).isEqualTo("decimal(16,3)");
   }
 
   @Test

src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java

@@ -26,6 +26,7 @@ public class OraclePlatformTest {
     assertThat(ddl.convert("varchar(20)")).isEqualTo("varchar2(20)");
     assertThat(ddl.convert("decimal(10)")).isEqualTo("number(10)");
     assertThat(ddl.convert("decimal(8,4)")).isEqualTo("number(8,4)");
+    assertThat(ddl.convert("decimal")).isEqualTo("number(16,3)");
     assertThat(ddl.convert("boolean")).isEqualTo("number(1)");
     assertThat(ddl.convert("bit")).isEqualTo("bit");
     assertThat(ddl.convert("tinyint")).isEqualTo("number(3)");

src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java

@@ -26,11 +26,11 @@ public class PostgresPlatformTest {
     assertThat(ddl.convert("tinyint")).isEqualTo("smallint");
     assertThat(ddl.convert("double")).isEqualTo("float");
     assertThat(ddl.convert("varchar(20)")).isEqualTo("varchar(20)");
+    assertThat(ddl.convert("decimal")).isEqualTo("decimal(16,3)");
     assertThat(ddl.convert("decimal(10)")).isEqualTo("decimal(10)");
     assertThat(ddl.convert("decimal(8,4)")).isEqualTo("decimal(8,4)");
     assertThat(ddl.convert("boolean")).isEqualTo("boolean");
     assertThat(ddl.convert("bit")).isEqualTo("bit");
-
   }
 
   @Test

src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java

@@ -26,6 +26,7 @@ public class SqlserverPlatformTest {
     assertThat(ddl.convert("varchar(20)")).isEqualTo("nvarchar(20)");
     assertThat(ddl.convert("decimal(10)")).isEqualTo("numeric(10)");
     assertThat(ddl.convert("decimal(8,4)")).isEqualTo("numeric(8,4)");
+    assertThat(ddl.convert("decimal")).isEqualTo("numeric(16,3)");
     assertThat(ddl.convert("boolean")).isEqualTo("bit");
     assertThat(ddl.convert("bit")).isEqualTo("bit");
     assertThat(ddl.convert("tinyint")).isEqualTo("smallint");

src/test/java/org/tests/basic/TestAnnotationBase.java

@@ -1,15 +1,18 @@
 package org.tests.basic;
 
 import io.ebean.BaseTestCase;
+import io.ebean.annotation.Index;
 import io.ebean.annotation.Platform;
 import io.ebean.annotation.Where;
-import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.deploy.BeanProperty;
+import io.ebeaninternal.server.deploy.IndexDefinition;
+import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import org.junit.Test;
 import org.tests.model.basic.ValidationGroupSomething;
 
 import javax.persistence.Entity;
+import javax.persistence.MappedSuperclass;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.lang.annotation.ElementType;
@@ -17,7 +20,11 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.reflect.Field;
+import java.util.HashSet;
+import java.util.Set;
 
+import static io.ebean.annotation.Platform.H2;
+import static io.ebean.annotation.Platform.POSTGRES;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -25,27 +32,41 @@ import static org.junit.Assert.assertTrue;
 
 public class TestAnnotationBase extends BaseTestCase {
 
+  private final Set<Class<?>> metaAnnotationsFilter = new HashSet<>();
+
+  public TestAnnotationBase() {
+    metaAnnotationsFilter.add(Where.class);
+    metaAnnotationsFilter.add(Where.List.class);
+  }
+
   @Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE})
   @Retention(RetentionPolicy.RUNTIME)
   @Where(clause = "SELECT 'mysql' from 1", platforms = Platform.MYSQL)
-  @Where(clause = "SELECT 'h2' from 1", platforms = Platform.H2)
+  @Where(clause = "SELECT 'h2' from 1", platforms = H2)
   @Where(clause = "SELECT 'other' from 1")
   public @interface MetaTest {
 
   }
 
+  @Index(name = "ano_1", columnNames = "direct", platforms = {H2, POSTGRES})
+  @Index(name = "ano_2", columnNames = "direct", platforms = {H2, POSTGRES})
+  @MappedSuperclass
+  public static class MappedBaseEntity {
+
+  }
+
+  @Index(name = "ano_3", columnNames = "direct")
   @Entity
-  public static class TestAnnotationBaseEntity {
+  public static class TestAnnotationBaseEntity extends MappedBaseEntity {
 
     @Where(clause = "SELECT 'mysql' from 1", platforms = Platform.MYSQL)
-    @Where(clause = "SELECT 'h2' from 1", platforms = Platform.H2)
+    @Where(clause = "SELECT 'h2' from 1", platforms = H2)
     @Where(clause = "SELECT 'other' from 1")
     private String direct;
 
     @MetaTest
     private String meta;
 
-
     @MetaTest
     @Where(clause = "SELECT 'oracle' from 1", platforms = Platform.ORACLE)
     private String mixed;
@@ -131,6 +152,13 @@ public class TestAnnotationBase extends BaseTestCase {
     assertEquals(40, bp.getDbLength());
   }
 
+  @Test
+  public void annotationClassIndexes() throws SecurityException {
+    BeanDescriptor<TestAnnotationBaseEntity> descriptor = spiEbeanServer().getBeanDescriptor(TestAnnotationBaseEntity.class);
+    final IndexDefinition[] indexDefinitions = descriptor.getIndexDefinitions();
+    assertEquals(3, indexDefinitions.length);
+  }
+
   @Test
   public void testNotNullWithGroup() throws SecurityException {
     BeanDescriptor<TestAnnotationBaseEntity> descriptor = spiEbeanServer().getBeanDescriptor(TestAnnotationBaseEntity.class);
@@ -147,45 +175,41 @@ public class TestAnnotationBase extends BaseTestCase {
 
   @Test
   public void testFindAnnotation() throws NoSuchFieldException, SecurityException {
-    Field fld = TestAnnotationBaseEntity.class.getDeclaredField("direct");
-    String s;
 
-    s = AnnotationUtil.findAnnotation(fld, Where.class, Platform.MYSQL).clause();
-    assertEquals("SELECT 'mysql' from 1", s);
+    Field directFld = TestAnnotationBaseEntity.class.getDeclaredField("direct");
+    final DeployBeanProperty direct = createProperty(directFld);
 
-    s = AnnotationUtil.findAnnotation(fld, Where.class, Platform.H2).clause();
-    assertEquals("SELECT 'h2' from 1", s);
-
-    s = AnnotationUtil.findAnnotation(fld, Where.class, Platform.POSTGRES).clause();
-    assertEquals("SELECT 'other' from 1", s);
+    assertEquals("SELECT 'mysql' from 1", where(direct, Platform.MYSQL));
+    assertEquals("SELECT 'h2' from 1", where(direct, H2));
+    assertEquals("SELECT 'other' from 1", where(direct, Platform.POSTGRES));
 
     // meta
-    fld = TestAnnotationBaseEntity.class.getDeclaredField("meta");
-
-    s = AnnotationUtil.findAnnotation(fld, Where.class, Platform.MYSQL).clause();
-    assertEquals("SELECT 'mysql' from 1", s);
-
-    s = AnnotationUtil.findAnnotation(fld, Where.class, Platform.H2).clause();
-    assertEquals("SELECT 'h2' from 1", s);
-
-    s = AnnotationUtil.findAnnotation(fld, Where.class, Platform.POSTGRES).clause();
-    assertEquals("SELECT 'other' from 1", s);
+    Field metaFld = TestAnnotationBaseEntity.class.getDeclaredField("meta");
+    final DeployBeanProperty meta = createProperty(metaFld);
 
+    assertEquals("SELECT 'mysql' from 1", where(meta, Platform.MYSQL));
+    assertEquals("SELECT 'h2' from 1", where(meta, H2));
+    assertEquals("SELECT 'other' from 1", where(meta, Platform.POSTGRES));
 
     // mixed
-    fld = TestAnnotationBaseEntity.class.getDeclaredField("mixed");
+    Field mixedFld = TestAnnotationBaseEntity.class.getDeclaredField("mixed");
+    final DeployBeanProperty mixed = createProperty(mixedFld);
 
-    s = AnnotationUtil.findAnnotation(fld, Where.class, Platform.MYSQL).clause();
-    assertEquals("SELECT 'mysql' from 1", s);
+    assertEquals("SELECT 'mysql' from 1", where(mixed, Platform.MYSQL));
+    assertEquals("SELECT 'h2' from 1", where(mixed, H2));
+    assertEquals("SELECT 'other' from 1", where(mixed, Platform.POSTGRES));
+    assertEquals("SELECT 'oracle' from 1", where(mixed, Platform.ORACLE));
+  }
 
-    s = AnnotationUtil.findAnnotation(fld, Where.class, Platform.H2).clause();
-    assertEquals("SELECT 'h2' from 1", s);
+  private String where(DeployBeanProperty property, Platform platform) {
+    return property.getMetaAnnotationWhere(platform).clause();
+  }
 
-    s = AnnotationUtil.findAnnotation(fld, Where.class, Platform.POSTGRES).clause();
-    assertEquals("SELECT 'other' from 1", s);
-
-    s = AnnotationUtil.findAnnotation(fld, Where.class, Platform.ORACLE).clause();
-    assertEquals("SELECT 'oracle' from 1", s);
+  private DeployBeanProperty createProperty(Field fld) {
+    DeployBeanProperty directProperty = new DeployBeanProperty(null, null, null);
+    directProperty.setField(fld);
+    directProperty.initMetaAnnotations(metaAnnotationsFilter);
+    return directProperty;
   }
 
 }

src/test/java/org/tests/basic/TestWhereAnnotation.java

@@ -12,6 +12,8 @@ import org.junit.Test;
 
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TestWhereAnnotation extends TransactionalTestCase {
 
   @Test
@@ -29,6 +31,6 @@ public class TestWhereAnnotation extends TransactionalTestCase {
 
     q1.findOne();
     String s1 = q1.getGeneratedSql();
-    Assert.assertTrue(s1.contains("t1.order_date is not null"));
+    assertThat(s1).contains("t1.order_date is not null");
   }
 }

src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java

@@ -34,7 +34,7 @@ public class TestBatchInsertSimple extends BaseTestCase {
       transaction.setBatchOnCascade(true);
       transaction.setBatchSize(30);
       // setBatchGetGeneratedKeys MUST be turned off for MS SQL Server because :(
-      transaction.setBatchGetGeneratedKeys(false);
+      transaction.setGetGeneratedKeys(false);
 
       for (int i = 0; i < numOfMasters; i++) {
         UTMaster master = createMasterAndDetails(i, 20);
@@ -108,7 +108,7 @@ public class TestBatchInsertSimple extends BaseTestCase {
       transaction.setBatchOnCascade(true);
       transaction.setBatchSize(30);
       // setBatchGetGeneratedKeys MUST be turned off for MS SQL Server because :(
-      transaction.setBatchGetGeneratedKeys(false);
+      transaction.setGetGeneratedKeys(false);
 
       for (int i = 0; i < numOfMasters; i++) {
         UTMaster master = createMaster(i);

src/test/java/org/tests/cascade/TestOrderedList.java

@@ -85,11 +85,10 @@ public class TestOrderedList extends BaseTestCase {
     Ebean.save(fresh);
 
     sql = LoggedSqlCollector.current();
-    assertThat(sql).hasSize(8);
-    assertSql(sql.get(0)).contains("update om_ordered_master set name=?, version=?");
-    assertSql(sql.get(1)).contains("update om_ordered_detail set version=?, sort_order=? where id=? and version=?");
-    assertThat(sql.get(3)).contains("update om_ordered_detail set name=?, version=?, sort_order=? where id=? and version=?");
-
+    assertThat(sql).hasSize(3);
+    assertSql(sql.get(0)).contains("update om_ordered_master set name=?, version=? where id=? and version=?; -- bind(m1-mod3");
+    assertSql(sql.get(1)).contains("update om_ordered_detail set name=?, version=?, sort_order=? where id=? and version=?");
+    assertThat(sql.get(2)).contains("bind(was 1,3,2,");
 
     Ebean.delete(fresh);
 

src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java

@@ -95,8 +95,10 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase {
   @Entity
   @Table(name = "em_user")
   public static class User {
+    @Id
     private Long id;
     private String name;
+    @OneToMany(cascade = CascadeType.REMOVE)
     private Set<UserRole> userRoles;
 
     public User() {
@@ -107,7 +109,6 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase {
       this.name = name;
     }
 
-    @Id
     public Long getId() {
       return id;
     }
@@ -124,7 +125,6 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase {
       this.name = name;
     }
 
-    @OneToMany(cascade = CascadeType.REMOVE)
     public Set<UserRole> getUserRoles() {
       return userRoles;
     }
@@ -138,11 +138,18 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase {
   @Table(name = "em_user_role")
   public static class UserRole implements Serializable {
     private static final long serialVersionUID = 1L;
-    private UserRolePK pk;
-    private User user;
-    private Role role;
 
     @EmbeddedId
+    private UserRolePK pk;
+
+    @ManyToOne
+    @JoinColumn(name = "user_id", nullable = false, insertable = false, updatable = false)
+    private User user;
+
+    @ManyToOne
+    @JoinColumn(name = "role_id", nullable = false, insertable = false, updatable = false)
+    private Role role;
+
     public UserRolePK getPk() {
       return pk;
     }
@@ -151,8 +158,6 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase {
       this.pk = pk;
     }
 
-    @ManyToOne
-    @JoinColumn(name = "user_id", nullable = false, insertable = false, updatable = false)
     public User getUser() {
       return user;
     }
@@ -161,8 +166,6 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase {
       this.user = user;
     }
 
-    @ManyToOne
-    @JoinColumn(name = "role_id", nullable = false, insertable = false, updatable = false)
     public Role getRole() {
       return role;
     }
@@ -213,11 +216,12 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase {
   @Entity
   @Table(name = "em_role")
   public static class Role {
+    @Id
     private Long id;
     private String name;
+    @OneToMany(cascade = CascadeType.REMOVE)
     private Set<UserRole> userRoles;
 
-    @Id
     public Long getId() {
       return id;
     }
@@ -234,7 +238,6 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase {
       this.name = name;
     }
 
-    @OneToMany(cascade = CascadeType.REMOVE)
     public Set<UserRole> getUserRoles() {
       return userRoles;
     }

src/test/java/org/tests/defaultvalues/DefaultsModel.java

@@ -0,0 +1,48 @@
+package org.tests.defaultvalues;
+
+import io.ebean.annotation.Draft;
+import io.ebean.annotation.Draftable;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import java.util.List;
+
+@Entity
+@Draftable
+public class DefaultsModel {
+
+  @Id
+  Integer id;
+
+  @Draft
+  boolean draft;
+
+  @OneToMany(cascade = CascadeType.ALL)
+  List<ReferencedDefaultsModel> relatedModels;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(final Integer id) {
+    this.id = id;
+  }
+
+  public List<ReferencedDefaultsModel> getRelatedModels() {
+    return relatedModels;
+  }
+
+  public void setRelatedModels(final List<ReferencedDefaultsModel> relatedModels) {
+    this.relatedModels = relatedModels;
+  }
+
+  public boolean isDraft() {
+    return draft;
+  }
+
+  public void setDraft(final boolean draft) {
+    this.draft = draft;
+  }
+}

src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java

@@ -0,0 +1,44 @@
+package org.tests.defaultvalues;
+
+import io.ebean.annotation.Draft;
+import io.ebean.annotation.Draftable;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+@Draftable
+public class ReferencedDefaultsModel {
+
+  @Id
+  Integer id;
+
+  String name;
+
+  @Draft
+  boolean draft;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(final Integer id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(final String name) {
+    this.name = name;
+  }
+
+  public boolean isDraft() {
+    return draft;
+  }
+
+  public void setDraft(final boolean draft) {
+    this.draft = draft;
+  }
+}

src/test/java/org/tests/defaultvalues/TestDefaults.java

@@ -0,0 +1,36 @@
+package org.tests.defaultvalues;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestDefaults extends BaseTestCase {
+
+  @Test
+  public void testInsertDefaultValues() {
+    final DefaultsModel main = new DefaultsModel();
+
+    for (int i = 0; i < 5; i++) {
+      final ReferencedDefaultsModel ref = new ReferencedDefaultsModel();
+      ref.setName("r" + i);
+      main.getRelatedModels().add(ref);
+    }
+
+    LoggedSqlCollector.start();
+    Ebean.save(main);
+    final List<String> current = LoggedSqlCollector.current();
+
+    assertThat(current).isNotEmpty();
+    if (isMySql()) {
+      assertThat(current.get(0)).contains("insert into defaults_model_draft values (default);");
+    } else {
+      assertThat(current.get(0)).contains("insert into defaults_model_draft default values;");
+    }
+  }
+
+}

src/test/java/org/tests/idkeys/db/GenKeySequence.java

@@ -4,10 +4,8 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
 
 @Entity
-@SequenceGenerator(name = "SEQ_NAME", sequenceName = GenKeySequence.SEQUENCE_NAME)
 public class GenKeySequence {
   public final static String SEQUENCE_NAME = "SEQ";
 

src/test/java/org/tests/idkeys/db/GenKeyTable.java

@@ -1,31 +0,0 @@
-package org.tests.idkeys.db;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-@Entity
-public class GenKeyTable {
-  @Id
-  @GeneratedValue(strategy = GenerationType.TABLE)
-  private Long id;
-
-  private String description;
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-}

src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java

@@ -0,0 +1,68 @@
+package org.tests.inheritance;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import io.ebeantest.LoggedSql;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+import org.tests.inheritance.order.OrderMasterInheritance;
+import org.tests.inheritance.order.OrderedA;
+import org.tests.inheritance.order.OrderedB;
+import org.tests.inheritance.order.OrderedParent;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestInheritanceOrderColumn extends BaseTestCase {
+
+  @Test
+  public void test() {
+    final OrderMasterInheritance master = new OrderMasterInheritance();
+    final OrderedA orderedA = new OrderedA();
+    orderedA.setCommonName("commonOrderedA");
+    orderedA.setOrderedAName("orderedA");
+
+    final OrderedB orderedB = new OrderedB();
+    orderedB.setCommonName("commonOrderedB");
+    orderedB.setOrderedBName("orderedB");
+
+    master.getReferenced().add(orderedA);
+    master.getReferenced().add(orderedB);
+
+    LoggedSqlCollector.start();
+    Ebean.save(master);
+    List<String> sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(5);
+    // Some platforms insert ids and others don't need to...
+    assertSql(sql.get(1))
+      .matches(
+        "txn\\[] insert into ordered_parent \\((id, )?order_master_inheritance_id, dtype, common_name, ordered_aname, sort_order\\).*");
+    assertSql(sql.get(3))
+      .matches(
+        "txn\\[] insert into ordered_parent \\((id, )?order_master_inheritance_id, dtype, common_name, ordered_bname, sort_order\\).*");
+
+    OrderMasterInheritance result = Ebean.find(OrderMasterInheritance.class).findOne();
+    assertThat(result.getReferenced())
+      .extracting(OrderedParent::getCommonName)
+      .containsExactly("commonOrderedA", "commonOrderedB");
+
+    // Swap the two
+    result.getReferenced().add(0, result.getReferenced().remove(1));
+    assertThat(result.getReferenced())
+      .extracting(OrderedParent::getCommonName)
+      .containsExactly("commonOrderedB", "commonOrderedA");
+
+    LoggedSql.start();
+    Ebean.save(result);
+    sql = LoggedSqlCollector.stop();
+    assertThat(sql).hasSize(3);
+    assertThat(sql.get(0)).contains("update ordered_parent set sort_order=? where id=?");
+
+    result = Ebean.find(OrderMasterInheritance.class).findOne();
+    assertThat(result.getReferenced())
+      .extracting(OrderedParent::getCommonName)
+      .containsExactly("commonOrderedB", "commonOrderedA");
+  }
+
+}

src/test/java/org/tests/inheritance/cache/CIAddress.java

@@ -0,0 +1,19 @@
+package org.tests.inheritance.cache;
+
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+
+@Entity
+public class CIAddress extends CIBaseModel {
+
+  @ManyToOne
+  public CIStreetParent street;
+
+  public CIStreetParent getStreet() {
+    return street;
+  }
+
+  public void setStreet(CIStreetParent street) {
+    this.street = street;
+  }
+}

src/test/java/org/tests/inheritance/cache/CIBaseModel.java

@@ -0,0 +1,23 @@
+package org.tests.inheritance.cache;
+
+import io.ebean.Model;
+import io.ebean.annotation.Cache;
+
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+
+@Cache(enableQueryCache=true)
+@MappedSuperclass
+public abstract class CIBaseModel extends Model {
+
+  @Id
+  protected long id;
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+}

src/test/java/org/tests/inheritance/cache/CICustomer.java

@@ -0,0 +1,19 @@
+package org.tests.inheritance.cache;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+
+@Entity
+@DiscriminatorValue(value="1")
+public class CICustomer extends CICustomerParent {
+
+  public String notes;
+
+  public String getNotes() {
+    return notes;
+  }
+
+  public void setNotes(String notes) {
+    this.notes = notes;
+  }
+}

src/test/java/org/tests/inheritance/cache/CICustomerParent.java

@@ -0,0 +1,27 @@
+package org.tests.inheritance.cache;
+
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorType;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.ManyToOne;
+
+@Entity
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
+@DiscriminatorColumn(name = "dtype", discriminatorType = DiscriminatorType.INTEGER)
+@DiscriminatorValue(value = "0")
+public class CICustomerParent extends CIBaseModel {
+
+  @ManyToOne
+  protected CIAddress address;
+
+  public CIAddress getAddress() {
+    return address;
+  }
+
+  public void setAddress(CIAddress adress) {
+    this.address = adress;
+  }
+}

src/test/java/org/tests/inheritance/cache/CIStreet.java

@@ -0,0 +1,23 @@
+package org.tests.inheritance.cache;
+
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "street")
+@DiscriminatorValue(value = "1")
+public class CIStreet extends CIStreetParent {
+
+  @Column(name="num")
+  protected String number;
+
+  public String getNumber() {
+    return number;
+  }
+
+  public void setNumber(String number) {
+    this.number = number;
+  }
+}

src/test/java/org/tests/inheritance/cache/CIStreetParent.java

@@ -0,0 +1,25 @@
+package org.tests.inheritance.cache;
+
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorType;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+
+@Entity
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
+@DiscriminatorColumn(name = "dtype", discriminatorType = DiscriminatorType.INTEGER)
+@DiscriminatorValue(value = "0")
+public class CIStreetParent extends CIBaseModel {
+
+  protected String name;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+}

src/test/java/org/tests/inheritance/cache/TestInheritCacheRefLoad.java

@@ -0,0 +1,63 @@
+package org.tests.inheritance.cache;
+
+import io.ebean.DB;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestInheritCacheRefLoad {
+
+  @Test
+  public void findWithRefToInheritStreetBean_expect_correctStreetType() {
+
+    DB.find(CICustomerParent.class).delete();
+    DB.find(CIAddress.class).delete();
+    DB.find(CIStreet.class).delete();
+
+    //=========================================================================
+    // 1 - Create Data (Customer(dtype 1) -> Address(no dtype) -> Street(dtype 1)
+    //=========================================================================
+    CIStreet street = new CIStreet();
+    street.save();
+    CIAddress address = new CIAddress();
+    address.setStreet(street);
+    address.save();
+    CICustomer customer = new CICustomer();
+    customer.setAddress(address);
+    customer.save();
+
+    //=========================================================================
+    // 2 - Read Data (no Cache Hit)
+    //=========================================================================
+    Class streetClass = reloadCustomer(customer, false);  //returns Street -> OK
+    Assert.assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName());
+    streetClass = reloadCustomer(customer, false);  //returns Street -> OK
+    Assert.assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName());
+
+    //=========================================================================
+    // 3 - Read Data (L2-Cache Hit)
+    //=========================================================================
+    streetClass = reloadCustomer(customer, true); //returns Street -> OK
+    Assert.assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName());
+    streetClass = reloadCustomer(customer, true); //returns StreetParent -> NOT OK
+    Assert.assertEquals("org.tests.inheritance.cache.CIStreet", streetClass.getName());
+  }
+
+
+  public Class reloadCustomer(CICustomer customer, boolean l2Cache) {
+
+    // Load Customer via Query, L2Cache on/off
+    CICustomer customerReloaded =
+      DB.find(CICustomer.class)
+        .where().eq("id", customer.getId())
+        .setUseCache(l2Cache)
+        .findOne();
+
+    //Access Street by lazy Loading
+    Class streetClassLazyLoaded = customerReloaded.getAddress().getStreet().getClass();
+
+    //Show Cache Hits
+    System.out.println("Class of Street (Cache on: " + l2Cache + "): " + streetClassLazyLoaded + " | Cache Hit: " + DB.getDefault().getServerCacheManager().getQueryCache(streetClassLazyLoaded).getStatistics(false).getHitCount());
+    return streetClassLazyLoaded;
+  }
+
+}

src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java

@@ -49,8 +49,7 @@ public class TestInheritanceRefCache extends BaseTestCase {
     assertThat(gotRef).isInstanceOf(CInhRef.class);
     assertThat(gotRef.getRef()).isInstanceOf(CInhOne.class);
     sql = LoggedSqlCollector.stop();
-    assertThat(sql).hasSize(1);
-    assertSql(sql.get(0)).contains("from cinh_root");
+    assertThat(sql).hasSize(0);
 
 
     // fetch again - both from cache

src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java

@@ -0,0 +1,36 @@
+package org.tests.inheritance.order;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+public class OrderMasterInheritance {
+
+  @Id
+  Integer id;
+
+  @OneToMany(cascade = CascadeType.ALL)
+  @OrderColumn(name = "sort_order")
+  List<OrderedParent> referenced = new ArrayList<>();
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(final Integer id) {
+    this.id = id;
+  }
+
+  public List<OrderedParent> getReferenced() {
+    return referenced;
+  }
+
+  public void setReferenced(final List<OrderedParent> referenced) {
+    this.referenced = referenced;
+  }
+}

src/test/java/org/tests/inheritance/order/OrderedA.java

@@ -0,0 +1,17 @@
+package org.tests.inheritance.order;
+
+import javax.persistence.Entity;
+
+@Entity
+public class OrderedA extends OrderedParent {
+
+  String orderedAName;
+
+  public String getOrderedAName() {
+    return orderedAName;
+  }
+
+  public void setOrderedAName(final String orderedAName) {
+    this.orderedAName = orderedAName;
+  }
+}

src/test/java/org/tests/inheritance/order/OrderedB.java

@@ -0,0 +1,17 @@
+package org.tests.inheritance.order;
+
+import javax.persistence.Entity;
+
+@Entity
+public class OrderedB extends OrderedParent {
+
+  String orderedBName;
+
+  public String getOrderedBName() {
+    return orderedBName;
+  }
+
+  public void setOrderedBName(final String orderedBName) {
+    this.orderedBName = orderedBName;
+  }
+}

src/test/java/org/tests/inheritance/order/OrderedParent.java

@@ -0,0 +1,31 @@
+package org.tests.inheritance.order;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+
+@Entity
+@Inheritance
+public abstract class OrderedParent {
+
+  @Id
+  Integer id;
+
+  String commonName;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(final Integer id) {
+    this.id = id;
+  }
+
+  public String getCommonName() {
+    return commonName;
+  }
+
+  public void setCommonName(final String commonName) {
+    this.commonName = commonName;
+  }
+}

src/test/java/org/tests/model/aggregation/DMachineUse.java

@@ -28,6 +28,7 @@ public class DMachineUse extends Model {
 
   private long timeSecs;
 
+  @Decimal93
   private BigDecimal fuel;
 
   @Version

src/test/java/org/tests/model/aggregation/Decimal93.java

@@ -0,0 +1,16 @@
+package org.tests.model.aggregation;
+
+import javax.persistence.Column;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Example meta annotation for <code>@Column</code>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+@Column(precision = 9, scale = 3)
+public @interface Decimal93 {
+}

src/test/java/org/tests/model/basic/Person.java

@@ -18,18 +18,24 @@ public class Person implements Serializable {
 
   private static final long serialVersionUID = 495045977245770183L;
 
+  @Id
+  @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO)
+  @SequenceGenerator(name = "PERSONS_SEQ", initialValue = 1000, allocationSize = 40)
+  @Column(name = "ID", unique = true, nullable = false)
   private Long id;
+
+  @Column(name = "SURNAME", nullable = false, unique = false, columnDefinition = "varchar(64)")
   private String surname;
+
+  @Column(name = "NAME", nullable = false, unique = false, columnDefinition = "varchar(64)")
   private String name;
+
+  @OneToMany(targetEntity = Phone.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "person")
   private List<Phone> phones;
 
   public Person() {
   }
 
-  @Id
-  @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO)
-  @SequenceGenerator(name = "PERSONS_SEQ", initialValue = 1000, allocationSize = 40)
-  @Column(name = "ID", unique = true, nullable = false)
   public Long getId() {
     return id;
   }
@@ -38,7 +44,6 @@ public class Person implements Serializable {
     this.id = id;
   }
 
-  @Column(name = "SURNAME", nullable = false, unique = false, columnDefinition = "varchar(64)")
   public String getSurname() {
     return surname;
   }
@@ -47,7 +52,6 @@ public class Person implements Serializable {
     this.surname = surname;
   }
 
-  @Column(name = "NAME", nullable = false, unique = false, columnDefinition = "varchar(64)")
   public String getName() {
     return name;
   }
@@ -56,7 +60,6 @@ public class Person implements Serializable {
     this.name = name;
   }
 
-  @OneToMany(targetEntity = Phone.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "person")
   public List<Phone> getPhones() {
     return phones;
   }

src/test/java/org/tests/model/basic/Phone.java

@@ -18,16 +18,21 @@ public class Phone implements Serializable {
 
   private static final long serialVersionUID = -326610269092956952L;
 
+  @Id
+  @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO)
+  @Column(name = "id", unique = true, nullable = false)
   private Long id;
+
+  @Column(name = "phone_number", nullable = false, unique = true, columnDefinition = "varchar(7)")
   private String phoneNumber;
+
+  @ManyToOne(targetEntity = Person.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+  @JoinColumn(name = "person_id", nullable = false)
   private Person person;
 
   public Phone() {
   }
 
-  @Id
-  @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO)
-  @Column(name = "id", unique = true, nullable = false)
   public Long getId() {
     return id;
   }
@@ -36,7 +41,6 @@ public class Phone implements Serializable {
     this.id = id;
   }
 
-  @Column(name = "phone_number", nullable = false, unique = true, columnDefinition = "varchar(7)")
   public String getPhoneNumber() {
     return phoneNumber;
   }
@@ -46,8 +50,6 @@ public class Phone implements Serializable {
   }
 
   @NotNull
-  @ManyToOne(targetEntity = Person.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-  @JoinColumn(name = "person_id", nullable = false)
   public Person getPerson() {
     return person;
   }

src/test/java/org/tests/model/basic/cache/OCachedApp.java

@@ -10,7 +10,7 @@ import javax.persistence.UniqueConstraint;
 @UniqueConstraint(columnNames = "app_name")
 public class OCachedApp extends OCacheBase {
 
-  private final String appName;
+  private String appName;
 
   public OCachedApp(String appName) {
     this.appName = appName;
@@ -19,4 +19,8 @@ public class OCachedApp extends OCacheBase {
   public String getAppName() {
     return appName;
   }
+
+  public void setAppName(String appName) {
+    this.appName = appName;
+  }
 }

src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java

@@ -0,0 +1,41 @@
+package org.tests.model.basic.cache;
+
+import io.ebean.BaseTestCase;
+import io.ebean.DB;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestNatKeyCacheWhenNull extends BaseTestCase {
+
+  public static final String WILL_CHANGE_TO_NULL = "WillChangeToNull";
+
+  @Test
+  public void updateToNull() {
+
+    OCachedApp app = setup();
+
+    // act
+    app.setAppName(null);
+    app.save();
+
+    final OCachedApp foundAfter = DB.find(OCachedApp.class)
+      .where().eq("appName", WILL_CHANGE_TO_NULL)
+      .findOne();
+
+    assertThat(foundAfter).isNull();
+    app.delete();
+  }
+
+  private OCachedApp setup() {
+    OCachedApp app = new OCachedApp(WILL_CHANGE_TO_NULL);
+    app.save();
+
+    final OCachedApp foundBefore = DB.find(OCachedApp.class)
+      .where().eq("appName", WILL_CHANGE_TO_NULL)
+      .findOne();
+
+    assertThat(foundBefore).isNotNull();
+    return app;
+  }
+}

src/test/java/org/tests/model/embedded/RevisionId.java

@@ -1,6 +1,5 @@
 package org.tests.model.embedded;
 
-import javax.persistence.Column;
 import javax.persistence.Embeddable;
 
 @Embeddable
@@ -18,7 +17,6 @@ public class RevisionId {
     this.primaryId = primaryId;
   }
 
-  @Column(name = "revision")
   public Integer getRevision() {
     return revision;
   }