diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java index e8d252ec0..aad3eb6d9 100644 --- a/src/main/java/io/ebean/EbeanServer.java +++ b/src/main/java/io/ebean/EbeanServer.java @@ -11,17 +11,13 @@ import io.ebean.text.json.JsonContext; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import javax.persistence.NonUniqueResultException; import javax.persistence.OptimisticLockException; import javax.persistence.PersistenceException; import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.Set; import java.util.concurrent.Callable; -import java.util.function.Consumer; -import java.util.function.Predicate; /** * Provides the API for fetching and saving beans to a particular DataSource. diff --git a/src/main/java/io/ebean/MergeOptionsBuilder.java b/src/main/java/io/ebean/MergeOptionsBuilder.java index 7193c681c..98173ed8d 100644 --- a/src/main/java/io/ebean/MergeOptionsBuilder.java +++ b/src/main/java/io/ebean/MergeOptionsBuilder.java @@ -78,6 +78,7 @@ public class MergeOptionsBuilder { this.deletePermanent = deletePermanent; } + @Override public Set paths() { return paths; } diff --git a/src/main/java/io/ebean/Model.java b/src/main/java/io/ebean/Model.java index b17d03ac3..f00409aa6 100644 --- a/src/main/java/io/ebean/Model.java +++ b/src/main/java/io/ebean/Model.java @@ -2,7 +2,6 @@ package io.ebean; import io.ebean.bean.EntityBean; -import javax.persistence.MappedSuperclass; /** * A MappedSuperclass base class that provides convenience methods for inserting, updating and diff --git a/src/main/java/io/ebean/config/BeanNotEnhancedException.java b/src/main/java/io/ebean/config/BeanNotEnhancedException.java index 67ff285da..21e1a5b1a 100644 --- a/src/main/java/io/ebean/config/BeanNotEnhancedException.java +++ b/src/main/java/io/ebean/config/BeanNotEnhancedException.java @@ -7,6 +7,8 @@ package io.ebean.config; */ public class BeanNotEnhancedException extends IllegalStateException { + private static final long serialVersionUID = 3008101919425876799L; + public BeanNotEnhancedException(String msg) { super(msg); } diff --git a/src/main/java/io/ebean/config/BeanNotRegisteredException.java b/src/main/java/io/ebean/config/BeanNotRegisteredException.java index 29212c24b..840482d59 100644 --- a/src/main/java/io/ebean/config/BeanNotRegisteredException.java +++ b/src/main/java/io/ebean/config/BeanNotRegisteredException.java @@ -7,6 +7,8 @@ package io.ebean.config; */ public class BeanNotRegisteredException extends IllegalStateException { + private static final long serialVersionUID = -1411298126011136552L; + public BeanNotRegisteredException(String msg) { super(msg); } diff --git a/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java b/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java index c7d3e4f88..3ba088c58 100644 --- a/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java +++ b/src/main/java/io/ebeaninternal/api/SpiDtoQuery.java @@ -37,6 +37,7 @@ public interface SpiDtoQuery extends DtoQuery, SpiSqlBinding { /** * Return the label for the query. */ + @Override String getLabel(); /** diff --git a/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/src/main/java/io/ebeaninternal/api/SpiTransaction.java index e362e1e9e..fc89b85f3 100644 --- a/src/main/java/io/ebeaninternal/api/SpiTransaction.java +++ b/src/main/java/io/ebeaninternal/api/SpiTransaction.java @@ -7,7 +7,6 @@ import io.ebean.bean.PersistenceContext; import io.ebean.event.changelog.BeanChange; import io.ebean.event.changelog.ChangeSet; import io.ebeaninternal.server.core.PersistDeferredRelationship; -import io.ebeaninternal.server.core.PersistRequest; import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.persist.BatchControl; import io.ebeaninternal.server.transaction.ProfileStream; diff --git a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java index c84f7bc2e..1aab60ad7 100644 --- a/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java +++ b/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java @@ -8,7 +8,6 @@ import io.ebean.bean.PersistenceContext; import io.ebean.event.changelog.BeanChange; import io.ebean.event.changelog.ChangeSet; import io.ebeaninternal.server.core.PersistDeferredRelationship; -import io.ebeaninternal.server.core.PersistRequest; import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.persist.BatchControl; import io.ebeaninternal.server.transaction.ProfileStream; diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java index 2a46f83a0..859c73399 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java +++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java @@ -909,7 +909,7 @@ public class BaseTableDdl implements TableDdl { if (hasValue(ddl)) { writer.apply().append(ddl).endOfStatement(); - if (isTrue(alter.isWithHistory()) && alter.getType() != null && historySupport == historySupport.TRIGGER_BASED) { + if (isTrue(alter.isWithHistory()) && alter.getType() != null && historySupport == HistorySupport.TRIGGER_BASED) { // mysql and sql server column type change allowing nulls in the history table column regenerateHistoryTriggers(alter.getTableName(), HistoryTableUpdate.Change.ALTER, alter.getColumnName()); AlterColumn alterHistoryColumn = new AlterColumn(); diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java index 3e3c5fa1a..2a6b0a8b3 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java +++ b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java @@ -1,6 +1,5 @@ package io.ebeaninternal.dbmigration.model; -import io.ebean.annotation.PartitionMode; import io.ebeaninternal.dbmigration.ddlgeneration.platform.DdlHelp; import io.ebeaninternal.dbmigration.ddlgeneration.platform.SplitColumns; import io.ebeaninternal.dbmigration.migration.AddColumn; diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java index 85f4b22ca..afbdb37f7 100644 --- a/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java +++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerQueryCache.java @@ -19,6 +19,7 @@ public class DefaultServerQueryCache extends DefaultServerCache { this.queryCacheEntryValidate = config.getQueryCacheEntryValidate(); } + @Override protected Object unwrapEntry(CacheEntry entry) { return ((QueryCacheEntry) entry.getValue()).getValue(); } diff --git a/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java b/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java index bffc93a10..2e5df2d3f 100644 --- a/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java +++ b/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java @@ -59,6 +59,7 @@ public class ClusterManager implements ServerLookup { } } + @Override public EbeanServer getServer(String name) { synchronized (monitor) { return serverMap.get(name); diff --git a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java index d827d5dcf..e0980c537 100644 --- a/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java @@ -11,7 +11,6 @@ import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.server.lib.util.Str; import io.ebeaninternal.server.persist.Binder; import io.ebeaninternal.server.persist.TrimLogSql; -import io.ebeaninternal.server.transaction.TransactionManager; import io.ebeaninternal.server.util.BindParamsParser; import java.sql.Connection; diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java index 4ea9a06b0..9af2f2af4 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java @@ -239,6 +239,7 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate { return this; } + @Override public SqlUpdate setNextParameter(Object value) { setParameter(++addPos, value); return this; diff --git a/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java index 576d9a12b..60ce3510b 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java @@ -42,6 +42,7 @@ abstract class BaseCollectionHelp implements BeanCollectionHelp { } } + @SuppressWarnings("rawtypes") @Override public Collection underlying(Object value) { if (value instanceof BeanCollection) { diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java index 308284040..9fda096aa 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelp.java @@ -39,6 +39,7 @@ public interface BeanCollectionHelp extends CQueryCollectionAdd { /** * Create an empty collection of the correct type without a parent bean. */ + @Override BeanCollection createEmptyNoParent(); /** @@ -49,6 +50,7 @@ public interface BeanCollectionHelp extends CQueryCollectionAdd { /** * Add a bean to the List Set or Map. */ + @Override void add(BeanCollection collection, EntityBean bean, boolean withCheck); /** diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index 2ca824f98..60f0ab854 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -1834,6 +1834,7 @@ public class BeanDescriptor implements BeanType, STreeType { /** * Return the IdBinder which is helpful for handling the various types of Id. */ + @Override public IdBinder getIdBinder() { return idBinder; } @@ -1942,6 +1943,7 @@ public class BeanDescriptor implements BeanType, STreeType { /** * Creates a new entity bean without invoking {@link BeanPostConstructListener#postCreate(Object)} */ + @Override public EntityBean createEntityBean() { return createEntityBean(false); } @@ -2212,6 +2214,7 @@ public class BeanDescriptor implements BeanType, STreeType { /** * Put the bean into the persistence context if it is absent. */ + @Override public Object contextPutIfAbsent(PersistenceContext pc, Object id, EntityBean localBean) { return pc.putIfAbsent(rootBeanType, id, localBean); } @@ -2638,6 +2641,7 @@ public class BeanDescriptor implements BeanType, STreeType { return autoTunable; } + @Override public boolean isElementType() { return false; } @@ -2646,6 +2650,7 @@ public class BeanDescriptor implements BeanType, STreeType { * Returns the Inheritance mapping information. This will be null if this type * of bean is not involved in any ORM inheritance mapping. */ + @Override public InheritInfo getInheritInfo() { return inheritInfo; } @@ -2814,6 +2819,7 @@ public class BeanDescriptor implements BeanType, STreeType { /** * Returns true if this bean is based on RawSql. */ + @Override public boolean isRawSqlBased() { return EntityType.SQL == entityType; } @@ -2868,6 +2874,7 @@ public class BeanDescriptor implements BeanType, STreeType { /** * Return the base table to use given the query temporal mode. */ + @Override public String getBaseTable(SpiQuery.TemporalMode mode) { switch (mode) { case DRAFT: @@ -2895,6 +2902,7 @@ public class BeanDescriptor implements BeanType, STreeType { return readAuditing; } + @Override public boolean isSoftDelete() { return softDelete; } @@ -2907,6 +2915,7 @@ public class BeanDescriptor implements BeanType, STreeType { return softDeleteProperty.getSoftDeleteDbSet(); } + @Override public String getSoftDeletePredicate(String tableAlias) { return softDeleteProperty.getSoftDeleteDbPredicate(tableAlias); } @@ -2979,6 +2988,7 @@ public class BeanDescriptor implements BeanType, STreeType { * Set the draft to true for this entity bean instance. * This bean is being loaded via asDraft() query. */ + @Override public void setDraft(EntityBean entityBean) { if (draft != null) { draft.setValue(entityBean, true); @@ -3032,6 +3042,7 @@ public class BeanDescriptor implements BeanType, STreeType { /** * Return true if this entity bean has history support. */ + @Override public boolean isHistorySupport() { return historySupport; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java index 6d24e4569..44328c081 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java @@ -46,6 +46,7 @@ class BeanDescriptorElementEmbedded extends BeanDescriptorElement { return (EntityBean)prototype._ebean_newInstance(); } + @Override public void bindElementValue(SqlUpdate insert, Object value) { targetDescriptor.bindElementValue(insert, value); } diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java index 236d664d3..715bde03b 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementScalar.java @@ -24,6 +24,7 @@ class BeanDescriptorElementScalar extends BeanDescriptorElement { this.scalarType = firstBaseScalarType(); } + @Override public void bindElementValue(SqlUpdate insert, Object value) { insert.setNextParameter(value); } diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index b836faeba..0abaf7a06 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -1014,7 +1014,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap { * into the order_id column on the order_lines table). *

*/ - @SuppressWarnings({"unchecked", "rawtypes"}) private void makeUnidirectional(DeployBeanPropertyAssocMany oneToMany) { DeployBeanDescriptor targetDesc = getTargetDescriptor(oneToMany); diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java index 016a760e4..d4f4cd4a5 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java @@ -3,7 +3,6 @@ package io.ebeaninternal.server.deploy; import io.ebean.config.BeanNotRegisteredException; import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; -import javax.persistence.PersistenceException; import java.util.Map; /** diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java index be940861b..f24d71346 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java @@ -292,6 +292,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree * Return an extra clause to add to the query for loading or joining * to this bean type. */ + @Override public String getExtraWhere() { return extraWhere; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index fa7eca5ef..bfba8ed9d 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -255,6 +255,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST /** * Add the bean to the appropriate collection on the parent bean. */ + @Override public void addBeanToCollectionWithCreate(EntityBean parentBean, EntityBean detailBean, boolean withCheck) { BeanCollection bc = (BeanCollection) super.getValue(parentBean); if (bc == null) { @@ -538,6 +539,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST /** * Return true if this is many to many. */ + @Override public boolean hasJoinTable() { return manyToMany || o2mJoinTable; } @@ -563,6 +565,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST /** * ManyToMany only, join from local table to intersection table. */ + @Override public TableJoin getIntersectionTableJoin() { return intersectionJoin; } @@ -606,6 +609,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST return mapKey; } + @Override public BeanCollection createReferenceIfNull(EntityBean parentBean) { Object v = getValue(parentBean); @@ -638,6 +642,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST return descriptor.getId(parentBean); } + @Override public void addSelectExported(DbSqlContext ctx, String tableAlias) { String alias = hasJoinTable() ? "int_" : tableAlias; diff --git a/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java b/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java index 3724cac99..53b1e69b1 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java +++ b/src/main/java/io/ebeaninternal/server/deploy/ElementEntityBean.java @@ -5,6 +5,8 @@ import io.ebean.bean.EntityBeanIntercept; class ElementEntityBean implements EntityBean { + private static final long serialVersionUID = 8742536671024715601L; + private final String[] properties; private Object[] data; diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java index 76211069b..746a1f0a7 100644 --- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java +++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java @@ -517,6 +517,7 @@ public class DefaultExpressionList implements SpiExpressionList { return query.setUseQueryCache(useCache); } + @Override public Query setCountDistinct(CountDistinctOrder orderBy) { return query.setCountDistinct(orderBy); } diff --git a/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java b/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java index b48d2d2cf..39698726a 100644 --- a/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java +++ b/src/main/java/io/ebeaninternal/server/persist/ExeCallableSql.java @@ -7,7 +7,6 @@ import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.server.core.PersistRequestCallableSql; import io.ebeaninternal.server.util.BindParamsParser; -import javax.persistence.PersistenceException; import java.sql.CallableStatement; import java.sql.SQLException; diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java index 043b735cc..4516cefd4 100644 --- a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java +++ b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocManyToMany.java @@ -24,6 +24,7 @@ class MergeNodeAssocManyToMany extends MergeNode { this.many = property; } + @Override public void merge(MergeRequest request) { EntityBean parentBean = request.getBean(); diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java index b33c393c5..90f44e07f 100644 --- a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java +++ b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOne.java @@ -17,6 +17,7 @@ class MergeNodeAssocOne extends MergeNode { this.one = property; } + @Override public void merge(MergeRequest request) { EntityBean entityBean = getEntityBean(request.getBean()); diff --git a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java index 4c894cd0f..a75ea26fb 100644 --- a/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java +++ b/src/main/java/io/ebeaninternal/server/persist/MergeNodeAssocOneToMany.java @@ -4,7 +4,6 @@ import io.ebean.bean.EntityBean; import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import java.util.Collection; -import java.util.HashMap; import java.util.Map; /** @@ -19,6 +18,7 @@ class MergeNodeAssocOneToMany extends MergeNode { this.many = property; } + @Override public void merge(MergeRequest request) { Collection beans = many.getRawCollection(request.getBean()); diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java index d72a2f688..74c42a1d5 100644 --- a/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java +++ b/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java @@ -15,9 +15,7 @@ import io.ebeaninternal.server.persist.Binder; import javax.persistence.PersistenceException; import java.sql.SQLException; -import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; /** diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java index ec8f6aa47..edeff9fce 100644 --- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java @@ -7,7 +7,6 @@ import io.ebeaninternal.server.deploy.DbSqlContext; import java.sql.SQLException; import java.util.List; -import java.util.Set; final class SqlTreeNodeManyRoot extends SqlTreeNodeBean { diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java index 3c7049fe2..1f97fdb12 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultDtoQuery.java @@ -139,6 +139,7 @@ public class DefaultDtoQuery implements SpiDtoQuery { return descriptor.getType(); } + @Override public SpiQuery getOrmQuery() { return ormQuery; } diff --git a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java index 0bcbcb381..8274af4bb 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java +++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java @@ -3,7 +3,6 @@ package io.ebeaninternal.server.transaction; import io.ebeaninternal.server.core.PersistRequest; import io.ebeaninternal.server.deploy.BeanDescriptor; -import java.io.Serializable; import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java index 8bca03fc9..619574cd4 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java @@ -12,7 +12,6 @@ import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.api.TransactionEvent; import io.ebeaninternal.api.TxnProfileEventCodes; import io.ebeaninternal.server.core.PersistDeferredRelationship; -import io.ebeaninternal.server.core.PersistRequest; import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.persist.BatchControl; import io.ebeanservice.docstore.api.DocStoreTransaction; diff --git a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java index 31bf1ca30..0f331d9ab 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java @@ -11,7 +11,6 @@ import io.ebeaninternal.api.SpiProfileTransactionEvent; import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.api.TransactionEvent; import io.ebeaninternal.server.core.PersistDeferredRelationship; -import io.ebeaninternal.server.core.PersistRequest; import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.persist.BatchControl; import io.ebeanservice.docstore.api.DocStoreTransaction; diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java index 7d5279990..b8ecef82e 100644 --- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java +++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java @@ -17,7 +17,6 @@ import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; public class PlatformDdl_AlterColumnTest { @@ -67,7 +66,7 @@ public class PlatformDdl_AlterColumnTest { assertThat(pgDdl.convertArrayType("varchar[]")).isEqualTo("varchar[]"); assertThat(pgDdl.convertArrayType("integer[]")).isEqualTo("integer[]"); } - + @Test public void convertArrayType_hana() { assertThat(hanaDdl.convertArrayType("varchar[](90)")).isEqualTo("nvarchar(255) array(90)"); @@ -89,14 +88,14 @@ public class PlatformDdl_AlterColumnTest { sql = sqlServerDdl.alterColumnBaseAttributes(alterColumn); assertEquals("alter table mytab alter column acol nvarchar(5) not null", sql); - + sql = hanaDdl.alterColumnBaseAttributes(alterColumn); assertEquals("alter table mytab alter ( acol nvarchar(5) not null)", sql); alterColumn.setNotnull(Boolean.FALSE); sql = mysqlDdl.alterColumnBaseAttributes(alterColumn); assertEquals("alter table mytab modify acol varchar(5)", sql); - + sql = hanaDdl.alterColumnBaseAttributes(alterColumn); assertEquals("alter table mytab alter ( acol nvarchar(5))", sql); @@ -105,14 +104,14 @@ public class PlatformDdl_AlterColumnTest { sql = mysqlDdl.alterColumnBaseAttributes(alterColumn); assertEquals("alter table mytab modify acol varchar(100)", sql); - + sql = hanaDdl.alterColumnBaseAttributes(alterColumn); assertEquals("alter table mytab alter ( acol nvarchar(100))", sql); alterColumn.setCurrentNotnull(Boolean.TRUE); sql = mysqlDdl.alterColumnBaseAttributes(alterColumn); assertEquals("alter table mytab modify acol varchar(100) not null", sql); - + sql = hanaDdl.alterColumnBaseAttributes(alterColumn); assertEquals("alter table mytab alter ( acol nvarchar(100) not null)", sql); } @@ -134,7 +133,7 @@ public class PlatformDdl_AlterColumnTest { sql = sqlServerDdl.alterColumnType("mytab", "acol", "varchar(20)"); assertNull(sql); - + sql = hanaDdl.alterColumnType("mytab", "acol", "varchar(20)"); assertNull(sql); } @@ -156,7 +155,7 @@ public class PlatformDdl_AlterColumnTest { sql = sqlServerDdl.alterColumnNotnull("mytab", "acol", true); assertNull(sql); - + sql = hanaDdl.alterColumnNotnull("mytab", "acol", true); assertNull(sql); } @@ -178,7 +177,7 @@ public class PlatformDdl_AlterColumnTest { sql = sqlServerDdl.alterColumnNotnull("mytab", "acol", false); assertNull(sql); - + sql = hanaDdl.alterColumnNotnull("mytab", "acol", false); assertNull(sql); } @@ -200,7 +199,7 @@ public class PlatformDdl_AlterColumnTest { sql = sqlServerDdl.alterColumnDefaultValue("mytab", "acol", "'hi'"); assertEquals("alter table mytab add default 'hi' for acol", sql); - + boolean exceptionCaught = false; try { hanaDdl.alterColumnDefaultValue("mytab", "acol", "'hi'"); @@ -228,7 +227,7 @@ public class PlatformDdl_AlterColumnTest { sql = sqlServerDdl.alterColumnDefaultValue("mytab", "acol", "DROP DEFAULT"); assertEquals("EXEC usp_ebean_drop_default_constraint mytab, acol", sql); - + boolean exceptionCaught = false; try { hanaDdl.alterColumnDefaultValue("mytab", "acol", "DROP DEFAULT"); @@ -277,7 +276,7 @@ public class PlatformDdl_AlterColumnTest { assertEquals(oraDdl.useIdentityType(IdentityType.GENERATOR), IdType.GENERATOR); assertEquals(oraDdl.useIdentityType(IdentityType.EXTERNAL), IdType.EXTERNAL); } - + @Test public void useIdentityType_hana() { diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java index ccf3aab1f..2ccb97ce5 100644 --- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java +++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java @@ -14,8 +14,6 @@ import org.tests.model.basic.ResetBasicData; import java.util.Arrays; import java.util.List; -import javax.xml.ws.RequestWrapper; - import static org.assertj.core.api.Assertions.assertThat; public class EqlParserTest extends BaseTestCase { @@ -140,7 +138,7 @@ public class EqlParserTest extends BaseTestCase { assertThat(query.getGeneratedSql()).contains("where (t0.name = ? or (t0.status = ? and t0.smallnote is null ) )"); } - + @Test @ForPlatform(Platform.HANA) public void where_or1_hana() { @@ -160,7 +158,7 @@ public class EqlParserTest extends BaseTestCase { assertThat(query.getGeneratedSql()).contains("where ((t0.name = ? or t0.status = ? ) and t0.smallnote is null )"); } - + @Test @ForPlatform(Platform.HANA) public void where_or2_hana() { @@ -187,7 +185,7 @@ public class EqlParserTest extends BaseTestCase { query.findList(); assertThat(query.getGeneratedSql()).contains("where not (t0.name = ? and t0.status = ? )"); } - + @Test @ForPlatform(Platform.HANA) public void test_simplifyExpressions_hana() { diff --git a/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java b/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java index 8ba6d612f..aed4f42ee 100644 --- a/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java +++ b/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java @@ -109,7 +109,11 @@ public class TypeReflectHelperTest { private static class Some { + // note: values are accessed via reflection + @SuppressWarnings("unused") List wildOrderStatus = new ArrayList<>(); + + @SuppressWarnings("unused") List orderStatus = new ArrayList<>(); } diff --git a/src/test/java/org/MainMemoryLeak.java b/src/test/java/org/MainMemoryLeak.java index 03d00622d..fe840df87 100644 --- a/src/test/java/org/MainMemoryLeak.java +++ b/src/test/java/org/MainMemoryLeak.java @@ -1,6 +1,5 @@ package org; -import io.ebean.Ebean; import io.ebean.EbeanServer; import io.ebean.EbeanServerFactory; import io.ebean.Transaction; diff --git a/src/test/java/org/tests/changelog/TestChangeLog.java b/src/test/java/org/tests/changelog/TestChangeLog.java index 9b906a8fd..f430c2769 100644 --- a/src/test/java/org/tests/changelog/TestChangeLog.java +++ b/src/test/java/org/tests/changelog/TestChangeLog.java @@ -23,9 +23,6 @@ import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; -import java.util.ArrayList; -import java.util.List; - public class TestChangeLog extends BaseTestCase { TDChangeLogPrepare changeLogPrepare = new TDChangeLogPrepare(); diff --git a/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java b/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java index 3314a5dde..5b7f37d06 100644 --- a/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java +++ b/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java @@ -9,7 +9,6 @@ import org.tests.model.basic.cache.CInhTwo; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/org/tests/model/basic/ResetBasicData.java b/src/test/java/org/tests/model/basic/ResetBasicData.java index 954932238..4248977c4 100644 --- a/src/test/java/org/tests/model/basic/ResetBasicData.java +++ b/src/test/java/org/tests/model/basic/ResetBasicData.java @@ -4,8 +4,6 @@ import io.ebean.Ebean; import io.ebean.EbeanServer; import org.tests.model.basic.Order.Status; -import static org.assertj.core.api.Assertions.assertThat; - import java.sql.Date; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java index 3ae0ddb19..baf2f6d86 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java @@ -2,7 +2,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import io.ebean.annotation.PersistBatch; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java index cd236e4eb..b885fe488 100644 --- a/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java +++ b/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java @@ -2,7 +2,6 @@ package org.tests.model.elementcollection; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import io.ebean.annotation.PersistBatch; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; diff --git a/src/test/java/org/tests/model/uuidsibling/USibChild.java b/src/test/java/org/tests/model/uuidsibling/USibChild.java index b2ff59e42..47edd9fc1 100644 --- a/src/test/java/org/tests/model/uuidsibling/USibChild.java +++ b/src/test/java/org/tests/model/uuidsibling/USibChild.java @@ -3,6 +3,8 @@ package org.tests.model.uuidsibling; import io.ebean.Finder; import io.ebean.Model; import io.ebean.annotation.SoftDelete; + +import java.io.Serializable; import java.util.UUID; import javax.persistence.CascadeType; import javax.persistence.Entity; @@ -11,7 +13,7 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToOne; @Entity -public class USibChild extends Model { +public class USibChild extends Model implements Serializable { private static final long serialVersionUID = 738194912181571389L; diff --git a/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java b/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java index 888c1cc88..03e39b5f7 100644 --- a/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java +++ b/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java @@ -3,12 +3,15 @@ package org.tests.model.uuidsibling; import io.ebean.Finder; import io.ebean.Model; import io.ebean.annotation.SoftDelete; + +import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; @Entity -public class USibChildSibling extends Model { +public class USibChildSibling extends Model implements Serializable { private static final long serialVersionUID = 738194912181571389L; diff --git a/src/test/java/org/tests/model/uuidsibling/USibParent.java b/src/test/java/org/tests/model/uuidsibling/USibParent.java index a7e349d12..30597f5ad 100644 --- a/src/test/java/org/tests/model/uuidsibling/USibParent.java +++ b/src/test/java/org/tests/model/uuidsibling/USibParent.java @@ -3,6 +3,8 @@ package org.tests.model.uuidsibling; import io.ebean.Finder; import io.ebean.Model; import io.ebean.annotation.SoftDelete; + +import java.io.Serializable; import java.util.List; import javax.persistence.CascadeType; import javax.persistence.Entity; @@ -10,7 +12,7 @@ import javax.persistence.Id; import javax.persistence.OneToMany; @Entity -public class USibParent extends Model { +public class USibParent extends Model implements Serializable { private static final long serialVersionUID = 4116545858939406149L; diff --git a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java index 1a377b7e5..e18c9e9ba 100644 --- a/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java +++ b/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java @@ -2,13 +2,11 @@ package org.tests.o2m.jointable; import io.ebean.BaseTestCase; import io.ebean.Ebean; -import io.ebean.annotation.PersistBatch; import org.ebeantest.LoggedSqlCollector; import org.junit.Test; import java.util.Arrays; -import java.util.Collections; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java b/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java index a90d1dc56..45a97264f 100644 --- a/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java +++ b/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java @@ -1,6 +1,5 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.TransactionalTestCase; diff --git a/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java b/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java index 4ead0767a..45cae1f70 100644 --- a/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java +++ b/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java @@ -6,7 +6,6 @@ import io.ebean.TransactionalTestCase; import io.ebean.text.csv.CsvReader; import io.ebean.text.csv.DefaultCsvCallback; import org.tests.model.basic.Customer; -import org.tests.model.basic.ResetBasicData; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat;