add missing @override (#975)

* no effective code change: add missing @override in "io.ebean.*" package
* no effective code change: add missing @override in "io.ebeaninternal.api.*" package
* no effective code change: add missing @override in "io.ebeaninternal.server.*" package
* no effective code change: add missing @override in "io.ebeaninternal.util.*" package
* no effective code change: add missing @override in "io.ebeanservice.*" package
* no effective code change: add missing @override in "src/test/java/"

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

@@ -397,6 +397,7 @@ public class BindParams implements Serializable {
       return copy;
     }
 
+    @Override
     public int hashCode() {
       int hc = getClass().hashCode();
       hc = hc * 92821 + (isInParam ? 0 : 1);
@@ -406,6 +407,7 @@ public class BindParams implements Serializable {
       return hc;
     }
 
+    @Override
     public boolean equals(Object o) {
       return o != null && (o == this || (o instanceof Param) && hashCode() == o.hashCode());
     }

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

@@ -17,16 +17,19 @@ public class HashQuery {
     this.bindHash = bindHash;
   }
 
+  @Override
   public String toString() {
     return "HashQuery@" + Integer.toHexString(hashCode());
   }
 
+  @Override
   public int hashCode() {
     int hc = 92821 * planHash.hashCode();
     hc = 92821 * hc + bindHash;
     return hc;
   }
 
+  @Override
   public boolean equals(Object obj) {
     if (obj == this) {
       return true;

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

@@ -17,6 +17,7 @@ public class HashQueryPlan {
     this.bindCount = bindCount;
   }
 
+  @Override
   public String toString() {
     return planHash + ":" + bindCount + (rawSql != null ? ":r" : "");
   }
@@ -30,6 +31,7 @@ public class HashQueryPlan {
     return planHash + "_" + bindCount;
   }
 
+  @Override
   public int hashCode() {
     int hc = planHash;
     hc = hc * 92821 + bindCount;
@@ -37,6 +39,7 @@ public class HashQueryPlan {
     return hc;
   }
 
+  @Override
   public boolean equals(Object obj) {
     if (obj == this) {
       return true;

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

@@ -15,6 +15,7 @@ public class HashQueryPlanBuilder {
     this.planHash = 92821;
   }
 
+  @Override
   public String toString() {
     return planHash + ":" + bindCount;
   }

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

@@ -105,6 +105,7 @@ public class ScopeTrans implements Thread.UncaughtExceptionHandler {
    * Called when the Thread catches any uncaught exception.
    * For example, an unexpected NullPointerException or Error.
    */
+  @Override
   public void uncaughtException(Thread thread, Throwable e) {
 
     // rollback transaction if required

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

@@ -275,6 +275,7 @@ public interface SpiQuery<T> extends Query<T> {
   /**
    * Return a copy of the query.
    */
+  @Override
   SpiQuery<T> copy();
 
   /**
@@ -650,11 +651,13 @@ public interface SpiQuery<T> extends Query<T> {
   /**
    * Return the maximum number of rows to return in the query.
    */
+  @Override
   int getMaxRows();
 
   /**
    * Return the index of the first row to return in the query.
    */
+  @Override
   int getFirstRow();
 
   /**

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

@@ -12,21 +12,25 @@ public interface SpiUpdate<T> extends Update<T> {
    */
   enum OrmUpdateType {
     INSERT {
+      @Override
       public String toString() {
         return "Insert";
       }
     },
     UPDATE {
+      @Override
       public String toString() {
         return "Update";
       }
     },
     DELETE {
+      @Override
       public String toString() {
         return "Delete";
       }
     },
     UNKNOWN {
+      @Override
       public String toString() {
         return "Unknown";
       }

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

@@ -18,6 +18,7 @@ public final class TransactionEventTable implements Serializable {
 
   private final Map<String, TableIUD> map = new HashMap<>();
 
+  @Override
   public String toString() {
     return "TransactionEventTable " + map.values();
   }
@@ -105,6 +106,7 @@ public final class TransactionEventTable implements Serializable {
       msgList.add(msg);
     }
 
+    @Override
     public String toString() {
       return "TableIUD " + table + " i:" + insert + " u:" + update + " d:" + delete;
     }
@@ -121,18 +123,22 @@ public final class TransactionEventTable implements Serializable {
       }
     }
 
+    @Override
     public String getTableName() {
       return table;
     }
 
+    @Override
     public boolean isInsert() {
       return insert;
     }
 
+    @Override
     public boolean isUpdate() {
       return update;
     }
 
+    @Override
     public boolean isDelete() {
       return delete;
     }

src/main/java/io/ebeaninternal/server/autotune/AutoTuneService.java

@@ -34,6 +34,7 @@ public interface AutoTuneService extends AutoTune {
    * Fire a garbage collection (hint to the JVM). Assuming garbage collection
    * fires this will gather the usage profiling information.
    */
+  @Override
   void collectProfiling();
 
   /**

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

@@ -235,6 +235,7 @@ public class DefaultAutoTuneService implements AutoTuneService {
    * to the existing tuning.
    * </p>
    */
+  @Override
   public void reportProfiling() {
     saveProfilingOnShutdown(false);
   }

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

@@ -75,6 +75,7 @@ public class ProfileManager implements ProfilingListener {
    * query in which case the parentNode will be null, or a lazy loading query
    * resulting from traversal of the object graph.
    */
+  @Override
   public void collectQueryInfo(ObjectGraphNode node, long beans, long micros) {
 
     if (node != null) {
@@ -93,6 +94,7 @@ public class ProfileManager implements ProfilingListener {
    * is called on the bean.
    * </p>
    */
+  @Override
   public void collectNodeUsage(NodeUsageCollector usageCollector) {
 
     ProfileOrigin profileOrigin = getProfileOrigin(usageCollector.getNode().getOriginQueryPoint());

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

@@ -107,6 +107,7 @@ public class ProfileOriginNodeUsage {
     }
   }
 
+  @Override
   public String toString() {
     return "path[" + path + "] profileCount[" + profileCount + "] used[" + profileUsedCount + "] props" + aggregateUsed;
   }

src/main/java/io/ebeaninternal/server/autotune/service/TunedQueryInfo.java

@@ -63,6 +63,7 @@ public class TunedQueryInfo implements Serializable {
     return tuned;
   }
 
+  @Override
   public String toString() {
     return tunedDetail.toString();
   }

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

@@ -72,6 +72,7 @@ public class CachedBeanData implements Externalizable {
     }
   }
 
+  @Override
   public String toString() {
     return data.toString();
   }

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

@@ -44,6 +44,7 @@ public class CachedManyIds implements Externalizable {
     }
   }
 
+  @Override
   public String toString() {
     return idList.toString();
   }

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

@@ -344,6 +344,7 @@ public class DefaultServerCache implements ServerCache {
 
     private static final long serialVersionUID = 1L;
 
+    @Override
     public int compare(CacheEntry entry1, CacheEntry entry2) {
       long x = entry1.getLastAccessTime();
       long y = entry2.getLastAccessTime();

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

@@ -28,6 +28,7 @@ class DefaultServerCacheFactory implements ServerCacheFactory {
     this.executor = executor;
   }
 
+  @Override
   public ServerCache createCache(ServerCacheType type, String cacheKey, ServerCacheOptions cacheOptions) {
 
     DefaultServerCache cache = new DefaultServerCache(cacheKey, cacheOptions);

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

@@ -34,6 +34,7 @@ public class DefaultServerCacheManager implements SpiCacheManager {
     this(true, null, new DefaultServerCacheFactory(), new ServerCacheOptions(), new ServerCacheOptions());
   }
 
+  @Override
   public boolean isLocalL2Caching() {
     return localL2Caching;
   }
@@ -41,14 +42,17 @@ public class DefaultServerCacheManager implements SpiCacheManager {
   /**
    * Clear all caches.
    */
+  @Override
   public void clearAll() {
     cacheHolder.clearAll();
   }
 
+  @Override
   public Supplier<ServerCache> getCollectionIdsCache(Class<?> beanType, String propertyName) {
     return cacheHolder.getCache(beanType, name(beanType) + "." + propertyName, ServerCacheType.COLLECTION_IDS);
   }
 
+  @Override
   public Supplier<ServerCache> getNaturalKeyCache(Class<?> beanType) {
     return cacheHolder.getCache(beanType, name(beanType), ServerCacheType.NATURAL_KEY);
   }
@@ -56,6 +60,7 @@ public class DefaultServerCacheManager implements SpiCacheManager {
   /**
    * Return the query cache for a given bean type.
    */
+  @Override
   public Supplier<ServerCache> getQueryCache(Class<?> beanType) {
     return cacheHolder.getCache(beanType, name(beanType), ServerCacheType.QUERY);
   }
@@ -63,6 +68,7 @@ public class DefaultServerCacheManager implements SpiCacheManager {
   /**
    * Return the bean cache for a given bean type.
    */
+  @Override
   public Supplier<ServerCache> getBeanCache(Class<?> beanType) {
     return cacheHolder.getCache(beanType, name(beanType), ServerCacheType.BEAN);
   }

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

@@ -56,6 +56,7 @@ public class CObjectGraphNodeStatistics {
       this.totalBeans = totalBeans;
     }
 
+    @Override
     public String toString() {
       return node + " count[" + count + "] time[" + totalTime + "] beans[" + totalBeans + "]";
     }

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

@@ -26,14 +26,17 @@ public class DefaultBackgroundExecutor implements SpiBackgroundExecutor {
   /**
    * Execute a Runnable using a background thread.
    */
+  @Override
   public void execute(Runnable r) {
     pool.execute(r);
   }
 
+  @Override
   public void executePeriodically(Runnable r, long delay, TimeUnit unit) {
     schedulePool.scheduleWithFixedDelay(r, delay, delay, unit);
   }
 
+  @Override
   public void shutdown() {
     pool.shutdown();
     schedulePool.shutdown();

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

@@ -23,54 +23,67 @@ public class DefaultBeanState implements BeanState {
     this.intercept = entityBean._ebean_getIntercept();
   }
 
+  @Override
   public void setPropertyLoaded(String propertyName, boolean loaded) {
     intercept.setPropertyLoaded(propertyName, loaded);
   }
 
+  @Override
   public boolean isReference() {
     return intercept.isReference();
   }
 
+  @Override
   public boolean isNew() {
     return intercept.isNew();
   }
 
+  @Override
   public boolean isNewOrDirty() {
     return intercept.isNewOrDirty();
   }
 
+  @Override
   public boolean isDirty() {
     return intercept.isDirty();
   }
 
+  @Override
   public Set<String> getLoadedProps() {
     return intercept.getLoadedPropertyNames();
   }
 
+  @Override
   public Set<String> getChangedProps() {
     return intercept.getDirtyPropertyNames();
   }
 
+  @Override
   public Map<String, ValuePair> getDirtyValues() {
     return intercept.getDirtyValues();
   }
 
+  @Override
   public boolean isReadOnly() {
     return intercept.isReadOnly();
   }
 
+  @Override
   public void setReadOnly(boolean readOnly) {
     intercept.setReadOnly(readOnly);
   }
 
+  @Override
   public void addPropertyChangeListener(PropertyChangeListener listener) {
     entityBean.addPropertyChangeListener(listener);
   }
 
+  @Override
   public void removePropertyChangeListener(PropertyChangeListener listener) {
     entityBean.removePropertyChangeListener(listener);
   }
 
+  @Override
   public void setLoaded() {
     intercept.setLoaded();
   }

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

@@ -50,57 +50,69 @@ public class DefaultCallableSql implements Serializable, SpiCallableSql {
     server.execute(this, null);
   }
 
+  @Override
   public String getLabel() {
     return label;
   }
 
+  @Override
   public CallableSql setLabel(String label) {
     this.label = label;
     return this;
   }
 
+  @Override
   public int getTimeout() {
     return timeout;
   }
 
+  @Override
   public String getSql() {
     return sql;
   }
 
+  @Override
   public CallableSql setTimeout(int secs) {
     this.timeout = secs;
     return this;
   }
 
+  @Override
   public CallableSql setSql(String sql) {
     this.sql = sql;
     return this;
   }
 
+  @Override
   public CallableSql bind(int position, Object value) {
     bindParameters.setParameter(position, value);
     return this;
   }
 
+  @Override
   public CallableSql setParameter(int position, Object value) {
     bindParameters.setParameter(position, value);
     return this;
   }
 
+  @Override
   public CallableSql registerOut(int position, int type) {
     bindParameters.registerOut(position, type);
     return this;
   }
 
+  @Override
   public Object getObject(int position) {
     Param p = bindParameters.getParameter(position);
     return p.getOutValue();
   }
 
+  @Override
   public boolean executeOverride(CallableStatement cstmt) throws SQLException {
     return false;
   }
 
+  @Override
   public CallableSql addModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
 
     transactionEvent.add(tableName, inserts, updates, deletes);
@@ -112,10 +124,12 @@ public class DefaultCallableSql implements Serializable, SpiCallableSql {
    * information for this CallableSql. This information is merged into the
    * transaction after the transaction is commited.
    */
+  @Override
   public TransactionEventTable getTransactionEventTable() {
     return transactionEvent;
   }
 
+  @Override
   public BindParams getBindParams() {
     return bindParameters;
   }

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

@@ -59,6 +59,7 @@ public class DefaultContainer implements SpiContainer {
     ShutdownManager.registerContainer(this);
   }
 
+  @Override
   public void shutdown() {
     clusterManager.shutdown();
   }
@@ -66,6 +67,7 @@ public class DefaultContainer implements SpiContainer {
   /**
    * Create the server reading configuration information from ebean.properties.
    */
+  @Override
   public SpiEbeanServer createServer(String name) {
 
     ServerConfig config = new ServerConfig();
@@ -89,6 +91,7 @@ public class DefaultContainer implements SpiContainer {
   /**
    * Create the implementation from the configuration.
    */
+  @Override
   public SpiEbeanServer createServer(ServerConfig serverConfig) {
 
     synchronized (this) {

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

@@ -40,6 +40,7 @@ public class DefaultMetaInfoManager implements MetaInfoManager {
     return list;
   }
 
+  @Override
   public List<MetaObjectGraphNodeStats> collectNodeStatistics(boolean reset) {
 
     List<MetaObjectGraphNodeStats> list = new ArrayList<>();

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

@@ -303,6 +303,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return updateAllPropertiesInBatch;
   }
 
+  @Override
   public int getLazyLoadBatchSize() {
     return lazyLoadBatchSize;
   }
@@ -316,10 +317,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return currentTenantProvider.currentId();
   }
 
+  @Override
   public ServerConfig getServerConfig() {
     return serverConfig;
   }
 
+  @Override
   public DatabasePlatform getDatabasePlatform() {
     return databasePlatform;
   }
@@ -339,10 +342,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return this;
   }
 
+  @Override
   public BackgroundExecutor getBackgroundExecutor() {
     return backgroundExecutor;
   }
 
+  @Override
   public ExpressionFactory getExpressionFactory() {
     return expressionFactory;
   }
@@ -388,6 +393,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Shutting down via JVM Shutdown hook.
    */
+  @Override
   public void shutdownManaged() {
     synchronized (this) {
       shutdownInternal(true, false);
@@ -397,6 +403,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Shutting down manually.
    */
+  @Override
   public void shutdown(boolean shutdownDataSource, boolean deregisterDriver) {
     synchronized (this) {
       // Unregister from JVM Shutdown hook
@@ -443,10 +450,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Return the server name.
    */
+  @Override
   public String getName() {
     return serverName;
   }
 
+  @Override
   public BeanState getBeanState(Object bean) {
     if (bean instanceof EntityBean) {
       return new DefaultBeanState((EntityBean) bean);
@@ -458,46 +467,55 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Compile a query. Only valid for ORM queries.
    */
+  @Override
   public <T> CQuery<T> compileQuery(Query<T> query, Transaction t) {
     SpiOrmQueryRequest<T> qr = createQueryRequest(Type.SUBQUERY, query, t);
     OrmQueryRequest<T> orm = (OrmQueryRequest<T>) qr;
     return cqueryEngine.buildQuery(orm);
   }
 
+  @Override
   public ServerCacheManager getServerCacheManager() {
     return serverCacheManager;
   }
 
+  @Override
   public void refreshMany(Object parentBean, String propertyName) {
 
     beanLoader.refreshMany(checkEntityBean(parentBean), propertyName);
   }
 
+  @Override
   public void loadMany(LoadManyRequest loadRequest) {
 
     beanLoader.loadMany(loadRequest);
   }
 
+  @Override
   public void loadMany(BeanCollection<?> bc, boolean onlyIds) {
 
     beanLoader.loadMany(bc, onlyIds);
   }
 
+  @Override
   public void refresh(Object bean) {
 
     beanLoader.refresh(checkEntityBean(bean));
   }
 
+  @Override
   public void loadBean(LoadBeanRequest loadRequest) {
 
     beanLoader.loadBean(loadRequest);
   }
 
+  @Override
   public void loadBean(EntityBeanIntercept ebi) {
 
     beanLoader.loadBean(ebi);
   }
 
+  @Override
   public Map<String, ValuePair> diff(Object a, Object b) {
     if (a == null) {
       return null;
@@ -516,6 +534,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * to maintain its cache and text indexes appropriately.
    * </p>
    */
+  @Override
   public void externalModification(TransactionEventTable tableEvent) {
     SpiTransaction t = transactionScopeManager.get();
     if (t != null) {
@@ -529,6 +548,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Developer informing eBean that tables where modified outside of eBean.
    * Invalidate the cache etc as required.
    */
+  @Override
   public void externalModification(String tableName, boolean inserts, boolean updates, boolean deletes) {
 
     TransactionEventTable evt = new TransactionEventTable();
@@ -540,6 +560,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Clear the query execution statistics.
    */
+  @Override
   public void clearQueryStatistics() {
     for (BeanDescriptor<?> desc : getBeanDescriptors()) {
       desc.clearQueryStatistics();
@@ -554,6 +575,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * bean is typically an instance of a dynamically generated class.
    * </p>
    */
+  @Override
   @SuppressWarnings("unchecked")
   public <T> T createEntityBean(Class<T> type) {
     BeanDescriptor<T> desc = getBeanDescriptor(type);
@@ -568,6 +590,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * then it will returned that object.
    * </p>
    */
+  @Override
   @SuppressWarnings({"unchecked", "rawtypes"})
   public <T> T getReference(Class<T> type, Object id) {
 
@@ -616,6 +639,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Creates a new Transaction that is NOT stored in TransactionThreadLocal. Use
    * this when you want a thread to have a second independent transaction.
    */
+  @Override
   public Transaction createTransaction() {
 
     return transactionManager.createTransaction(true, -1);
@@ -627,15 +651,18 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Note that this transaction is not stored in a thread local.
    * </p>
    */
+  @Override
   public Transaction createTransaction(TxIsolation isolation) {
 
     return transactionManager.createTransaction(true, isolation.getLevel());
   }
 
+  @Override
   public <T> T execute(TxCallable<T> c) {
     return execute(null, c);
   }
 
+  @Override
   public <T> T execute(TxScope scope, TxCallable<T> c) {
     ScopeTrans scopeTrans = createScopeTrans(scope);
     try {
@@ -652,10 +679,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   public void execute(TxRunnable r) {
     execute(null, r);
   }
 
+  @Override
   public void execute(TxScope scope, TxRunnable r) {
     ScopeTrans scopeTrans = createScopeTrans(scope);
     try {
@@ -711,6 +740,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   public ScopeTrans createScopeTrans(TxScope txScope) {
 
     if (txScope == null) {
@@ -762,6 +792,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Returns the current transaction (or null) from the scope.
    */
+  @Override
   public SpiTransaction getCurrentServerTransaction() {
     return transactionScopeManager.get();
   }
@@ -775,10 +806,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Note that the transaction is stored in a ThreadLocal variable.
    * </p>
    */
+  @Override
   public Transaction beginTransaction() {
     return beginTransaction(TxScope.required());
   }
 
+  @Override
   public Transaction beginTransaction(TxScope scope) {
     ScopeTrans scopeTrans = createScopeTrans(scope);
     return new ScopedTransaction(scopeTrans);
@@ -790,6 +823,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Note that the transaction is stored in a ThreadLocal variable.
    * </p>
    */
+  @Override
   public Transaction beginTransaction(TxIsolation isolation) {
     // start an explicit transaction
     SpiTransaction t = transactionManager.createTransaction(true, isolation.getLevel());
@@ -801,6 +835,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * Return the current transaction or null if there is not one currently in
    * scope.
    */
+  @Override
   public Transaction currentTransaction() {
     return transactionScopeManager.get();
   }
@@ -808,6 +843,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Commit the current transaction.
    */
+  @Override
   public void commitTransaction() {
     transactionScopeManager.commit();
   }
@@ -815,6 +851,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Rollback the current transaction.
    */
+  @Override
   public void rollbackTransaction() {
     transactionScopeManager.rollback();
   }
@@ -847,6 +884,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * <p>
    * </p>
    */
+  @Override
   public void endTransaction() {
     transactionScopeManager.end();
   }
@@ -858,11 +896,13 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * use.
    * </p>
    */
+  @Override
   public Object nextId(Class<?> beanType) {
     BeanDescriptor<?> desc = getBeanDescriptor(beanType);
     return desc.nextId(null);
   }
 
+  @Override
   @SuppressWarnings("unchecked")
   public <T> void sort(List<T> list, String sortByClause) {
 
@@ -895,6 +935,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return ((SpiQuery<T>) query).validate(beanDescriptor);
   }
 
+  @Override
   public <T> Filter<T> filter(Class<T> beanType) {
     BeanDescriptor<T> desc = getBeanDescriptor(beanType);
     if (desc == null) {
@@ -904,6 +945,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return new ElFilter<>(desc);
   }
 
+  @Override
   public <T> CsvReader<T> createCsvReader(Class<T> beanType) {
     BeanDescriptor<T> descriptor = getBeanDescriptor(beanType);
     if (descriptor == null) {
@@ -912,10 +954,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return new TCsvReader<>(this, descriptor);
   }
 
+  @Override
   public <T> UpdateQuery<T> update(Class<T> beanType) {
     return new DefaultUpdateQuery<>(createQuery(beanType));
   }
 
+  @Override
   public <T> Query<T> find(Class<T> beanType) {
     return createQuery(beanType);
   }
@@ -957,6 +1001,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return query;
   }
 
+  @Override
   public <T> DefaultOrmQuery<T> createQuery(Class<T> beanType) {
     BeanDescriptor<T> desc = getBeanDescriptor(beanType);
     if (desc == null) {
@@ -965,6 +1010,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return new DefaultOrmQuery<>(desc, this, expressionFactory);
   }
 
+  @Override
   public <T> Update<T> createUpdate(Class<T> beanType, String ormUpdate) {
     BeanDescriptor<?> desc = getBeanDescriptor(beanType);
     if (desc == null) {
@@ -975,18 +1021,22 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return new DefaultOrmUpdate<>(beanType, this, desc.getBaseTable(), ormUpdate);
   }
 
+  @Override
   public SqlQuery createSqlQuery(String sql) {
     return new DefaultRelationalQuery(this, sql);
   }
 
+  @Override
   public SqlUpdate createSqlUpdate(String sql) {
     return new DefaultSqlUpdate(this, sql);
   }
 
+  @Override
   public CallableSql createCallableSql(String sql) {
     return new DefaultCallableSql(this, sql);
   }
 
+  @Override
   public <T> T find(Class<T> beanType, Object uid) {
 
     return find(beanType, uid, null);
@@ -995,6 +1045,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Find a bean using its unique id.
    */
+  @Override
   public <T> T find(Class<T> beanType, Object id, Transaction t) {
 
     if (id == null) {
@@ -1084,6 +1135,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Return the PersistenceContextScope to use defined at query or server level.
    */
+  @Override
   public PersistenceContextScope getPersistenceContextScope(SpiQuery<?> query) {
     PersistenceContextScope scope = query.getPersistenceContextScope();
     return (scope != null) ? scope : defaultPersistenceContextScope;
@@ -1116,6 +1168,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   public <T> T findUnique(Query<T> query, Transaction transaction) {
 
     SpiQuery<T> spiQuery = (SpiQuery<T>) query;
@@ -1157,6 +1210,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   @SuppressWarnings({"unchecked", "rawtypes"})
   public <T> Set<T> findSet(Query<T> query, Transaction t) {
 
@@ -1176,6 +1230,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   @SuppressWarnings({"unchecked", "rawtypes"})
   public <K, T> Map<K, T> findMap(Query<T> query, Transaction t) {
 
@@ -1213,12 +1268,14 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   public <T> int findCount(Query<T> query, Transaction t) {
 
     SpiQuery<T> copy = ((SpiQuery<T>) query).copy();
     return findCountWithCopy(copy, t);
   }
 
+  @Override
   public <T> int findCountWithCopy(Query<T> query, Transaction t) {
 
     SpiOrmQueryRequest<T> request = createQueryRequest(Type.COUNT, query, t);
@@ -1231,11 +1288,13 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   public <A, T> List<A> findIds(Query<T> query, Transaction t) {
 
     return findIdsWithCopy(((SpiQuery<T>) query).copy(), t);
   }
 
+  @Override
   public <A, T> List<A> findIdsWithCopy(Query<T> query, Transaction t) {
 
     SpiOrmQueryRequest<?> request = createQueryRequest(Type.ID_LIST, query, t);
@@ -1248,6 +1307,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   public <T> int delete(Query<T> query, Transaction t) {
 
     SpiOrmQueryRequest<T> request = createQueryRequest(Type.DELETE, query, t);
@@ -1260,6 +1320,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   public <T> int update(Query<T> query, Transaction t) {
 
     SpiOrmQueryRequest<T> request = createQueryRequest(Type.UPDATE, query, t);
@@ -1272,6 +1333,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   public <T> FutureRowCount<T> findFutureCount(Query<T> q, Transaction t) {
 
     SpiQuery<T> copy = ((SpiQuery<T>) q).copy();
@@ -1291,6 +1353,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return findFutureCount(q, t);
   }
 
+  @Override
   public <T> FutureIds<T> findFutureIds(Query<T> query, Transaction t) {
 
     SpiQuery<T> copy = ((SpiQuery<T>) query).copy();
@@ -1306,6 +1369,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return queryFuture;
   }
 
+  @Override
   public <T> FutureList<T> findFutureList(Query<T> query, Transaction t) {
 
     SpiQuery<T> spiQuery = (SpiQuery<T>) query;
@@ -1343,6 +1407,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return new LimitOffsetPagedList<>(this, spiQuery);
   }
 
+  @Override
   public <T> QueryIterator<T> findIterate(Query<T> query, Transaction t) {
 
     SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query, t);
@@ -1356,6 +1421,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   public <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction t) {
 
     SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query, t);
@@ -1370,6 +1436,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     // no try finally - findEach guarantee's cleanup of the transaction if required
   }
 
+  @Override
   public <T> void findEachWhile(Query<T> query, Predicate<T> consumer, Transaction t) {
 
     SpiOrmQueryRequest<T> request = createQueryRequest(Type.ITERATE, query, t);
@@ -1396,6 +1463,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   @SuppressWarnings("unchecked")
   public <T> List<T> findList(Query<T> query, Transaction t) {
 
@@ -1417,6 +1485,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   public SqlRow findUnique(SqlQuery query, Transaction t) {
 
     // no findId() method for SqlQuery...
@@ -1449,6 +1518,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   public List<SqlRow> findList(SqlQuery query, Transaction t) {
 
     RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query, t);
@@ -1465,6 +1535,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Persist the bean by either performing an insert or update.
    */
+  @Override
   public void save(Object bean) {
     save(bean, null);
   }
@@ -1472,6 +1543,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Save the bean with an explicit transaction.
    */
+  @Override
   public void save(Object bean, Transaction t) {
     persister.save(checkEntityBean(bean), t);
   }
@@ -1488,6 +1560,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Update the bean using the default 'updatesDeleteMissingChildren' setting.
    */
+  @Override
   public void update(Object bean) {
     update(bean, null);
   }
@@ -1495,6 +1568,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Update the bean using the default 'updatesDeleteMissingChildren' setting.
    */
+  @Override
   public void update(Object bean, Transaction t) {
     persister.update(checkEntityBean(bean), t);
   }
@@ -1502,6 +1576,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Update the bean specifying the deleteMissingChildren option.
    */
+  @Override
   public void update(Object bean, Transaction t, boolean deleteMissingChildren) {
     persister.update(checkEntityBean(bean), t, deleteMissingChildren);
   }
@@ -1514,6 +1589,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Update all beans in the collection with an explicit transaction.
    */
+  @Override
   public void updateAll(Collection<?> beans, Transaction t) {
 
     if (beans == null || beans.isEmpty()) {
@@ -1538,6 +1614,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Insert the bean.
    */
+  @Override
   public void insert(Object bean) {
     insert(bean, null);
   }
@@ -1545,6 +1622,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Insert the bean with a transaction.
    */
+  @Override
   public void insert(Object bean, Transaction t) {
     persister.insert(checkEntityBean(bean), t);
   }
@@ -1552,6 +1630,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Insert all beans in the collection.
    */
+  @Override
   public void insertAll(Collection<?> beans) {
     insertAll(beans, null);
   }
@@ -1559,6 +1638,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Insert all beans in the collection with a transaction.
    */
+  @Override
   public void insertAll(Collection<?> beans, Transaction t) {
 
     if (beans == null || beans.isEmpty()) {
@@ -1580,6 +1660,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   public <T> List<T> publish(Query<T> query, Transaction transaction) {
 
     TransWrapper wrap = initTransIfRequired(transaction);
@@ -1695,18 +1776,22 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   public int delete(Class<?> beanType, Object id) {
     return delete(beanType, id, null);
   }
 
+  @Override
   public int delete(Class<?> beanType, Object id, Transaction t) {
     return delete(beanType, id, t, false);
   }
 
+  @Override
   public int deletePermanent(Class<?> beanType, Object id) {
     return delete(beanType, id, null, true);
   }
 
+  @Override
   public int deletePermanent(Class<?> beanType, Object id, Transaction t) {
     return delete(beanType, id, t, true);
   }
@@ -1765,6 +1850,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Delete the bean.
    */
+  @Override
   public boolean delete(Object bean) {
     return delete(bean, null);
   }
@@ -1772,6 +1858,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Delete the bean with the explicit transaction.
    */
+  @Override
   public boolean delete(Object bean, Transaction t) throws OptimisticLockException {
     return persister.delete(checkEntityBean(bean), t, false);
   }
@@ -1842,6 +1929,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Execute the CallableSql with an explicit transaction.
    */
+  @Override
   public int execute(CallableSql callSql, Transaction t) {
     return persister.executeCallable(callSql, t);
   }
@@ -1849,6 +1937,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Execute the CallableSql.
    */
+  @Override
   public int execute(CallableSql callSql) {
     return execute(callSql, null);
   }
@@ -1856,6 +1945,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Execute the updateSql with an explicit transaction.
    */
+  @Override
   public int execute(SqlUpdate updSql, Transaction t) {
     return persister.executeSqlUpdate(updSql, t);
   }
@@ -1863,6 +1953,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Execute the updateSql.
    */
+  @Override
   public int execute(SqlUpdate updSql) {
     return execute(updSql, null);
   }
@@ -1870,6 +1961,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Execute the updateSql with an explicit transaction.
    */
+  @Override
   public int execute(Update<?> update, Transaction t) {
     return persister.executeOrmUpdate(update, t);
   }
@@ -1877,6 +1969,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Execute the orm update.
    */
+  @Override
   public int execute(Update<?> update) {
     return execute(update, null);
   }
@@ -1884,6 +1977,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Return all the BeanDescriptors.
    */
+  @Override
   public List<BeanDescriptor<?>> getBeanDescriptors() {
     return beanDescriptorManager.getBeanDescriptorList();
   }
@@ -1902,6 +1996,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
+  @Override
   public boolean isSupportedType(java.lang.reflect.Type genericType) {
 
     TypeInfo typeInfo = ParamTypeHelper.getTypeInfo(genericType);
@@ -1931,6 +2026,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Return the BeanDescriptor for a given type of bean.
    */
+  @Override
   public <T> BeanDescriptor<T> getBeanDescriptor(Class<T> beanClass) {
     return beanDescriptorManager.getBeanDescriptor(beanClass);
   }
@@ -1938,6 +2034,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Return the BeanDescriptor's for a given table name.
    */
+  @Override
   public List<BeanDescriptor<?>> getBeanDescriptors(String tableName) {
     return beanDescriptorManager.getBeanDescriptors(tableName);
   }
@@ -1945,6 +2042,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Return all the SPI BeanTypes.
    */
+  @Override
   public List<? extends BeanType<?>> getBeanTypes() {
     return getBeanDescriptors();
   }
@@ -1952,6 +2050,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Return the SPI bean types mapped to the given table.
    */
+  @Override
   public List<? extends BeanType<?>> getBeanTypes(String tableName) {
     return beanDescriptorManager.getBeanTypes(tableName);
   }
@@ -1977,6 +2076,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
   /**
    * Return the BeanDescriptor using its class name.
    */
+  @Override
   public BeanDescriptor<?> getBeanDescriptorById(String beanClassName) {
     return beanDescriptorManager.getBeanDescriptorByClassName(beanClassName);
   }
@@ -1986,6 +2086,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * BeanListeners of inserts updates and deletes that occurred remotely (on
    * another server in the cluster).
    */
+  @Override
   public void remoteTransactionEvent(RemoteTransactionEvent event) {
     transactionManager.remoteTransactionEvent(event);
   }
@@ -2015,10 +2116,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return new TransWrapper(trans, wasCreated);
   }
 
+  @Override
   public SpiTransaction createServerTransaction(boolean isExplicit, int isolationLevel) {
     return transactionManager.createTransaction(isExplicit, isolationLevel);
   }
 
+  @Override
   public SpiTransaction createQueryTransaction(Object tenantId) {
     return transactionManager.createQueryTransaction(tenantId);
   }
@@ -2030,6 +2133,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
    * element in the CallStack should be application code.
    * </p>
    */
+  @Override
   public CallStack createCallStack() {
 
     StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();

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

@@ -93,6 +93,7 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
     this(null, sql, new BindParams());
   }
 
+  @Override
   public int execute() {
     if (server != null) {
       return server.execute(this);
@@ -102,24 +103,29 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
     }
   }
 
+  @Override
   public boolean isAutoTableMod() {
     return isAutoTableMod;
   }
 
+  @Override
   public SqlUpdate setAutoTableMod(boolean isAutoTableMod) {
     this.isAutoTableMod = isAutoTableMod;
     return this;
   }
 
+  @Override
   public String getLabel() {
     return label;
   }
 
+  @Override
   public SqlUpdate setLabel(String label) {
     this.label = label;
     return this;
   }
 
+  @Override
   public String getGeneratedSql() {
     return generatedSql;
   }
@@ -129,14 +135,17 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
     this.generatedSql = generatedSql;
   }
 
+  @Override
   public String getSql() {
     return sql;
   }
 
+  @Override
   public int getTimeout() {
     return timeout;
   }
 
+  @Override
   public SqlUpdate setTimeout(int secs) {
     this.timeout = secs;
     return this;
@@ -146,31 +155,37 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
     setParameter(++addPos, value);
   }
 
+  @Override
   public SqlUpdate setParameter(int position, Object value) {
     bindParams.setParameter(position, value);
     return this;
   }
 
+  @Override
   public SqlUpdate setNull(int position, int jdbcType) {
     bindParams.setNullParameter(position, jdbcType);
     return this;
   }
 
+  @Override
   public SqlUpdate setNullParameter(int position, int jdbcType) {
     bindParams.setNullParameter(position, jdbcType);
     return this;
   }
 
+  @Override
   public SqlUpdate setParameter(String name, Object param) {
     bindParams.setParameter(name, param);
     return this;
   }
 
+  @Override
   public SqlUpdate setNull(String name, int jdbcType) {
     bindParams.setNullParameter(name, jdbcType);
     return this;
   }
 
+  @Override
   public SqlUpdate setNullParameter(String name, int jdbcType) {
     bindParams.setNullParameter(name, jdbcType);
     return this;
@@ -179,6 +194,7 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
   /**
    * Return the bind parameters.
    */
+  @Override
   public BindParams getBindParams() {
     return bindParams;
   }

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

@@ -92,6 +92,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
     return ebeanServer.getDatabasePlatform().getLikeClause();
   }
 
+  @Override
   public void executeSecondaryQueries(boolean forEach) {
     // disable lazy loading leaves loadContext null
     if (loadContext != null) {
@@ -121,6 +122,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
   /**
    * Return the BeanDescriptor for the associated bean.
    */
+  @Override
   public BeanDescriptor<T> getBeanDescriptor() {
     return beanDescriptor;
   }
@@ -216,6 +218,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
   /**
    * Return the JsonReadOptions taking into account lazy loading and persistence context.
    */
+  @Override
   public JsonReadOptions createJsonReadOptions() {
 
     persistenceContext = getPersistenceContext(query, transaction);
@@ -266,6 +269,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
    * It ends the query only transaction.
    * </p>
    */
+  @Override
   public void endTransIfRequired() {
     if (createdTransaction) {
       transaction.commit();
@@ -282,6 +286,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
   /**
    * Execute the query as a delete.
    */
+  @Override
   public int delete() {
     return queryEngine.delete(this);
   }
@@ -289,6 +294,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
   /**
    * Execute the query as a update.
    */
+  @Override
   public int update() {
     return queryEngine.update(this);
   }
@@ -296,18 +302,22 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
   /**
    * Execute the query as findById.
    */
+  @Override
   public Object findId() {
     return queryEngine.findId(this);
   }
 
+  @Override
   public int findCount() {
     return queryEngine.findCount(this);
   }
 
+  @Override
   public <A> List<A> findIds() {
     return queryEngine.findIds(this);
   }
 
+  @Override
   public void findEach(Consumer<T> consumer) {
     try (QueryIterator<T> it = queryEngine.findIterate(this)) {
       while (it.hasNext()) {
@@ -316,6 +326,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
     }
   }
 
+  @Override
   public void findEachWhile(Predicate<T> consumer) {
     try (QueryIterator<T> it = queryEngine.findIterate(this)) {
       while (it.hasNext()) {
@@ -326,6 +337,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
     }
   }
 
+  @Override
   public QueryIterator<T> findIterate() {
     return queryEngine.findIterate(this);
   }
@@ -333,11 +345,13 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
   /**
    * Execute the query as findList.
    */
+  @Override
   @SuppressWarnings("unchecked")
   public List<T> findList() {
     return (List<T>) queryEngine.findMany(this);
   }
 
+  @Override
   public List<Version<T>> findVersions() {
     return queryEngine.findVersions(this);
   }
@@ -345,6 +359,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
   /**
    * Execute the query as findSet.
    */
+  @Override
   @SuppressWarnings("unchecked")
   public Set<?> findSet() {
     return (Set<T>) queryEngine.findMany(this);
@@ -353,6 +368,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
   /**
    * Execute the query as findMap.
    */
+  @Override
   public Map<?, ?> findMap() {
     String mapKey = query.getMapKey();
     if (mapKey == null) {
@@ -384,6 +400,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
   /**
    * Return the find that is to be performed.
    */
+  @Override
   public SpiQuery<T> getQuery() {
     return query;
   }
@@ -430,6 +447,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements BeanQueryRe
   /**
    * Try to get the query result from the query cache.
    */
+  @Override
   public BeanCollection<T> getFromQueryCache() {
 
     if (!query.isUseQueryCache()) {

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

@@ -42,10 +42,12 @@ public abstract class PersistRequest extends BeanRequest implements BatchPostExe
    */
   public abstract int executeNow();
 
+  @Override
   public boolean isLogSql() {
     return transaction.isLogSql();
   }
 
+  @Override
   public boolean isLogSummary() {
     return transaction.isLogSummary();
   }

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

@@ -66,6 +66,7 @@ public final class PersistRequestCallableSql extends PersistRequest {
   /**
    * Note the rowCount of the execution.
    */
+  @Override
   public void checkRowCount(int count) {
     this.rowCount = count;
   }
@@ -73,12 +74,14 @@ public final class PersistRequestCallableSql extends PersistRequest {
   /**
    * Only called for insert with generated keys.
    */
+  @Override
   public void setGeneratedKey(Object idValue) {
   }
 
   /**
    * Perform post execute processing for the CallableSql.
    */
+  @Override
   public void postExecute() {
 
     if (transaction.isLogSummary()) {

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

@@ -57,6 +57,7 @@ public final class PersistRequestOrmUpdate extends PersistRequest {
   /**
    * No concurrency checking so just note the rowCount.
    */
+  @Override
   public void checkRowCount(int count) {
     this.rowCount = count;
   }
@@ -64,6 +65,7 @@ public final class PersistRequestOrmUpdate extends PersistRequest {
   /**
    * Not called for this type of request.
    */
+  @Override
   public void setGeneratedKey(Object idValue) {
   }
 
@@ -77,6 +79,7 @@ public final class PersistRequestOrmUpdate extends PersistRequest {
   /**
    * Perform post execute processing.
    */
+  @Override
   public void postExecute() {
 
     OrmUpdateType ormUpdateType = ormUpdate.getOrmUpdateType();

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

@@ -58,6 +58,7 @@ public final class PersistRequestUpdateSql extends PersistRequest {
   /**
    * No concurrency checking so just note the rowCount.
    */
+  @Override
   public void checkRowCount(int count) {
     this.rowCount = count;
   }
@@ -65,6 +66,7 @@ public final class PersistRequestUpdateSql extends PersistRequest {
   /**
    * Not called for this type of request.
    */
+  @Override
   public void setGeneratedKey(Object idValue) {
   }
 
@@ -88,6 +90,7 @@ public final class PersistRequestUpdateSql extends PersistRequest {
   /**
    * Perform post execute processing.
    */
+  @Override
   public void postExecute() {
 
     if (transaction.isLogSummary()) {

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

@@ -16,6 +16,7 @@ public class ServletContextListener implements javax.servlet.ServletContextListe
   /**
    * The servlet container is stopping.
    */
+  @Override
   public void contextDestroyed(ServletContextEvent event) {
     ShutdownManager.shutdown();
   }
@@ -23,6 +24,7 @@ public class ServletContextListener implements javax.servlet.ServletContextListe
   /**
    * Do nothing on startup.
    */
+  @Override
   public void contextInitialized(ServletContextEvent event) {
 
   }

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

@@ -21,6 +21,7 @@ public interface SpiOrmQueryRequest<T> extends DocQueryRequest<T> {
   /**
    * Return the query.
    */
+  @Override
   SpiQuery<T> getQuery();
 
   /**

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

@@ -13,6 +13,7 @@ final class AssocOneHelpEmbedded extends AssocOneHelp {
     super(property);
   }
 
+  @Override
   void loadIgnore(DbReadContext ctx) {
     for (int i = 0; i < property.embeddedProps.length; i++) {
       property.embeddedProps[i].loadIgnore(ctx);

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

@@ -596,6 +596,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
   /**
    * Return true if this is a "Doc Store only" entity bean.
    */
+  @Override
   public boolean isDocStoreOnly() {
     return EntityType.DOC == entityType;
   }
@@ -1032,6 +1033,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
   /**
    * Return the root bean type if part of inheritance hierarchy.
    */
+  @Override
   public BeanType<?> root() {
     if (inheritInfo != null && !inheritInfo.isRoot()) {
       return inheritInfo.getRoot().desc();
@@ -1523,6 +1525,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
   /**
    * Return the 'when modified' property if there is one defined.
    */
+  @Override
   public BeanProperty getWhenModifiedProperty() {
     return whenModifiedProperty;
   }
@@ -1530,6 +1533,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
   /**
    * Return the 'when created' property if there is one defined.
    */
+  @Override
   public BeanProperty getWhenCreatedProperty() {
     return whenCreatedProperty;
   }
@@ -1830,6 +1834,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
   /**
    * Return the short name of the entity bean.
    */
+  @Override
   public String getName() {
     return name;
   }
@@ -1837,6 +1842,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
   /**
    * Summary description.
    */
+  @Override
   public String toString() {
     return fullName;
   }
@@ -2321,6 +2327,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
   /**
    * Return the beanListener.
    */
+  @Override
   public BeanPersistListener getPersistListener() {
     return persistListener;
   }
@@ -2343,6 +2350,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
   /**
    * Return the BeanQueryAdapter or null if none is defined.
    */
+  @Override
   public BeanQueryAdapter getQueryAdapter() {
     return queryAdapter;
   }
@@ -2429,6 +2437,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
   /**
    * Return the Controller.
    */
+  @Override
   public BeanPersistController getPersistController() {
     return persistController;
   }
@@ -2461,6 +2470,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
    * Return the base table. Only properties mapped to the base table are by
    * default persisted.
    */
+  @Override
   public String getBaseTable() {
     return baseTable;
   }
@@ -2611,6 +2621,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
   /**
    * Return the identity generation type.
    */
+  @Override
   public IdType getIdType() {
     return idType;
   }
@@ -2625,6 +2636,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo, BeanType<T> {
   /**
    * Return the sequence name.
    */
+  @Override
   public String getSequenceName() {
     return sequenceName;
   }

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

@@ -264,6 +264,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     return descQueueMap.get(queueId);
   }
 
+  @Override
   @SuppressWarnings("unchecked")
   public <T> BeanDescriptor<T> getBeanDescriptor(Class<T> entityType) {
     return (BeanDescriptor<T>) descMap.get(entityType.getName());
@@ -274,14 +275,17 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     return (BeanDescriptor<T>) descMap.get(entityClassName);
   }
 
+  @Override
   public String getServerName() {
     return serverName;
   }
 
+  @Override
   public SpiCacheManager getCacheManager() {
     return cacheManager;
   }
 
+  @Override
   public NamingConvention getNamingConvention() {
     return namingConvention;
   }
@@ -295,6 +299,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     }
   }
 
+  @Override
   public IdBinder createIdBinder(BeanProperty idProperty) {
     return idBinderFactory.createIdBinder(idProperty);
   }
@@ -407,6 +412,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
   /**
    * Return the Encrypt key given the table and column name.
    */
+  @Override
   public EncryptKey getEncryptKey(String tableName, String columnName) {
     return encryptKeyManager.getEncryptKey(tableName, columnName);
   }
@@ -1491,6 +1497,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
 
     private static final long serialVersionUID = 1L;
 
+    @Override
     public int compare(BeanDescriptor<?> o1, BeanDescriptor<?> o2) {
 
       return o1.getName().compareTo(o2.getName());

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

@@ -31,6 +31,7 @@ public final class BeanFkeyProperty implements ElPropertyValue {
     this.placeHolder = calcPlaceHolder(prefix, dbColumn);
   }
 
+  @Override
   public String toString() {
     return "prefix:" + prefix + " name:" + name + " dbColumn:" + dbColumn + " ph:" + placeHolder;
   }
@@ -62,6 +63,7 @@ public final class BeanFkeyProperty implements ElPropertyValue {
   /**
    * Returns false for keys.
    */
+  @Override
   public boolean isDbEncrypted() {
     return false;
   }
@@ -69,6 +71,7 @@ public final class BeanFkeyProperty implements ElPropertyValue {
   /**
    * Returns false for keys.
    */
+  @Override
   public boolean isLocalEncrypted() {
     return false;
   }
@@ -81,22 +84,27 @@ public final class BeanFkeyProperty implements ElPropertyValue {
   /**
    * Returns false.
    */
+  @Override
   public boolean containsMany() {
     return containsMany;
   }
 
+  @Override
   public boolean containsManySince(String sinceProperty) {
     return containsMany();
   }
 
+  @Override
   public String getDbColumn() {
     return dbColumn;
   }
 
+  @Override
   public String getName() {
     return name;
   }
 
+  @Override
   public String getElName() {
     return name;
   }
@@ -104,6 +112,7 @@ public final class BeanFkeyProperty implements ElPropertyValue {
   /**
    * Returns null as not an AssocOne.
    */
+  @Override
   public Object[] getAssocIdValues(EntityBean value) {
     return null;
   }
@@ -111,6 +120,7 @@ public final class BeanFkeyProperty implements ElPropertyValue {
   /**
    * Returns null as not an AssocOne.
    */
+  @Override
   public String getAssocIdExpression(String prefix, String operator) {
     return null;
   }
@@ -118,6 +128,7 @@ public final class BeanFkeyProperty implements ElPropertyValue {
   /**
    * Returns null as not an AssocOne.
    */
+  @Override
   public String getAssocIdInExpr(String prefix) {
     return null;
   }
@@ -125,6 +136,7 @@ public final class BeanFkeyProperty implements ElPropertyValue {
   /**
    * Returns null as not an AssocOne.
    */
+  @Override
   public String getAssocIdInValueExpr(int size) {
     return null;
   }
@@ -152,30 +164,37 @@ public final class BeanFkeyProperty implements ElPropertyValue {
     return false;
   }
 
+  @Override
   public String getElPlaceholder(boolean encrypted) {
     return placeHolder;
   }
 
+  @Override
   public String getElPrefix() {
     return prefix;
   }
 
+  @Override
   public boolean isDateTimeCapable() {
     return false;
   }
 
+  @Override
   public int getJdbcType() {
     return 0;
   }
 
+  @Override
   public BeanProperty getBeanProperty() {
     return null;
   }
 
+  @Override
   public Object parseDateTime(long systemTimeMillis) {
     throw new RuntimeException("ElPropertyDeploy only - not implemented");
   }
 
+  @Override
   public StringParser getStringParser() {
     throw new RuntimeException("ElPropertyDeploy only - not implemented");
   }

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

@@ -85,6 +85,7 @@ public final class BeanMapHelp<T> implements BeanCollectionHelp<T> {
       this.map = map;
     }
 
+    @Override
     public void addEntityBean(EntityBean bean) {
       Object keyValue = beanProperty.getValue(bean);
       map.put(keyValue, bean);

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

@@ -557,6 +557,7 @@ public class BeanProperty implements ElPropertyValue, Property {
     return secondaryTableJoinPrefix;
   }
 
+  @Override
   public boolean isAggregation() {
     return aggregation != null;
   }
@@ -647,6 +648,7 @@ public class BeanProperty implements ElPropertyValue, Property {
     return scalarType.readData(dataInput);
   }
 
+  @Override
   public BeanProperty getBeanProperty() {
     return this;
   }
@@ -786,6 +788,7 @@ public class BeanProperty implements ElPropertyValue, Property {
     throw new RuntimeException("Expected to be called only on BeanPropertyCompoundScalar");
   }
 
+  @Override
   public Object getVal(Object bean) {
     return getValue((EntityBean) bean);
   }
@@ -813,6 +816,7 @@ public class BeanProperty implements ElPropertyValue, Property {
     }
   }
 
+  @Override
   public Object convert(Object value) {
     if (value == null) {
       return null;
@@ -845,6 +849,7 @@ public class BeanProperty implements ElPropertyValue, Property {
   /**
    * Return the name of the property.
    */
+  @Override
   public String getName() {
     return name;
   }
@@ -856,6 +861,7 @@ public class BeanProperty implements ElPropertyValue, Property {
     return propertyIndex;
   }
 
+  @Override
   public String getElName() {
     return name;
   }
@@ -865,10 +871,12 @@ public class BeanProperty implements ElPropertyValue, Property {
     return formula && sqlFormulaJoin != null;
   }
 
+  @Override
   public boolean containsManySince(String sinceProperty) {
     return containsMany();
   }
 
+  @Override
   public boolean containsMany() {
     return aggregation != null;
   }
@@ -879,21 +887,25 @@ public class BeanProperty implements ElPropertyValue, Property {
     throw new RuntimeException("Not Supported or Expected");
   }
 
+  @Override
   public Object[] getAssocIdValues(EntityBean bean) {
     // Returns null as not an AssocOne.
     return null;
   }
 
+  @Override
   public String getAssocIdExpression(String prefix, String operator) {
     // Returns null as not an AssocOne.
     return null;
   }
 
+  @Override
   public String getAssocIdInExpr(String prefix) {
     // Returns null as not an AssocOne.
     return null;
   }
 
+  @Override
   public String getAssocIdInValueExpr(int size) {
     // Returns null as not an AssocOne.
     return null;
@@ -905,20 +917,24 @@ public class BeanProperty implements ElPropertyValue, Property {
     return false;
   }
 
+  @Override
   public boolean isAssocId() {
     // Returns false - override in BeanPropertyAssocOne.
     return false;
   }
 
+  @Override
   public boolean isAssocProperty() {
     // Returns false - override in BeanPropertyAssocOne.
     return false;
   }
 
+  @Override
   public String getElPlaceholder(boolean encrypted) {
     return encrypted ? elPlaceHolderEncrypted : elPlaceHolder;
   }
 
+  @Override
   public String getElPrefix() {
     return elPrefix;
   }
@@ -946,18 +962,22 @@ public class BeanProperty implements ElPropertyValue, Property {
     return scalarType;
   }
 
+  @Override
   public StringParser getStringParser() {
     return scalarType;
   }
 
+  @Override
   public boolean isDateTimeCapable() {
     return scalarType != null && scalarType.isDateTimeCapable();
   }
 
+  @Override
   public int getJdbcType() {
     return scalarType == null ? 0 : scalarType.getJdbcType();
   }
 
+  @Override
   public Object parseDateTime(long systemTimeMillis) {
     return scalarType.convertFromMillis(systemTimeMillis);
   }
@@ -1102,6 +1122,7 @@ public class BeanProperty implements ElPropertyValue, Property {
   /**
    * The database column name this is mapped to.
    */
+  @Override
   public String getDbColumn() {
     return dbColumn;
   }
@@ -1178,6 +1199,7 @@ public class BeanProperty implements ElPropertyValue, Property {
   /**
    * Returns true if DB encrypted.
    */
+  @Override
   public boolean isLocalEncrypted() {
     return localEncrypted;
   }
@@ -1185,6 +1207,7 @@ public class BeanProperty implements ElPropertyValue, Property {
   /**
    * Return true if this property is stored encrypted.
    */
+  @Override
   public boolean isDbEncrypted() {
     return dbEncrypted;
   }
@@ -1309,6 +1332,7 @@ public class BeanProperty implements ElPropertyValue, Property {
     return embedded;
   }
 
+  @Override
   public String toString() {
     return name;
   }

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

@@ -144,6 +144,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty {
   /**
    * Return false.
    */
+  @Override
   public boolean isScalar() {
     return false;
   }

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

@@ -127,6 +127,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     this.jsonHelp = new BeanPropertyAssocManyJsonHelp(this);
   }
 
+  @Override
   public void initialise() {
     super.initialise();
 
@@ -268,6 +269,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     }
   }
 
+  @Override
   public ElPropertyValue buildElPropertyValue(String propName, String remainder, ElPropertyChainBuilder chain, boolean propertyDeploy) {
     return createElPropertyValue(propName, remainder, chain, propertyDeploy);
   }
@@ -523,6 +525,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
   /**
    * Return the Id expression to add to where clause etc.
    */
+  @Override
   public String getAssocIdExpression(String prefix, String operator) {
     return targetDescriptor.getIdBinder().getAssocOneIdExpr(prefix, operator);
   }
@@ -959,6 +962,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     return null != targetDescriptor.getId(otherBean);
   }
 
+  @Override
   public void jsonWrite(WriteJson ctx, EntityBean bean) throws IOException {
     if (!this.jsonSerialize) {
       return;
@@ -987,6 +991,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
     }
   }
 
+  @Override
   public void jsonRead(ReadJson readJson, EntityBean parentBean) throws IOException {
     jsonHelp.jsonRead(readJson, parentBean);
   }

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

@@ -168,6 +168,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
     }
   }
 
+  @Override
   public ElPropertyValue buildElPropertyValue(String propName, String remainder, ElPropertyChainBuilder chain, boolean propertyDeploy) {
 
     if (embedded) {
@@ -399,6 +400,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
    * Same as getPropertyType(). Return the type of the bean this property
    * represents.
    */
+  @Override
   public Class<?> getTargetType() {
     return getPropertyType();
   }
@@ -448,6 +450,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
   /**
    * Return the Id expression to add to where clause etc.
    */
+  @Override
   public String getAssocIdExpression(String prefix, String operator) {
     return targetDescriptor.getIdBinder().getAssocOneIdExpr(prefix, operator);
   }

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

@@ -61,6 +61,7 @@ public final class BeanSetHelp<T> implements BeanCollectionHelp<T> {
     }
   }
 
+  @Override
   public void add(BeanCollection<?> collection, EntityBean bean, boolean withCheck) {
     if (withCheck) {
       collection.internalAddWithCheck(bean);

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

@@ -42,6 +42,7 @@ public class BeanTable {
         this.idProperties = mutable.createIdProperties(owner);
     }
 
+    @Override
     public String toString(){
     	return baseTable;
     }

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

@@ -174,7 +174,8 @@ public class ChainedBeanPersistController implements BeanPersistController {
 	 */
 	private static class Sorter implements Comparator<BeanPersistController> {
 
-		public int compare(BeanPersistController o1, BeanPersistController o2) {
+		@Override
+    public int compare(BeanPersistController o1, BeanPersistController o2) {
 
 			int i1 = o1.getExecutionOrder() ;
 			int i2 = o2.getExecutionOrder() ;

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

@@ -83,25 +83,29 @@ public class ChainedBeanPersistListener implements BeanPersistListener {
 		}
 	}
 
-	public void deleted(Object bean) {
+	@Override
+  public void deleted(Object bean) {
     for (BeanPersistListener aChain : chain) {
       aChain.deleted(bean);
     }
 	}
 
-	public void softDeleted(Object bean) {
+	@Override
+  public void softDeleted(Object bean) {
     for (BeanPersistListener aChain : chain) {
       aChain.softDeleted(bean);
     }
 	}
 
-	public void inserted(Object bean) {
+	@Override
+  public void inserted(Object bean) {
     for (BeanPersistListener aChain : chain) {
       aChain.inserted(bean);
     }
 	}
 
-	public void updated(Object bean, Set<String> updatedProperties) {
+	@Override
+  public void updated(Object bean, Set<String> updatedProperties) {
     for (BeanPersistListener aChain : chain) {
       aChain.updated(bean, updatedProperties);
     }

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

@@ -63,18 +63,21 @@ public class ChainedBeanQueryAdapter implements BeanQueryAdapter {
 	/**
 	 * Return 0 as not used by this Chained adapter.
 	 */
-	public int getExecutionOrder() {
+	@Override
+  public int getExecutionOrder() {
 		return 0;
 	}
 
 	/**
 	 * Return false as only individual adapters are registered.
 	 */
-	public boolean isRegisterFor(Class<?> cls) {
+	@Override
+  public boolean isRegisterFor(Class<?> cls) {
 		return false;
 	}
 
-	public void preQuery(BeanQueryRequest<?> request) {
+	@Override
+  public void preQuery(BeanQueryRequest<?> request) {
 
     for (BeanQueryAdapter aChain : chain) {
       aChain.preQuery(request);
@@ -85,7 +88,8 @@ public class ChainedBeanQueryAdapter implements BeanQueryAdapter {
 	 */
 	private static class Sorter implements Comparator<BeanQueryAdapter> {
 
-		public int compare(BeanQueryAdapter o1, BeanQueryAdapter o2) {
+		@Override
+    public int compare(BeanQueryAdapter o1, BeanQueryAdapter o2) {
 
 			int i1 = o1.getExecutionOrder() ;
 			int i2 = o2.getExecutionOrder() ;

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

@@ -23,6 +23,7 @@ public final class DeployPropertyParser extends DeployParser {
 		this.beanDescriptor = beanDescriptor;
 	}
 
+    @Override
     public Set<String> getIncludes() {
 		return includes;
 	}

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

@@ -18,10 +18,12 @@ public final class DeployPropertyParserMap extends DeployParser {
   /**
    * Returns null for raw sql queries.
    */
+  @Override
   public Set<String> getIncludes() {
     return Collections.emptySet();
   }
 
+  @Override
   public String convertWord() {
     String r = getDeployWord(word);
     return r == null ? word : r;

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

@@ -23,7 +23,8 @@ public final class DeployUpdateParser extends DeployParser {
 		return null;
 	}
 
-	public String convertWord() {
+	@Override
+  public String convertWord() {
 
 		String dbWord = getDeployWord(word);
 
@@ -73,7 +74,8 @@ public final class DeployUpdateParser extends DeployParser {
 		}
 	}
 
-	public String getDeployWord(String expression) {
+	@Override
+  public String getDeployWord(String expression) {
 
 		if (expression.equalsIgnoreCase(beanDescriptor.getName())){
 			return beanDescriptor.getBaseTable();

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

@@ -347,6 +347,7 @@ public class InheritInfo {
     return discriminatorValue;
   }
 
+  @Override
   public String toString() {
     return "InheritInfo[" + type.getName() + "] disc[" + discriminatorStringValue + "]";
   }

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

@@ -96,6 +96,7 @@ public final class TableJoin {
     return queryHash;
   }
 
+  @Override
   public String toString() {
     StringBuilder sb = new StringBuilder(30);
     sb.append(type).append(" ").append(table).append(" ");

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

@@ -74,6 +74,7 @@ public class TableJoinColumn {
     return foreignDbColumn.equals(that.foreignDbColumn);
   }
 
+  @Override
   public String toString() {
     return (localSqlFormula == null ? localDbColumn : localSqlFormula) + " = "
         + (foreignSqlFormula == null ? foreignDbColumn : foreignSqlFormula);

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java

@@ -36,6 +36,7 @@ public class GeneratedCounter implements GeneratedProperty {
   /**
    * Include this in every update.
    */
+  @Override
   public boolean includeInUpdate() {
     return true;
   }
@@ -48,10 +49,12 @@ public class GeneratedCounter implements GeneratedProperty {
   /**
    * Include this in every insert setting initial counter value to 1.
    */
+  @Override
   public boolean includeInInsert() {
     return true;
   }
 
+  @Override
   public boolean isDDLNotNullable() {
     return true;
   }

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java

@@ -32,6 +32,7 @@ public class GeneratedCounterInteger implements GeneratedProperty {
   /**
    * Include this in every update.
    */
+  @Override
   public boolean includeInUpdate() {
     return true;
   }
@@ -44,10 +45,12 @@ public class GeneratedCounterInteger implements GeneratedProperty {
   /**
    * Include this in every insert setting initial counter value to 1.
    */
+  @Override
   public boolean includeInInsert() {
     return true;
   }
 
+  @Override
   public boolean isDDLNotNullable() {
     return true;
   }

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java

@@ -32,6 +32,7 @@ public class GeneratedCounterLong implements GeneratedProperty {
   /**
    * Include this in every update.
    */
+  @Override
   public boolean includeInUpdate() {
     return true;
   }
@@ -44,10 +45,12 @@ public class GeneratedCounterLong implements GeneratedProperty {
   /**
    * Include this in every insert setting initial counter value to 1.
    */
+  @Override
   public boolean includeInInsert() {
     return true;
   }
 
+  @Override
   public boolean isDDLNotNullable() {
     return true;
   }

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java

@@ -29,6 +29,7 @@ public class GeneratedInsertDate implements GeneratedProperty {
   /**
    * Return false.
    */
+  @Override
   public boolean includeInUpdate() {
     return false;
   }
@@ -41,10 +42,12 @@ public class GeneratedInsertDate implements GeneratedProperty {
   /**
    * Return true.
    */
+  @Override
   public boolean includeInInsert() {
     return true;
   }
 
+  @Override
   public boolean isDDLNotNullable() {
     return true;
   }

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java

@@ -27,6 +27,7 @@ public class GeneratedInsertLong implements GeneratedProperty {
   /**
    * Return false.
    */
+  @Override
   public boolean includeInUpdate() {
     return false;
   }
@@ -39,10 +40,12 @@ public class GeneratedInsertLong implements GeneratedProperty {
   /**
    * Return true.
    */
+  @Override
   public boolean includeInInsert() {
     return true;
   }
 
+  @Override
   public boolean isDDLNotNullable() {
     return true;
   }

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java

@@ -29,6 +29,7 @@ public class GeneratedInsertTimestamp implements GeneratedProperty, GeneratedWhe
   /**
    * Return false.
    */
+  @Override
   public boolean includeInUpdate() {
     return false;
   }
@@ -41,10 +42,12 @@ public class GeneratedInsertTimestamp implements GeneratedProperty, GeneratedWhe
   /**
    * Return true.
    */
+  @Override
   public boolean includeInInsert() {
     return true;
   }
 
+  @Override
   public boolean isDDLNotNullable() {
     return true;
   }

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java

@@ -14,6 +14,7 @@ public class GeneratedUpdateDate implements GeneratedProperty {
   /**
    * Return now as a Timestamp.
    */
+  @Override
   public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
     return new Date(now);
   }
@@ -21,6 +22,7 @@ public class GeneratedUpdateDate implements GeneratedProperty {
   /**
    * Return now as a Timestamp.
    */
+  @Override
   public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
     return new Date(now);
   }
@@ -28,6 +30,7 @@ public class GeneratedUpdateDate implements GeneratedProperty {
   /**
    * For dynamic table updates make sure this is included.
    */
+  @Override
   public boolean includeInUpdate() {
     return true;
   }
@@ -40,10 +43,12 @@ public class GeneratedUpdateDate implements GeneratedProperty {
   /**
    * Include this in every insert.
    */
+  @Override
   public boolean includeInInsert() {
     return true;
   }
 
+  @Override
   public boolean isDDLNotNullable() {
     return true;
   }

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java

@@ -11,6 +11,7 @@ public class GeneratedUpdateLong implements GeneratedProperty {
   /**
    * Return now as a Timestamp.
    */
+  @Override
   public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
     return now;
   }
@@ -18,6 +19,7 @@ public class GeneratedUpdateLong implements GeneratedProperty {
   /**
    * Return now as a Timestamp.
    */
+  @Override
   public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
     return now;
   }
@@ -25,6 +27,7 @@ public class GeneratedUpdateLong implements GeneratedProperty {
   /**
    * For dynamic table updates make sure this is included.
    */
+  @Override
   public boolean includeInUpdate() {
     return true;
   }
@@ -37,10 +40,12 @@ public class GeneratedUpdateLong implements GeneratedProperty {
   /**
    * Include this in every insert.
    */
+  @Override
   public boolean includeInInsert() {
     return true;
   }
 
+  @Override
   public boolean isDDLNotNullable() {
     return true;
   }

src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java

@@ -13,6 +13,7 @@ public class GeneratedUpdateTimestamp implements GeneratedProperty, GeneratedWhe
   /**
    * Return now as a Timestamp.
    */
+  @Override
   public Object getInsertValue(BeanProperty prop, EntityBean bean, long now) {
     return new Timestamp(now);
   }
@@ -20,6 +21,7 @@ public class GeneratedUpdateTimestamp implements GeneratedProperty, GeneratedWhe
   /**
    * Return now as a Timestamp.
    */
+  @Override
   public Object getUpdateValue(BeanProperty prop, EntityBean bean, long now) {
     return new Timestamp(now);
   }
@@ -27,6 +29,7 @@ public class GeneratedUpdateTimestamp implements GeneratedProperty, GeneratedWhe
   /**
    * For dynamic table updates make sure this is included.
    */
+  @Override
   public boolean includeInUpdate() {
     return true;
   }
@@ -39,10 +42,12 @@ public class GeneratedUpdateTimestamp implements GeneratedProperty, GeneratedWhe
   /**
    * Include this in every insert.
    */
+  @Override
   public boolean includeInInsert() {
     return true;
   }
 
+  @Override
   public boolean isDDLNotNullable() {
     return true;
   }

src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java

@@ -39,12 +39,14 @@ public final class IdBinderEmbedded implements IdBinder {
     this.embIdProperty = embIdProperty;
   }
 
+  @Override
   public void initialise() {
     this.idDesc = embIdProperty.getTargetDescriptor();
     this.props = embIdProperty.getProperties();
     this.idInValueSql = idInExpandedForm ? idInExpanded() : idInCompressed();
   }
 
+  @Override
   public boolean isIdInExpandedForm() {
     return idInExpandedForm;
   }
@@ -86,6 +88,7 @@ public final class IdBinderEmbedded implements IdBinder {
     return embIdProperty;
   }
 
+  @Override
   public String getOrderBy(String pathPrefix, boolean ascending) {
     StringBuilder sb = new StringBuilder();
     for (int i = 0; i < props.length; i++) {
@@ -109,10 +112,12 @@ public final class IdBinderEmbedded implements IdBinder {
     return idDesc;
   }
 
+  @Override
   public String getIdProperty() {
     return embIdProperty.getName();
   }
 
+  @Override
   public void buildRawSqlSelectChain(String prefix, List<String> selectChain) {
 
     prefix = SplitName.add(prefix, embIdProperty.getName());
@@ -122,6 +127,7 @@ public final class IdBinderEmbedded implements IdBinder {
     }
   }
 
+  @Override
   public BeanProperty findBeanProperty(String dbColumnName) {
     for (BeanProperty prop : props) {
       if (dbColumnName.equalsIgnoreCase(prop.getDbColumn())) {
@@ -131,10 +137,12 @@ public final class IdBinderEmbedded implements IdBinder {
     return null;
   }
 
+  @Override
   public boolean isComplexId() {
     return true;
   }
 
+  @Override
   public String getDefaultOrderBy() {
 
     StringBuilder sb = new StringBuilder();
@@ -155,12 +163,14 @@ public final class IdBinderEmbedded implements IdBinder {
     return props;
   }
 
+  @Override
   public void addIdInBindValue(SpiExpressionRequest request, Object value) {
     for (BeanProperty prop : props) {
       request.addBindValue(prop.getValue((EntityBean) value));
     }
   }
 
+  @Override
   public String getIdInValueExprDelete(int size) {
     if (!idInExpandedForm) {
       return getIdInValueExpr(size);
@@ -187,6 +197,7 @@ public final class IdBinderEmbedded implements IdBinder {
     return sb.toString();
   }
 
+  @Override
   public String getIdInValueExpr(int size) {
 
     StringBuilder sb = new StringBuilder();
@@ -209,6 +220,7 @@ public final class IdBinderEmbedded implements IdBinder {
     return sb.toString();
   }
 
+  @Override
   public Object[] getIdValues(EntityBean bean) {
     Object val = embIdProperty.getValue(bean);
     Object[] bindvalues = new Object[props.length];
@@ -218,6 +230,7 @@ public final class IdBinderEmbedded implements IdBinder {
     return bindvalues;
   }
 
+  @Override
   public Object[] getBindValues(Object value) {
 
     Object[] bindvalues = new Object[props.length];
@@ -244,6 +257,7 @@ public final class IdBinderEmbedded implements IdBinder {
   /**
    * Convert back from a Map to embedded bean.
    */
+  @Override
   @SuppressWarnings("unchecked")
   public Object convertIdFromJson(Object value) {
 
@@ -258,6 +272,7 @@ public final class IdBinderEmbedded implements IdBinder {
   }
 
 
+  @Override
   public void bindId(DefaultSqlUpdate sqlUpdate, Object value) {
     for (BeanProperty prop : props) {
       Object embFieldValue = prop.getValue((EntityBean) value);
@@ -265,6 +280,7 @@ public final class IdBinderEmbedded implements IdBinder {
     }
   }
 
+  @Override
   public void bindId(DataBind dataBind, Object value) throws SQLException {
 
     for (BeanProperty prop : props) {
@@ -273,6 +289,7 @@ public final class IdBinderEmbedded implements IdBinder {
     }
   }
 
+  @Override
   public Object readData(DataInput dataInput) throws IOException {
 
     EntityBean embId = idDesc.createEntityBean();
@@ -293,6 +310,7 @@ public final class IdBinderEmbedded implements IdBinder {
     }
   }
 
+  @Override
   public void writeData(DataOutput dataOutput, Object idValue) throws IOException {
     for (BeanProperty prop : props) {
       Object embFieldValue = prop.getValue((EntityBean) idValue);
@@ -300,12 +318,14 @@ public final class IdBinderEmbedded implements IdBinder {
     }
   }
 
+  @Override
   public void loadIgnore(DbReadContext ctx) {
     for (BeanProperty prop : props) {
       prop.loadIgnore(ctx);
     }
   }
 
+  @Override
   public Object read(DbReadContext ctx) throws SQLException {
 
     EntityBean embId = idDesc.createEntityBean();
@@ -325,6 +345,7 @@ public final class IdBinderEmbedded implements IdBinder {
     }
   }
 
+  @Override
   public Object readSet(DbReadContext ctx, EntityBean bean) throws SQLException {
 
     Object embId = read(ctx);
@@ -336,12 +357,14 @@ public final class IdBinderEmbedded implements IdBinder {
     }
   }
 
+  @Override
   public void appendSelect(DbSqlContext ctx, boolean subQuery) {
     for (BeanProperty prop : props) {
       prop.appendSelect(ctx, subQuery);
     }
   }
 
+  @Override
   public String getAssocIdInExpr(String prefix) {
 
     StringBuilder sb = new StringBuilder();
@@ -360,6 +383,7 @@ public final class IdBinderEmbedded implements IdBinder {
     return sb.toString();
   }
 
+  @Override
   public String getAssocOneIdExpr(String prefix, String operator) {
 
     StringBuilder sb = new StringBuilder();
@@ -380,6 +404,7 @@ public final class IdBinderEmbedded implements IdBinder {
     return sb.toString();
   }
 
+  @Override
   public String getBindIdSql(String baseTableAlias) {
 
     StringBuilder sb = new StringBuilder();
@@ -397,6 +422,7 @@ public final class IdBinderEmbedded implements IdBinder {
     return sb.toString();
   }
 
+  @Override
   public String getBindIdInSql(String baseTableAlias) {
 
     if (idInExpandedForm) {
@@ -425,6 +451,7 @@ public final class IdBinderEmbedded implements IdBinder {
     return idValue;
   }
 
+  @Override
   public Object convertSetId(Object idValue, EntityBean bean) {
 
     // can not cast/convert if it is embedded

src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java

@@ -25,18 +25,22 @@ public final class IdBinderEmpty implements IdBinder {
 
   }
 
+  @Override
   public void initialise() {
 
   }
 
+  @Override
   public boolean isIdInExpandedForm() {
     return false;
   }
 
+  @Override
   public String getOrderBy(String pathPrefix, boolean ascending) {
     return pathPrefix;
   }
 
+  @Override
   public void buildRawSqlSelectChain(String prefix, List<String> selectChain) {
   }
 
@@ -45,55 +49,68 @@ public final class IdBinderEmpty implements IdBinder {
     return null;
   }
 
+  @Override
   public String getIdProperty() {
     return null;
   }
 
+  @Override
   public BeanProperty findBeanProperty(String dbColumnName) {
     return null;
   }
 
+  @Override
   public boolean isComplexId() {
     return true;
   }
 
+  @Override
   public String getDefaultOrderBy() {
     // this should never happen?
     return "";
   }
 
+  @Override
   public String getBindIdSql(String baseTableAlias) {
     return bindIdSql;
   }
 
+  @Override
   public String getAssocOneIdExpr(String prefix, String operator) {
     return null;
   }
 
+  @Override
   public String getAssocIdInExpr(String prefix) {
     return null;
   }
 
+  @Override
   public void addIdInBindValue(SpiExpressionRequest request, Object value) {
 
   }
 
+  @Override
   public String getIdInValueExprDelete(int size) {
     return getIdInValueExpr(size);
   }
 
+  @Override
   public String getIdInValueExpr(int size) {
     return "";
   }
 
+  @Override
   public String getBindIdInSql(String baseTableAlias) {
     return null;
   }
 
+  @Override
   public Object[] getIdValues(EntityBean bean) {
     return null;
   }
 
+  @Override
   public Object[] getBindValues(Object idValue) {
     return new Object[]{idValue};
   }
@@ -108,28 +125,35 @@ public final class IdBinderEmpty implements IdBinder {
     return value;
   }
 
+  @Override
   public void bindId(DefaultSqlUpdate sqlUpdate, Object value) {
 
   }
 
+  @Override
   public void bindId(DataBind dataBind, Object value) throws SQLException {
 
   }
 
+  @Override
   public void loadIgnore(DbReadContext ctx) {
   }
 
+  @Override
   public Object readSet(DbReadContext ctx, EntityBean bean) throws SQLException {
     return null;
   }
 
+  @Override
   public Object read(DbReadContext ctx) throws SQLException {
     return null;
   }
 
+  @Override
   public void appendSelect(DbSqlContext ctx, boolean subQuery) {
   }
 
+  @Override
   public Object convertSetId(Object idValue, EntityBean bean) {
     return idValue;
   }
@@ -139,10 +163,12 @@ public final class IdBinderEmpty implements IdBinder {
     return idValue;
   }
 
+  @Override
   public Object readData(DataInput dataOutput) throws IOException {
     return null;
   }
 
+  @Override
   public void writeData(DataOutput dataOutput, Object idValue) throws IOException {
 
   }

src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java

@@ -37,14 +37,17 @@ public final class IdBinderSimple implements IdBinder {
     bindIdSql = InternString.intern(idProperty.getDbColumn() + " = ? ");
   }
 
+  @Override
   public void initialise() {
     // do nothing
   }
 
+  @Override
   public boolean isIdInExpandedForm() {
     return false;
   }
 
+  @Override
   public String getOrderBy(String pathPrefix, boolean ascending) {
 
     StringBuilder sb = new StringBuilder();
@@ -58,6 +61,7 @@ public final class IdBinderSimple implements IdBinder {
     return sb.toString();
   }
 
+  @Override
   public void buildRawSqlSelectChain(String prefix, List<String> selectChain) {
 
     idProperty.buildRawSqlSelectChain(prefix, selectChain);
@@ -68,10 +72,12 @@ public final class IdBinderSimple implements IdBinder {
     return idProperty;
   }
 
+  @Override
   public String getIdProperty() {
     return idProperty.getName();
   }
 
+  @Override
   public BeanProperty findBeanProperty(String dbColumnName) {
     if (dbColumnName.equalsIgnoreCase(idProperty.getDbColumn())) {
       return idProperty;
@@ -79,14 +85,17 @@ public final class IdBinderSimple implements IdBinder {
     return null;
   }
 
+  @Override
   public boolean isComplexId() {
     return false;
   }
 
+  @Override
   public String getDefaultOrderBy() {
     return idProperty.getName();
   }
 
+  @Override
   public String getBindIdInSql(String baseTableAlias) {
     if (baseTableAlias == null) {
       return idProperty.getDbColumn();
@@ -95,6 +104,7 @@ public final class IdBinderSimple implements IdBinder {
     }
   }
 
+  @Override
   public String getBindIdSql(String baseTableAlias) {
     if (baseTableAlias == null) {
       return bindIdSql;
@@ -103,18 +113,22 @@ public final class IdBinderSimple implements IdBinder {
     }
   }
 
+  @Override
   public Object[] getIdValues(EntityBean bean) {
     return new Object[]{idProperty.getValue(bean)};
   }
 
+  @Override
   public Object[] getBindValues(Object idValue) {
     return new Object[]{idValue};
   }
 
+  @Override
   public String getIdInValueExprDelete(int size) {
     return getIdInValueExpr(size);
   }
 
+  @Override
   public String getIdInValueExpr(int size) {
     StringBuilder sb = new StringBuilder(2 * size + 10);
     sb.append(" in");
@@ -126,6 +140,7 @@ public final class IdBinderSimple implements IdBinder {
     return sb.toString();
   }
 
+  @Override
   public void addIdInBindValue(SpiExpressionRequest request, Object value) {
     value = convertSetId(value, null);
     request.addBindValue(value);
@@ -142,10 +157,12 @@ public final class IdBinderSimple implements IdBinder {
     return convertId(value);
   }
 
+  @Override
   public void bindId(DefaultSqlUpdate sqlUpdate, Object value) {
     sqlUpdate.addParameter(value);
   }
 
+  @Override
   public void bindId(DataBind dataBind, Object value) throws SQLException {
     if (!value.getClass().equals(expectedType)) {
       value = scalarType.toBeanType(value);
@@ -153,18 +170,22 @@ public final class IdBinderSimple implements IdBinder {
     idProperty.bind(dataBind, value);
   }
 
+  @Override
   public void writeData(DataOutput os, Object value) throws IOException {
     idProperty.writeData(os, value);
   }
 
+  @Override
   public Object readData(DataInput is) throws IOException {
     return idProperty.readData(is);
   }
 
+  @Override
   public void loadIgnore(DbReadContext ctx) {
     idProperty.loadIgnore(ctx);
   }
 
+  @Override
   public Object readSet(DbReadContext ctx, EntityBean bean) throws SQLException {
     Object id = idProperty.read(ctx);
     if (id != null) {
@@ -173,14 +194,17 @@ public final class IdBinderSimple implements IdBinder {
     return id;
   }
 
+  @Override
   public Object read(DbReadContext ctx) throws SQLException {
     return idProperty.read(ctx);
   }
 
+  @Override
   public void appendSelect(DbSqlContext ctx, boolean subQuery) {
     idProperty.appendSelect(ctx, subQuery);
   }
 
+  @Override
   public String getAssocOneIdExpr(String prefix, String operator) {
 
     StringBuilder sb = new StringBuilder();
@@ -193,6 +217,7 @@ public final class IdBinderSimple implements IdBinder {
     return sb.toString();
   }
 
+  @Override
   public String getAssocIdInExpr(String prefix) {
 
     StringBuilder sb = new StringBuilder();
@@ -204,6 +229,7 @@ public final class IdBinderSimple implements IdBinder {
     return sb.toString();
   }
 
+  @Override
   public Object convertId(Object idValue) {
 
     if (!idValue.getClass().equals(expectedType)) {
@@ -212,6 +238,7 @@ public final class IdBinderSimple implements IdBinder {
     return idValue;
   }
 
+  @Override
   public Object convertSetId(Object idValue, EntityBean bean) {
 
     if (!idValue.getClass().equals(expectedType)) {

src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java

@@ -32,6 +32,7 @@ public class ImportedIdEmbedded implements ImportedId {
     this.imported = imported;
   }
 
+  @Override
   public void addFkeys(String name) {
 
     BeanProperty[] embeddedProps = foreignAssocOne.getProperties();
@@ -43,20 +44,24 @@ public class ImportedIdEmbedded implements ImportedId {
     }
   }
 
+  @Override
   public boolean isScalar() {
     return false;
   }
 
+  @Override
   public String getDbColumn() {
     return null;
   }
 
+  @Override
   public void sqlAppend(DbSqlContext ctx) {
     for (ImportedIdSimple anImported : imported) {
       ctx.appendColumn(anImported.localDbColumn);
     }
   }
 
+  @Override
   public void dmlAppend(GenerateDmlRequest request) {
 
     for (ImportedIdSimple anImported : imported) {
@@ -92,6 +97,7 @@ public class ImportedIdEmbedded implements ImportedId {
     return pos;
   }
 
+  @Override
   public Object bind(BindableRequest request, EntityBean bean) throws SQLException {
 
     Object embeddedId = null;
@@ -120,6 +126,7 @@ public class ImportedIdEmbedded implements ImportedId {
     return null;
   }
 
+  @Override
   public void buildImport(IntersectionRow row, EntityBean other) {
 
     EntityBean embeddedId = (EntityBean) foreignAssocOne.getValue(other);
@@ -138,6 +145,7 @@ public class ImportedIdEmbedded implements ImportedId {
   /**
    * Not supported for embedded id.
    */
+  @Override
   public BeanProperty findMatchImport(String matchDbColumn) {
 
     for (ImportedIdSimple anImported : imported) {

src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java

@@ -27,6 +27,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
    * Helper class to sort ImportedIdSimple.
    */
   private final static class EntryComparator implements Comparator<ImportedIdSimple> {
+    @Override
     public int compare(ImportedIdSimple o1, ImportedIdSimple o2) {
       return o1.compareTo(o2);
     }
@@ -73,19 +74,23 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
     return obj == this;
   }
 
+  @Override
   public int compareTo(ImportedIdSimple other) {
     return (position < other.position ? -1 : (position == other.position ? 0 : 1));
   }
 
+  @Override
   public void addFkeys(String name) {
     BeanFkeyProperty fkey = new BeanFkeyProperty(name + "." + foreignProperty.getName(), localDbColumn, owner.getDeployOrder());
     owner.getBeanDescriptor().add(fkey);
   }
 
+  @Override
   public boolean isScalar() {
     return true;
   }
 
+  @Override
   public String getDbColumn() {
     return localDbColumn;
   }
@@ -94,6 +99,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
     return foreignProperty.getValue(bean);
   }
 
+  @Override
   public void buildImport(IntersectionRow row, EntityBean other) {
 
     Object value = getIdValue(other);
@@ -105,6 +111,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
     row.put(localDbColumn, value);
   }
 
+  @Override
   public void sqlAppend(DbSqlContext ctx) {
     if (localSqlFormula != null) {
       ctx.appendFormulaSelect(localSqlFormula);
@@ -114,6 +121,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
   }
 
 
+  @Override
   public void dmlAppend(GenerateDmlRequest request) {
     request.appendColumn(localDbColumn);
   }
@@ -130,6 +138,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
     return ++position;
   }
 
+  @Override
   public Object bind(BindableRequest request, EntityBean bean) throws SQLException {
 
     Object value = null;
@@ -140,6 +149,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
     return value;
   }
 
+  @Override
   public BeanProperty findMatchImport(String matchDbColumn) {
 
     if (matchDbColumn.equals(localDbColumn)) {

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

@@ -54,6 +54,7 @@ public class DeployBeanDescriptor<T> {
 
   private static class PropOrder implements Comparator<DeployBeanProperty> {
 
+    @Override
     public int compare(DeployBeanProperty o1, DeployBeanProperty o2) {
 
       int v2 = o1.getSortOrder();
@@ -821,6 +822,7 @@ public class DeployBeanDescriptor<T> {
   /**
    * Summary description.
    */
+  @Override
   public String toString() {
     return getFullName();
   }

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

@@ -885,6 +885,7 @@ public class DeployBeanProperty {
     this.embedded = true;
   }
 
+  @Override
   public String toString() {
     return desc.getFullName() + "." + name;
   }

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

@@ -39,6 +39,7 @@ public class DeployTableJoin {
   public DeployTableJoin() {
   }
 
+  @Override
   public String toString() {
     return type + " " + table + " " + columns;
   }

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

@@ -143,7 +143,8 @@ public class DeployTableJoinColumn {
 		return ret;
 	}
 
-	public String toString() {
+	@Override
+  public String toString() {
 		return localDbColumn + " = " + foreignDbColumn;
 	}
 

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

@@ -42,6 +42,7 @@ class AnnotationAssocManys extends AnnotationParser {
   /**
    * Parse the annotations.
    */
+  @Override
   public void parse() {
     for (DeployBeanProperty prop : descriptor.propertiesAll()) {
       if (prop instanceof DeployBeanPropertyAssocMany<?>) {

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

@@ -36,6 +36,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
   /**
    * Parse the annotation.
    */
+  @Override
   public void parse() {
 
     for (DeployBeanProperty prop : descriptor.propertiesAll()) {

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

@@ -84,6 +84,7 @@ public class AnnotationClass extends AnnotationParser {
   /**
    * Read the class level deployment annotations.
    */
+  @Override
   public void parse() {
     read(descriptor.getBeanType());
     setTableName();

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

@@ -103,6 +103,7 @@ public class AnnotationFields extends AnnotationParser {
   /**
    * Read the field level deployment annotations.
    */
+  @Override
   public void parse() {
 
     for (DeployBeanProperty prop : descriptor.propertiesAll()) {

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

@@ -38,6 +38,7 @@ public abstract class AnnotationParser extends AnnotationBase {
   /**
    * read the deployment annotations.
    */
+  @Override
   public abstract void parse();
 
   /**

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

@@ -12,6 +12,7 @@ public class AnnotationSql extends AnnotationParser {
     super(info, javaxValidationAnnotations);
   }
 
+  @Override
   public void parse() {
     Class<?> cls = descriptor.getBeanType();
     Sql sql = AnnotationBase.findAnnotation(cls,Sql.class);

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

@@ -30,6 +30,7 @@ public class DeployBeanInfo<T> {
 		this.descriptor = descriptor;
 	}
 
+	@Override
 	public String toString() {
 		return String.valueOf(descriptor);
 	}

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

@@ -250,6 +250,7 @@ public class DeployInheritInfo {
     }
   }
 
+  @Override
   public String toString() {
     return "InheritInfo[" + type.getName() + "]" + " root[" + parent.getName() + "]" + " disValue[" + discriminatorStringValue + "]";
   }

src/main/java/io/ebeaninternal/server/el/ElComparator.java

@@ -10,6 +10,7 @@ public interface ElComparator<T> extends Comparator<T> {
   /**
    * Compare given 2 beans.
    */
+  @Override
   int compare(T o1, T o2);
 
   /**

src/main/java/io/ebeaninternal/server/el/ElComparatorCompound.java

@@ -16,6 +16,7 @@ public final class ElComparatorCompound<T> implements Comparator<T>, ElComparato
     this.array = array;
   }
 
+  @Override
   public int compare(T o1, T o2) {
 
     for (ElComparator<T> anArray : array) {
@@ -28,6 +29,7 @@ public final class ElComparatorCompound<T> implements Comparator<T>, ElComparato
     return 0;
   }
 
+  @Override
   public int compareValue(Object value, T o2) {
 
     for (ElComparator<T> anArray : array) {

src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java

@@ -19,6 +19,7 @@ public final class ElComparatorProperty<T> implements Comparator<T>, ElComparato
     this.nullOrder = asc * (nullsHigh ? 1 : -1);
   }
 
+  @Override
   public int compare(T o1, T o2) {
 
     Object val1 = elGetValue.pathGet(o1);
@@ -26,6 +27,7 @@ public final class ElComparatorProperty<T> implements Comparator<T>, ElComparato
     return compareValues(val1, val2);
   }
 
+  @Override
   public int compareValue(Object value, T o2) {
 
     Object val2 = elGetValue.pathGet(o2);

src/main/java/io/ebeaninternal/server/el/ElFilter.java

@@ -41,6 +41,7 @@ public final class ElFilter<T> implements Filter<T> {
     return beanDescriptor.getElGetValue(propertyName);
   }
 
+  @Override
   public Filter<T> sort(String sortByClause) {
     this.sortByClause = sortByClause;
     return this;
@@ -56,6 +57,7 @@ public final class ElFilter<T> implements Filter<T> {
   }
 
 
+  @Override
   public Filter<T> in(String propertyName, Set<?> matchingValues) {
 
     ElPropertyValue elGetValue = getElGetValue(propertyName);
@@ -64,6 +66,7 @@ public final class ElFilter<T> implements Filter<T> {
     return this;
   }
 
+  @Override
   public Filter<T> eq(String propertyName, Object value) {
 
     value = convertValue(propertyName, value);
@@ -74,6 +77,7 @@ public final class ElFilter<T> implements Filter<T> {
   }
 
 
+  @Override
   public Filter<T> ne(String propertyName, Object value) {
 
     value = convertValue(propertyName, value);
@@ -83,6 +87,7 @@ public final class ElFilter<T> implements Filter<T> {
     return this;
   }
 
+  @Override
   public Filter<T> between(String propertyName, Object min, Object max) {
 
     ElPropertyValue elGetValue = getElGetValue(propertyName);
@@ -96,6 +101,7 @@ public final class ElFilter<T> implements Filter<T> {
   }
 
 
+  @Override
   public Filter<T> gt(String propertyName, Object value) {
 
     value = convertValue(propertyName, value);
@@ -105,6 +111,7 @@ public final class ElFilter<T> implements Filter<T> {
     return this;
   }
 
+  @Override
   public Filter<T> ge(String propertyName, Object value) {
 
     value = convertValue(propertyName, value);
@@ -114,6 +121,7 @@ public final class ElFilter<T> implements Filter<T> {
     return this;
   }
 
+  @Override
   public Filter<T> ieq(String propertyName, String value) {
 
     ElPropertyValue elGetValue = getElGetValue(propertyName);
@@ -123,6 +131,7 @@ public final class ElFilter<T> implements Filter<T> {
   }
 
 
+  @Override
   public Filter<T> isNotNull(String propertyName) {
 
     ElPropertyValue elGetValue = getElGetValue(propertyName);
@@ -132,6 +141,7 @@ public final class ElFilter<T> implements Filter<T> {
   }
 
 
+  @Override
   public Filter<T> isNull(String propertyName) {
 
     ElPropertyValue elGetValue = getElGetValue(propertyName);
@@ -141,6 +151,7 @@ public final class ElFilter<T> implements Filter<T> {
   }
 
 
+  @Override
   public Filter<T> le(String propertyName, Object value) {
 
     value = convertValue(propertyName, value);
@@ -151,6 +162,7 @@ public final class ElFilter<T> implements Filter<T> {
   }
 
 
+  @Override
   public Filter<T> lt(String propertyName, Object value) {
 
     value = convertValue(propertyName, value);
@@ -172,6 +184,7 @@ public final class ElFilter<T> implements Filter<T> {
     return this;
   }
 
+  @Override
   public Filter<T> contains(String propertyName, String value) {
 
     String quote = ".*" + Pattern.quote(value) + ".*";
@@ -181,6 +194,7 @@ public final class ElFilter<T> implements Filter<T> {
     return this;
   }
 
+  @Override
   public Filter<T> icontains(String propertyName, String value) {
 
     String quote = ".*" + Pattern.quote(value) + ".*";
@@ -191,6 +205,7 @@ public final class ElFilter<T> implements Filter<T> {
   }
 
 
+  @Override
   public Filter<T> endsWith(String propertyName, String value) {
 
     ElPropertyValue elGetValue = getElGetValue(propertyName);
@@ -198,6 +213,7 @@ public final class ElFilter<T> implements Filter<T> {
     return this;
   }
 
+  @Override
   public Filter<T> startsWith(String propertyName, String value) {
 
     ElPropertyValue elGetValue = getElGetValue(propertyName);
@@ -205,6 +221,7 @@ public final class ElFilter<T> implements Filter<T> {
     return this;
   }
 
+  @Override
   public Filter<T> iendsWith(String propertyName, String value) {
 
     ElPropertyValue elGetValue = getElGetValue(propertyName);
@@ -212,6 +229,7 @@ public final class ElFilter<T> implements Filter<T> {
     return this;
   }
 
+  @Override
   public Filter<T> istartsWith(String propertyName, String value) {
 
     ElPropertyValue elGetValue = getElGetValue(propertyName);
@@ -219,11 +237,13 @@ public final class ElFilter<T> implements Filter<T> {
     return this;
   }
 
+  @Override
   public Filter<T> maxRows(int maxRows) {
     this.maxRows = maxRows;
     return this;
   }
 
+  @Override
   public List<T> filter(List<T> list) {
 
     if (sortByClause != null) {

src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java

@@ -25,6 +25,7 @@ class ElMatchBuilder {
       this.pattern = Pattern.compile(value, options);
     }
 
+    @Override
     public boolean isMatch(T bean) {
       String v = (String) elGetValue.pathGet(bean);
       return pattern.matcher(v).matches();
@@ -44,6 +45,7 @@ class ElMatchBuilder {
       this.value = value;
     }
 
+    @Override
     public abstract boolean isMatch(T bean);
   }
 
@@ -52,6 +54,7 @@ class ElMatchBuilder {
       super(elGetValue, value);
     }
 
+    @Override
     public boolean isMatch(T bean) {
       String v = (String) elGetValue.pathGet(bean);
       return value.equalsIgnoreCase(v);
@@ -71,6 +74,7 @@ class ElMatchBuilder {
       this.charMatch = new CharMatch(value);
     }
 
+    @Override
     public boolean isMatch(T bean) {
 
       String v = (String) elGetValue.pathGet(bean);
@@ -91,6 +95,7 @@ class ElMatchBuilder {
       this.charMatch = new CharMatch(value);
     }
 
+    @Override
     public boolean isMatch(T bean) {
 
       String v = (String) elGetValue.pathGet(bean);
@@ -103,6 +108,7 @@ class ElMatchBuilder {
       super(elGetValue, value);
     }
 
+    @Override
     public boolean isMatch(T bean) {
       String v = (String) elGetValue.pathGet(bean);
       return value.startsWith(v);
@@ -114,6 +120,7 @@ class ElMatchBuilder {
       super(elGetValue, value);
     }
 
+    @Override
     public boolean isMatch(T bean) {
       String v = (String) elGetValue.pathGet(bean);
       return value.endsWith(v);
@@ -128,6 +135,7 @@ class ElMatchBuilder {
       this.elGetValue = elGetValue;
     }
 
+    @Override
     public boolean isMatch(T bean) {
       return (null == elGetValue.pathGet(bean));
     }
@@ -141,6 +149,7 @@ class ElMatchBuilder {
       this.elGetValue = elGetValue;
     }
 
+    @Override
     public boolean isMatch(T bean) {
       return (null != elGetValue.pathGet(bean));
     }
@@ -157,6 +166,7 @@ class ElMatchBuilder {
       this.comparator = comparator;
     }
 
+    @Override
     public abstract boolean isMatch(T value);
   }
 
@@ -171,6 +181,7 @@ class ElMatchBuilder {
       this.elGetValue = elGetValue;
     }
 
+    @Override
     public boolean isMatch(T bean) {
 
       Object value = elGetValue.pathGet(bean);
@@ -187,6 +198,7 @@ class ElMatchBuilder {
       super(filterValue, comparator);
     }
 
+    @Override
     public boolean isMatch(T value) {
       return comparator.compareValue(filterValue, value) == 0;
     }
@@ -201,6 +213,7 @@ class ElMatchBuilder {
       super(filterValue, comparator);
     }
 
+    @Override
     public boolean isMatch(T value) {
       return comparator.compareValue(filterValue, value) != 0;
     }
@@ -221,6 +234,7 @@ class ElMatchBuilder {
       this.comparator = comparator;
     }
 
+    @Override
     public boolean isMatch(T value) {
 
       return (comparator.compareValue(min, value) <= 0
@@ -236,6 +250,7 @@ class ElMatchBuilder {
       super(filterValue, comparator);
     }
 
+    @Override
     public boolean isMatch(T value) {
       return comparator.compareValue(filterValue, value) == -1;
     }
@@ -249,6 +264,7 @@ class ElMatchBuilder {
       super(filterValue, comparator);
     }
 
+    @Override
     public boolean isMatch(T value) {
       return comparator.compareValue(filterValue, value) >= 0;
     }
@@ -262,6 +278,7 @@ class ElMatchBuilder {
       super(filterValue, comparator);
     }
 
+    @Override
     public boolean isMatch(T value) {
       return comparator.compareValue(filterValue, value) <= 0;
     }
@@ -275,6 +292,7 @@ class ElMatchBuilder {
       super(filterValue, comparator);
     }
 
+    @Override
     public boolean isMatch(T value) {
       return comparator.compareValue(filterValue, value) == 1;
     }

src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java

@@ -79,6 +79,7 @@ public class ElPropertyChain implements ElPropertyValue {
     this.placeHolderEncrypted = getElPlaceHolder(prefix, lastElPropertyValue, true);
   }
 
+  @Override
   public String toString() {
     return "expr:" + expression + " chain:" + Arrays.toString(chain);
   }
@@ -107,6 +108,7 @@ public class ElPropertyChain implements ElPropertyValue {
    * Return true if there is a many property from sinceProperty to
    * the end of this chain.
    */
+  @Override
   public boolean containsManySince(String sinceProperty) {
     if (sinceProperty == null) {
       return containsMany;
@@ -132,30 +134,37 @@ public class ElPropertyChain implements ElPropertyValue {
     return false;
   }
 
+  @Override
   public boolean containsMany() {
     return containsMany;
   }
 
+  @Override
   public String getElPrefix() {
     return prefix;
   }
 
+  @Override
   public String getName() {
     return name;
   }
 
+  @Override
   public String getElName() {
     return expression;
   }
 
+  @Override
   public String getElPlaceholder(boolean encrypted) {
     return encrypted ? placeHolderEncrypted : placeHolder;
   }
 
+  @Override
   public boolean isDbEncrypted() {
     return lastElPropertyValue.isDbEncrypted();
   }
 
+  @Override
   public boolean isLocalEncrypted() {
     return lastElPropertyValue.isLocalEncrypted();
   }
@@ -165,20 +174,24 @@ public class ElPropertyChain implements ElPropertyValue {
     return lastElPropertyValue.getAssocIsEmpty(request, path);
   }
 
+  @Override
   public Object[] getAssocIdValues(EntityBean bean) {
     // Don't navigate the object graph as bean
     // is assumed to be the appropriate type
     return lastElPropertyValue.getAssocIdValues(bean);
   }
 
+  @Override
   public String getAssocIdExpression(String prefix, String operator) {
     return lastElPropertyValue.getAssocIdExpression(expression, operator);
   }
 
+  @Override
   public String getAssocIdInExpr(String prefix) {
     return lastElPropertyValue.getAssocIdInExpr(prefix);
   }
 
+  @Override
   public String getAssocIdInValueExpr(int size) {
     return lastElPropertyValue.getAssocIdInValueExpr(size);
   }
@@ -188,10 +201,12 @@ public class ElPropertyChain implements ElPropertyValue {
     return lastElPropertyValue.isAssocMany();
   }
 
+  @Override
   public boolean isAssocId() {
     return assocId;
   }
 
+  @Override
   public boolean isAssocProperty() {
     for (ElPropertyValue aChain : chain) {
       if (aChain.isAssocProperty()) {
@@ -201,31 +216,38 @@ public class ElPropertyChain implements ElPropertyValue {
     return false;
   }
 
+  @Override
   public String getDbColumn() {
     return lastElPropertyValue.getDbColumn();
   }
 
+  @Override
   public BeanProperty getBeanProperty() {
     return lastBeanProperty;
   }
 
 
+  @Override
   public boolean isDateTimeCapable() {
     return scalarType != null && scalarType.isDateTimeCapable();
   }
 
+  @Override
   public int getJdbcType() {
     return scalarType == null ? 0 : scalarType.getJdbcType();
   }
 
+  @Override
   public Object parseDateTime(long systemTimeMillis) {
     return scalarType.convertFromMillis(systemTimeMillis);
   }
 
+  @Override
   public StringParser getStringParser() {
     return scalarType;
   }
 
+  @Override
   public Object convert(Object value) {
     // just convert using the last one in the chain
     return lastElPropertyValue.convert(value);

src/main/java/io/ebeaninternal/server/el/ElPropertyValue.java

@@ -29,6 +29,7 @@ public interface ElPropertyValue extends ElPropertyDeploy, ExpressionPath {
   /**
    * Return true if this is an ManyToOne or OneToOne associated bean property.
    */
+  @Override
   boolean isAssocId();
 
   /**

src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java

@@ -37,6 +37,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
     this.nativeIlike = nativeIlike;
   }
 
+  @Override
   public ExpressionFactory createExpressionFactory() {
     return this;
   }
@@ -70,38 +71,47 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
     return new TextCommonTermsExpression(search, options);
   }
 
+  @Override
   public Expression jsonExists(String propertyName, String path) {
     return new JsonPathExpression(propertyName, path, Op.EXISTS, null);
   }
 
+  @Override
   public Expression jsonNotExists(String propertyName, String path) {
     return new JsonPathExpression(propertyName, path, Op.NOT_EXISTS, null);
   }
 
+  @Override
   public Expression jsonEqualTo(String propertyName, String path, Object value) {
     return new JsonPathExpression(propertyName, path, Op.EQ, value);
   }
 
+  @Override
   public Expression jsonNotEqualTo(String propertyName, String path, Object value) {
     return new JsonPathExpression(propertyName, path, Op.NOT_EQ, value);
   }
 
+  @Override
   public Expression jsonGreaterThan(String propertyName, String path, Object value) {
     return new JsonPathExpression(propertyName, path, Op.GT, value);
   }
 
+  @Override
   public Expression jsonGreaterOrEqual(String propertyName, String path, Object value) {
     return new JsonPathExpression(propertyName, path, Op.GT_EQ, value);
   }
 
+  @Override
   public Expression jsonLessThan(String propertyName, String path, Object value) {
     return new JsonPathExpression(propertyName, path, Op.LT, value);
   }
 
+  @Override
   public Expression jsonLessOrEqualTo(String propertyName, String path, Object value) {
     return new JsonPathExpression(propertyName, path, Op.LT_EQ, value);
   }
 
+  @Override
   public Expression jsonBetween(String propertyName, String path, Object lowerValue, Object upperValue) {
     return new JsonPathExpression(propertyName, path, lowerValue, upperValue);
   }
@@ -129,6 +139,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Equal To - property equal to the given value.
    */
+  @Override
   public Expression eq(String propertyName, Object value) {
     if (value == null) {
       return equalsWithNullAsNoop ? NoopExpression.INSTANCE : isNull(propertyName);
@@ -139,6 +150,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Not Equal To - property not equal to the given value.
    */
+  @Override
   public Expression ne(String propertyName, Object value) {
     if (value == null) {
       return equalsWithNullAsNoop ? NoopExpression.INSTANCE : isNotNull(propertyName);
@@ -150,6 +162,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    * Case Insensitive Equal To - property equal to the given value (typically
    * using a lower() function to make it case insensitive).
    */
+  @Override
   public Expression ieq(String propertyName, String value) {
     if (value == null) {
       return equalsWithNullAsNoop ? NoopExpression.INSTANCE : isNull(propertyName);
@@ -160,6 +173,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Create for named parameter use (and without support for equalsWithNullAsNoop).
    */
+  @Override
   public Expression ieqObject(String propertyName, Object value) {
     return new CaseInsensitiveEqualExpression(propertyName, value);
   }
@@ -167,6 +181,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Between - property between the two given values.
    */
+  @Override
   public Expression between(String propertyName, Object value1, Object value2) {
 
     return new BetweenExpression(propertyName, value1, value2);
@@ -175,6 +190,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Between - value between two given properties.
    */
+  @Override
   public Expression betweenProperties(String lowProperty, String highProperty, Object value) {
 
     return new BetweenPropertyExpression(lowProperty, highProperty, value);
@@ -183,6 +199,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Greater Than - property greater than the given value.
    */
+  @Override
   public Expression gt(String propertyName, Object value) {
 
     return new SimpleExpression(propertyName, Op.GT, value);
@@ -192,6 +209,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    * Greater Than or Equal to - property greater than or equal to the given
    * value.
    */
+  @Override
   public Expression ge(String propertyName, Object value) {
 
     return new SimpleExpression(propertyName, Op.GT_EQ, value);
@@ -200,6 +218,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Less Than - property less than the given value.
    */
+  @Override
   public Expression lt(String propertyName, Object value) {
 
     return new SimpleExpression(propertyName, Op.LT, value);
@@ -208,6 +227,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Less Than or Equal to - property less than or equal to the given value.
    */
+  @Override
   public Expression le(String propertyName, Object value) {
 
     return new SimpleExpression(propertyName, Op.LT_EQ, value);
@@ -216,6 +236,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Is Null - property is null.
    */
+  @Override
   public Expression isNull(String propertyName) {
 
     return new NullExpression(propertyName, false);
@@ -224,6 +245,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Is Not Null - property is not null.
    */
+  @Override
   public Expression isNotNull(String propertyName) {
 
     return new NullExpression(propertyName, true);
@@ -239,6 +261,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Case insensitive {@link #exampleLike(Object)}
    */
+  @Override
   public ExampleExpression iexampleLike(Object example) {
     return new DefaultExampleExpression(checkEntityBean(example), true, LikeType.RAW);
   }
@@ -247,6 +270,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    * Create the query by Example expression which is case sensitive and using
    * LikeType.RAW (you need to add you own wildcards % and _).
    */
+  @Override
   public ExampleExpression exampleLike(Object example) {
     return new DefaultExampleExpression(checkEntityBean(example), false, LikeType.RAW);
   }
@@ -254,6 +278,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Create the query by Example expression specifying more options.
    */
+  @Override
   public ExampleExpression exampleLike(Object example, boolean caseInsensitive, LikeType likeType) {
     return new DefaultExampleExpression(checkEntityBean(example), caseInsensitive, likeType);
   }
@@ -267,6 +292,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    * Like - property like value where the value contains the SQL wild card
    * characters % (percentage) and _ (underscore).
    */
+  @Override
   public Expression like(String propertyName, String value) {
     return new LikeExpression(propertyName, value, false, LikeType.RAW);
   }
@@ -276,6 +302,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    * SQL wild card characters % (percentage) and _ (underscore). Typically uses
    * a lower() function to make the expression case insensitive.
    */
+  @Override
   public Expression ilike(String propertyName, String value) {
     if (nativeIlike) {
       return new NativeILikeExpression(propertyName, value);
@@ -287,6 +314,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Starts With - property like value%.
    */
+  @Override
   public Expression startsWith(String propertyName, String value) {
     return new LikeExpression(propertyName, value, false, LikeType.STARTS_WITH);
   }
@@ -295,6 +323,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    * Case insensitive Starts With - property like value%. Typically uses a
    * lower() function to make the expression case insensitive.
    */
+  @Override
   public Expression istartsWith(String propertyName, String value) {
     return new LikeExpression(propertyName, value, true, LikeType.STARTS_WITH);
   }
@@ -302,6 +331,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Ends With - property like %value.
    */
+  @Override
   public Expression endsWith(String propertyName, String value) {
     return new LikeExpression(propertyName, value, false, LikeType.ENDS_WITH);
   }
@@ -310,6 +340,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    * Case insensitive Ends With - property like %value. Typically uses a lower()
    * function to make the expression case insensitive.
    */
+  @Override
   public Expression iendsWith(String propertyName, String value) {
     return new LikeExpression(propertyName, value, true, LikeType.ENDS_WITH);
   }
@@ -317,6 +348,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Contains - property like %value%.
    */
+  @Override
   public Expression contains(String propertyName, String value) {
     return new LikeExpression(propertyName, value, false, LikeType.CONTAINS);
   }
@@ -325,6 +357,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    * Case insensitive Contains - property like %value%. Typically uses a lower()
    * function to make the expression case insensitive.
    */
+  @Override
   public Expression icontains(String propertyName, String value) {
     return new LikeExpression(propertyName, value, true, LikeType.CONTAINS);
   }
@@ -332,6 +365,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * In - property has a value in the array of values.
    */
+  @Override
   public Expression in(String propertyName, Object[] values) {
     return new InExpression(propertyName, values, false);
   }
@@ -339,6 +373,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * In - using a subQuery.
    */
+  @Override
   public Expression in(String propertyName, Query<?> subQuery) {
     return new InQueryExpression(propertyName, (SpiQuery<?>) subQuery, false);
   }
@@ -346,6 +381,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * In - property has a value in the collection of values.
    */
+  @Override
   public Expression in(String propertyName, Collection<?> values) {
     return new InExpression(propertyName, values, false);
   }
@@ -353,6 +389,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * In - property has a value in the array of values.
    */
+  @Override
   public Expression notIn(String propertyName, Object[] values) {
     return new InExpression(propertyName, values, true);
   }
@@ -360,6 +397,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Not In - property has a value in the collection of values.
    */
+  @Override
   public Expression notIn(String propertyName, Collection<?> values) {
     return new InExpression(propertyName, values, true);
   }
@@ -367,6 +405,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * In - using a subQuery.
    */
+  @Override
   public Expression notIn(String propertyName, Query<?> subQuery) {
     return new InQueryExpression(propertyName, (SpiQuery<?>) subQuery, true);
   }
@@ -400,6 +439,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Id Equal to - ID property is equal to the value.
    */
+  @Override
   public Expression idEq(Object value) {
     if (value == null) {
       throw new NullPointerException("The id value is null");
@@ -410,6 +450,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Id IN a list of id values.
    */
+  @Override
   public Expression idIn(List<?> idList) {
     return new IdInExpression(idList);
   }
@@ -417,6 +458,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Id IN a list of id values.
    */
+  @Override
   public Expression idIn(Object... idValues) {
     return new IdInExpression(Arrays.asList(idValues));
   }
@@ -430,6 +472,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    *
    * @param propertyMap a map keyed by property names.
    */
+  @Override
   public Expression allEq(Map<String, Object> propertyMap) {
     return new AllEqualsExpression(propertyMap);
   }
@@ -441,6 +484,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    * parameter.
    * </p>
    */
+  @Override
   public Expression raw(String raw, Object value) {
     return new RawExpression(raw, new Object[]{value});
   }
@@ -452,6 +496,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    * parameters.
    * </p>
    */
+  @Override
   public Expression raw(String raw, Object[] values) {
     return new RawExpression(raw, values);
   }
@@ -459,6 +504,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Add raw expression with no parameters.
    */
+  @Override
   public Expression raw(String raw) {
     return new RawExpression(raw, EMPTY_ARRAY);
   }
@@ -466,6 +512,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * And - join two expressions with a logical and.
    */
+  @Override
   public Expression and(Expression expOne, Expression expTwo) {
 
     return new LogicExpression.And(expOne, expTwo);
@@ -474,6 +521,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Or - join two expressions with a logical or.
    */
+  @Override
   public Expression or(Expression expOne, Expression expTwo) {
 
     return new LogicExpression.Or(expOne, expTwo);
@@ -482,6 +530,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Negate the expression (prefix it with NOT).
    */
+  @Override
   public Expression not(Expression exp) {
 
     return new NotExpression(exp);
@@ -490,6 +539,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Return a list of expressions that will be joined by AND's.
    */
+  @Override
   public <T> Junction<T> conjunction(Query<T> query) {
     return new JunctionExpression<>(Junction.Type.AND, query, query.where());
   }
@@ -497,6 +547,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Return a list of expressions that will be joined by OR's.
    */
+  @Override
   public <T> Junction<T> disjunction(Query<T> query) {
     return new JunctionExpression<>(Junction.Type.OR, query, query.where());
   }
@@ -504,6 +555,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Return a list of expressions that will be joined by AND's.
    */
+  @Override
   public <T> Junction<T> conjunction(Query<T> query, ExpressionList<T> parent) {
     return new JunctionExpression<>(Junction.Type.AND, query, parent);
   }
@@ -511,6 +563,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
   /**
    * Return a list of expressions that will be joined by OR's.
    */
+  @Override
   public <T> Junction<T> disjunction(Query<T> query, ExpressionList<T> parent) {
     return new JunctionExpression<>(Junction.Type.OR, query, parent);
   }

src/main/java/io/ebeaninternal/server/idgen/UuidIdGenerator.java

@@ -15,6 +15,7 @@ public class UuidIdGenerator implements PlatformIdGenerator {
   /**
    * Return UUID from UUID.randomUUID();
    */
+  @Override
   public Object nextId(Transaction t) {
     return UUID.randomUUID();
   }
@@ -22,6 +23,7 @@ public class UuidIdGenerator implements PlatformIdGenerator {
   /**
    * Returns "uuid".
    */
+  @Override
   public String getName() {
     return "uuid";
   }
@@ -29,6 +31,7 @@ public class UuidIdGenerator implements PlatformIdGenerator {
   /**
    * Returns false.
    */
+  @Override
   public boolean isDbSequence() {
     return false;
   }
@@ -36,6 +39,7 @@ public class UuidIdGenerator implements PlatformIdGenerator {
   /**
    * Ignored for UUID as not required as a performance optimisation.
    */
+  @Override
   public void preAllocateIds(int allocateSize) {
     // ignored
   }

src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java

@@ -36,6 +36,7 @@ public final class DaemonScheduleThreadPool extends ScheduledThreadPoolExecutor
    * working.
    * </p>
    */
+  @Override
   public void shutdown() {
     synchronized (this) {
       if (super.isShutdown()) {

src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java

@@ -34,6 +34,7 @@ public class DaemonThreadFactory implements ThreadFactory {
     this.namePrefix = namePrefix != null ? namePrefix : "pool-" + poolNumber.getAndIncrement() + "-thread-";
   }
 
+  @Override
   public Thread newThread(Runnable r) {
 
     Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement(), 0);

src/main/java/io/ebeaninternal/server/lib/ShutdownHook.java

@@ -14,6 +14,7 @@ class ShutdownHook extends Thread {
   /**
    * Fired by the JVM Runtime on shutdown.
    */
+  @Override
   public void run() {
     ShutdownManager.shutdown();
   }

src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java

@@ -68,6 +68,7 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex
     return buffer;
   }
 
+  @Override
   public void loadSecondaryQuery(OrmQueryRequest<?> parentRequest, boolean forEach) {
 
     if (!queryFetch) {
@@ -112,6 +113,7 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex
       this.list = new ArrayList<>(batchSize);
     }
 
+    @Override
     public int getBatchSize() {
       return batchSize;
     }

src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java

@@ -165,6 +165,7 @@ public class DLoadContext implements LoadContext {
   /**
    * Return the minimum batch size when using QueryIterator with query joins.
    */
+  @Override
   public int getSecondaryQueriesMinBatchSize(int defaultQueryBatch) {
 
     if (secQuery == null) {
@@ -185,6 +186,7 @@ public class DLoadContext implements LoadContext {
   /**
    * Execute all the secondary queries.
    */
+  @Override
   public void executeSecondaryQueries(OrmQueryRequest<?> parentRequest, boolean forEach) {
 
     if (secQuery != null) {
@@ -206,6 +208,7 @@ public class DLoadContext implements LoadContext {
     return beanLoad;
   }
 
+  @Override
   public ObjectGraphNode getObjectGraphNode(String path) {
 
     ObjectGraphNode node = nodePathMap.get(path);
@@ -249,10 +252,12 @@ public class DLoadContext implements LoadContext {
     return readOnly;
   }
 
+  @Override
   public PersistenceContext getPersistenceContext() {
     return persistenceContext;
   }
 
+  @Override
   public void resetPersistenceContext(PersistenceContext persistenceContext) {
     this.persistenceContext = persistenceContext;
     // clear the load contexts for beans and beanCollections
@@ -265,10 +270,12 @@ public class DLoadContext implements LoadContext {
     this.rootBeanContext.clear();
   }
 
+  @Override
   public void register(String path, EntityBeanIntercept ebi) {
     getBeanContext(path).register(ebi);
   }
 
+  @Override
   public void register(String path, BeanCollection<?> bc) {
     getManyContext(path).register(bc);
   }

src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java

@@ -88,6 +88,7 @@ public class DLoadManyContext extends DLoadBaseContext implements LoadManyContex
     bc.setLoader(currentBuffer);
   }
 
+  @Override
   public void loadSecondaryQuery(OrmQueryRequest<?> parentRequest, boolean forEach) {
 
     if (!queryFetch) {
@@ -141,6 +142,7 @@ public class DLoadManyContext extends DLoadBaseContext implements LoadManyContex
       return context.parent.useDocStore && context.docStoreMapped;
     }
 
+    @Override
     public int getBatchSize() {
       return batchSize;
     }
@@ -199,6 +201,7 @@ public class DLoadManyContext extends DLoadBaseContext implements LoadManyContex
       return context.fullPath;
     }
 
+    @Override
     public void loadMany(BeanCollection<?> bc, boolean onlyIds) {
 
       synchronized (this) {

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

@@ -16,6 +16,7 @@ public class BatchDepthComparator implements Comparator<BatchedBeanHolder>, Seri
 
   private static final long serialVersionUID = 264611821665757991L;
 
+  @Override
   public int compare(BatchedBeanHolder b1, BatchedBeanHolder b2) {
 
     if (b1.getOrder() < b2.getOrder()) {

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

@@ -99,6 +99,7 @@ public class BatchedBeanHolder {
     persistedBeans.clear();
   }
 
+  @Override
   public String toString() {
     StringBuilder sb = new StringBuilder(shortDesc.length() + 18);
     sb.append(shortDesc);

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

@@ -80,6 +80,7 @@ public class BindValues {
       return name;
     }
 
+    @Override
     public String toString() {
       return String.valueOf(value);
     }

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

@@ -35,6 +35,7 @@ final class DefaultPersistExecute implements PersistExecute {
     this.defaultBatchSize = defaultBatchSize;
   }
 
+  @Override
   public BatchControl createBatchControl(SpiTransaction t) {
 
     // create a BatchControl and set its defaults
@@ -44,6 +45,7 @@ final class DefaultPersistExecute implements PersistExecute {
   /**
    * Execute the updateSqlRequest
    */
+  @Override
   public int executeOrmUpdate(PersistRequestOrmUpdate request) {
     return exeOrmUpdate.execute(request);
   }
@@ -51,6 +53,7 @@ final class DefaultPersistExecute implements PersistExecute {
   /**
    * Execute the updateSqlRequest
    */
+  @Override
   public int executeSqlUpdate(PersistRequestUpdateSql request) {
     return exeUpdateSql.execute(request);
   }
@@ -58,6 +61,7 @@ final class DefaultPersistExecute implements PersistExecute {
   /**
    * Execute the CallableSqlRequest.
    */
+  @Override
   public int executeSqlCallable(PersistRequestCallableSql request) {
     return exeCallableSql.execute(request);
   }

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

@@ -84,6 +84,7 @@ public final class DefaultPersister implements Persister {
   /**
    * Execute the CallableSql.
    */
+  @Override
   public int executeCallable(CallableSql callSql, Transaction t) {
 
     return executeOrQueue(new PersistRequestCallableSql(server, callSql, (SpiTransaction) t, persistExecute));
@@ -92,6 +93,7 @@ public final class DefaultPersister implements Persister {
   /**
    * Execute the orm update.
    */
+  @Override
   public int executeOrmUpdate(Update<?> update, Transaction t) {
 
     SpiUpdate<?> ormUpdate = (SpiUpdate<?>) update;
@@ -122,6 +124,7 @@ public final class DefaultPersister implements Persister {
   /**
    * Execute the updateSql.
    */
+  @Override
   public int executeSqlUpdate(SqlUpdate updSql, Transaction t) {
 
     return executeOrQueue(new PersistRequestUpdateSql(server, updSql, (SpiTransaction) t, persistExecute));
@@ -343,6 +346,7 @@ public final class DefaultPersister implements Persister {
   /**
    * Update the bean.
    */
+  @Override
   public void update(EntityBean entityBean, Transaction t) {
     update(entityBean, t, updatesDeleteMissingChildren);
   }
@@ -350,6 +354,7 @@ public final class DefaultPersister implements Persister {
   /**
    * Update the bean specifying deleteMissingChildren.
    */
+  @Override
   public void update(EntityBean entityBean, Transaction t, boolean deleteMissingChildren) {
 
     PersistRequestBean<?> req = createRequest(entityBean, t, PersistRequest.Type.UPDATE);
@@ -379,6 +384,7 @@ public final class DefaultPersister implements Persister {
   /**
    * Insert or update the bean.
    */
+  @Override
   public void save(EntityBean bean, Transaction t) {
     if (bean._ebean_getIntercept().isLoaded()) {
       // deleteMissingChildren is false when using 'save' on 'loaded' beans
@@ -391,6 +397,7 @@ public final class DefaultPersister implements Persister {
   /**
    * Insert this bean.
    */
+  @Override
   public void insert(EntityBean bean, Transaction t) {
 
     PersistRequestBean<?> req = createRequest(bean, t, PersistRequest.Type.INSERT);
@@ -499,6 +506,7 @@ public final class DefaultPersister implements Persister {
    * Delete the bean with the explicit transaction.
    * Return false if the delete is executed without OCC and 0 rows were deleted.
    */
+  @Override
   public boolean delete(EntityBean bean, Transaction t, boolean permanent) {
 
     Type deleteType = permanent ? Type.DELETE_PERMANENT : Type.DELETE;
@@ -565,6 +573,7 @@ public final class DefaultPersister implements Persister {
   /**
    * Delete by a List of Id's.
    */
+  @Override
   public int deleteMany(Class<?> beanType, Collection<?> ids, Transaction transaction, boolean permanent) {
 
     if (ids == null || ids.isEmpty()) {
@@ -586,6 +595,7 @@ public final class DefaultPersister implements Persister {
   /**
    * Delete by Id.
    */
+  @Override
   public int delete(Class<?> beanType, Object id, Transaction transaction, boolean permanent) {
     BeanDescriptor<?> descriptor = beanDescriptorManager.getBeanDescriptor(beanType);
     id = descriptor.convertId(id);

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

@@ -35,6 +35,7 @@ public final class DmlBeanPersister implements BeanPersister {
   /**
    * execute the bean delete request.
    */
+  @Override
   public int delete(PersistRequestBean<?> request) {
 
     DeleteHandler delete = new DeleteHandler(request, deleteMeta);
@@ -44,6 +45,7 @@ public final class DmlBeanPersister implements BeanPersister {
   /**
    * execute the bean insert request.
    */
+  @Override
   public void insert(PersistRequestBean<?> request) {
 
     InsertHandler insert = new InsertHandler(request, insertMeta);
@@ -53,6 +55,7 @@ public final class DmlBeanPersister implements BeanPersister {
   /**
    * execute the bean update request.
    */
+  @Override
   public void update(PersistRequestBean<?> request) {
 
     UpdateHandler update = new UpdateHandler(request, updateMeta);