From 40f55968376e4b71ac7b2f742271381d114ddf6d Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 23 Feb 2017 12:01:25 +0100 Subject: [PATCH] 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/ebean/OrderBy.java | 3 + src/main/java/io/ebean/QueryIterator.java | 4 + src/main/java/io/ebean/RawSql.java | 2 + src/main/java/io/ebean/SqlRow.java | 13 +++ src/main/java/io/ebean/TxScope.java | 1 + src/main/java/io/ebean/ValuePair.java | 1 + src/main/java/io/ebean/bean/CallStack.java | 3 + .../io/ebean/bean/NodeUsageCollector.java | 1 + .../java/io/ebean/bean/ObjectGraphNode.java | 3 + .../java/io/ebean/bean/ObjectGraphOrigin.java | 3 + .../io/ebean/cache/ServerCacheStatistics.java | 1 + .../ebean/common/AbstractBeanCollection.java | 14 +++ src/main/java/io/ebean/common/BeanList.java | 41 +++++++ src/main/java/io/ebean/common/BeanMap.java | 22 ++++ src/main/java/io/ebean/common/BeanSet.java | 26 +++++ .../io/ebean/common/ModifyCollection.java | 2 + .../java/io/ebean/common/ModifyIterator.java | 3 + src/main/java/io/ebean/common/ModifyList.java | 10 ++ .../io/ebean/common/ModifyListIterator.java | 9 ++ .../config/AbstractNamingConvention.java | 5 + .../config/MatchingNamingConvention.java | 3 + .../java/io/ebean/config/PropertyMap.java | 1 + src/main/java/io/ebean/config/TableName.java | 1 + .../config/UnderscoreNamingConvention.java | 3 + .../config/dbplatform/AbstractDbEncrypt.java | 3 + .../dbplatform/LimitOffsetSqlLimiter.java | 1 + .../dbplatform/RowNumberSqlLimiter.java | 1 + .../config/dbplatform/RownumSqlLimiter.java | 1 + .../dbplatform/SequenceIdGenerator.java | 4 + .../dbplatform/SimpleSequenceIdGenerator.java | 4 + .../db2/DB2SequenceIdGenerator.java | 1 + .../config/dbplatform/h2/H2DbEncrypt.java | 5 + .../dbplatform/h2/H2SequenceIdGenerator.java | 1 + .../dbplatform/mysql/MySqlDbEncrypt.java | 4 + .../dbplatform/oracle/OracleDbEncrypt.java | 4 + .../oracle/OracleSequenceIdGenerator.java | 1 + .../postgres/PostgresDbEncrypt.java | 4 + .../dbplatform/postgres/PostgresPlatform.java | 2 + .../postgres/PostgresSequenceIdGenerator.java | 1 + .../sqlanywhere/SqlAnywhereLimiter.java | 1 + .../sqlserver/SqlServer2005SqlLimiter.java | 1 + .../sqlserver/SqlServerSqlLimiter.java | 1 + .../ddlgeneration/platform/BaseDdlBuffer.java | 1 + .../platform/DefaultConstraintMaxLength.java | 1 + .../platform/HistoryTableUpdate.java | 1 + .../ddlgeneration/platform/MySqlDdl.java | 4 + .../ddlgeneration/platform/SqlServerDdl.java | 4 + .../dbmigration/model/MigrationResource.java | 1 + .../dbmigration/model/MigrationVersion.java | 1 + .../model/build/ModelBuildBeanVisitor.java | 1 + .../visitor/BaseTablePropertyVisitor.java | 6 + .../model/visitor/VisitAllUsing.java | 1 + .../io/ebean/event/BeanPersistAdapter.java | 10 ++ .../io/ebean/event/changelog/BeanChange.java | 1 + .../io/ebean/event/changelog/ChangeSet.java | 1 + .../event/readaudit/ReadAuditQueryPlan.java | 1 + .../java/io/ebean/text/PathProperties.java | 3 + .../java/io/ebean/text/TimeStringParser.java | 1 + .../io/ebean/text/csv/DefaultCsvCallback.java | 6 + .../java/io/ebean/text/json/EJsonReader.java | 10 ++ .../java/io/ebeaninternal/api/BindParams.java | 2 + .../java/io/ebeaninternal/api/HashQuery.java | 3 + .../io/ebeaninternal/api/HashQueryPlan.java | 3 + .../api/HashQueryPlanBuilder.java | 1 + .../java/io/ebeaninternal/api/ScopeTrans.java | 1 + .../java/io/ebeaninternal/api/SpiQuery.java | 3 + .../java/io/ebeaninternal/api/SpiUpdate.java | 4 + .../api/TransactionEventTable.java | 6 + .../server/autotune/AutoTuneService.java | 1 + .../service/DefaultAutoTuneService.java | 1 + .../autotune/service/ProfileManager.java | 2 + .../service/ProfileOriginNodeUsage.java | 1 + .../autotune/service/TunedQueryInfo.java | 1 + .../server/cache/CachedBeanData.java | 1 + .../server/cache/CachedManyIds.java | 1 + .../server/cache/DefaultServerCache.java | 1 + .../cache/DefaultServerCacheFactory.java | 1 + .../cache/DefaultServerCacheManager.java | 6 + .../core/CObjectGraphNodeStatistics.java | 1 + .../core/DefaultBackgroundExecutor.java | 3 + .../server/core/DefaultBeanState.java | 13 +++ .../server/core/DefaultCallableSql.java | 14 +++ .../server/core/DefaultContainer.java | 3 + .../server/core/DefaultMetaInfoManager.java | 1 + .../server/core/DefaultServer.java | 104 ++++++++++++++++++ .../server/core/DefaultSqlUpdate.java | 16 +++ .../server/core/OrmQueryRequest.java | 18 +++ .../server/core/PersistRequest.java | 2 + .../core/PersistRequestCallableSql.java | 3 + .../server/core/PersistRequestOrmUpdate.java | 3 + .../server/core/PersistRequestUpdateSql.java | 3 + .../server/core/ServletContextListener.java | 2 + .../server/core/SpiOrmQueryRequest.java | 1 + .../server/deploy/AssocOneHelpEmbedded.java | 1 + .../server/deploy/BeanDescriptor.java | 12 ++ .../server/deploy/BeanDescriptorManager.java | 7 ++ .../server/deploy/BeanFkeyProperty.java | 19 ++++ .../server/deploy/BeanMapHelp.java | 1 + .../server/deploy/BeanProperty.java | 24 ++++ .../server/deploy/BeanPropertyAssoc.java | 1 + .../server/deploy/BeanPropertyAssocMany.java | 5 + .../server/deploy/BeanPropertyAssocOne.java | 3 + .../server/deploy/BeanSetHelp.java | 1 + .../server/deploy/BeanTable.java | 1 + .../deploy/ChainedBeanPersistController.java | 3 +- .../deploy/ChainedBeanPersistListener.java | 12 +- .../deploy/ChainedBeanQueryAdapter.java | 12 +- .../server/deploy/DeployPropertyParser.java | 1 + .../deploy/DeployPropertyParserMap.java | 2 + .../server/deploy/DeployUpdateParser.java | 6 +- .../server/deploy/InheritInfo.java | 1 + .../server/deploy/TableJoin.java | 1 + .../server/deploy/TableJoinColumn.java | 1 + .../generatedproperty/GeneratedCounter.java | 3 + .../GeneratedCounterInteger.java | 3 + .../GeneratedCounterLong.java | 3 + .../GeneratedInsertDate.java | 3 + .../GeneratedInsertLong.java | 3 + .../GeneratedInsertTimestamp.java | 3 + .../GeneratedUpdateDate.java | 5 + .../GeneratedUpdateLong.java | 5 + .../GeneratedUpdateTimestamp.java | 5 + .../server/deploy/id/IdBinderEmbedded.java | 27 +++++ .../server/deploy/id/IdBinderEmpty.java | 26 +++++ .../server/deploy/id/IdBinderSimple.java | 27 +++++ .../server/deploy/id/ImportedIdEmbedded.java | 8 ++ .../server/deploy/id/ImportedIdSimple.java | 10 ++ .../deploy/meta/DeployBeanDescriptor.java | 2 + .../deploy/meta/DeployBeanProperty.java | 1 + .../server/deploy/meta/DeployTableJoin.java | 1 + .../deploy/meta/DeployTableJoinColumn.java | 3 +- .../deploy/parse/AnnotationAssocManys.java | 1 + .../deploy/parse/AnnotationAssocOnes.java | 1 + .../server/deploy/parse/AnnotationClass.java | 1 + .../server/deploy/parse/AnnotationFields.java | 1 + .../server/deploy/parse/AnnotationParser.java | 1 + .../server/deploy/parse/AnnotationSql.java | 1 + .../server/deploy/parse/DeployBeanInfo.java | 1 + .../deploy/parse/DeployInheritInfo.java | 1 + .../ebeaninternal/server/el/ElComparator.java | 1 + .../server/el/ElComparatorCompound.java | 2 + .../server/el/ElComparatorProperty.java | 2 + .../io/ebeaninternal/server/el/ElFilter.java | 20 ++++ .../server/el/ElMatchBuilder.java | 18 +++ .../server/el/ElPropertyChain.java | 22 ++++ .../server/el/ElPropertyValue.java | 1 + .../expression/DefaultExpressionFactory.java | 53 +++++++++ .../server/idgen/UuidIdGenerator.java | 4 + .../server/lib/DaemonScheduleThreadPool.java | 1 + .../server/lib/DaemonThreadFactory.java | 1 + .../server/lib/ShutdownHook.java | 1 + .../server/loadcontext/DLoadBeanContext.java | 2 + .../server/loadcontext/DLoadContext.java | 7 ++ .../server/loadcontext/DLoadManyContext.java | 3 + .../server/persist/BatchDepthComparator.java | 1 + .../server/persist/BatchedBeanHolder.java | 1 + .../server/persist/BindValues.java | 1 + .../server/persist/DefaultPersistExecute.java | 4 + .../server/persist/DefaultPersister.java | 10 ++ .../server/persist/dml/DmlBeanPersister.java | 3 + .../persist/dml/DmlBeanPersisterFactory.java | 1 + .../persist/dml/GenerateDmlRequest.java | 1 + .../server/persist/dml/UpdatePlan.java | 8 ++ .../persist/dmlbind/BindableAssocOne.java | 4 + .../BindableAssocOneGeneratedInsert.java | 1 + .../BindableAssocOneGeneratedUpdate.java | 1 + .../dmlbind/BindableDiscriminator.java | 1 + .../persist/dmlbind/BindableEmbedded.java | 4 + .../dmlbind/BindableEncryptedProperty.java | 4 + .../persist/dmlbind/BindableIdEmbedded.java | 7 ++ .../persist/dmlbind/BindableIdEmpty.java | 7 ++ .../persist/dmlbind/BindableIdScalar.java | 7 ++ .../server/persist/dmlbind/BindableList.java | 3 + .../persist/dmlbind/BindableProperty.java | 4 + .../BindablePropertyInsertGenerated.java | 1 + .../BindablePropertyUpdateGenerated.java | 2 + .../dmlbind/BindableUnidirectional.java | 4 + .../properties/BeanPropertiesReader.java | 1 + .../properties/EnhanceBeanPropertyAccess.java | 6 + .../server/query/BaseFuture.java | 5 + .../io/ebeaninternal/server/query/CQuery.java | 14 +++ .../server/query/CQueryIteratorSimple.java | 4 + .../query/CQueryIteratorWithBuffer.java | 4 + .../server/query/CQueryPlan.java | 1 + .../server/query/CQueryPlanStats.java | 2 + .../server/query/CallableQueryCount.java | 1 + .../server/query/CallableQueryIds.java | 1 + .../server/query/CallableQueryList.java | 1 + .../server/query/DefaultDbSqlContext.java | 23 ++++ .../server/query/DefaultOrmQueryEngine.java | 7 ++ .../query/DefaultRelationalQueryEngine.java | 1 + .../server/query/DefaultSqlRow.java | 26 +++++ .../server/query/LimitOffsetPagedList.java | 9 ++ .../server/query/NativeSqlQueryPlanKey.java | 2 + .../server/query/QueryFutureIds.java | 2 + .../server/query/QueryFutureRowCount.java | 1 + .../server/query/RawSqlQueryPlanKey.java | 2 + .../server/query/SqlTreeNodeBean.java | 11 ++ .../server/query/SqlTreeNodeExtraJoin.java | 4 + .../server/query/SqlTreeNodeManyRoot.java | 1 + .../query/SqlTreeNodeManyWhereJoin.java | 4 + .../server/query/SqlTreeNodeRoot.java | 2 + .../server/querydefn/DefaultOrmQuery.java | 6 + .../server/querydefn/DefaultOrmUpdate.java | 21 ++++ .../querydefn/DefaultRelationalQuery.java | 15 +++ .../server/querydefn/ONamedParam.java | 1 + .../server/querydefn/OrmQueryDetail.java | 2 + .../querydefn/OrmQueryLimitRequest.java | 7 ++ .../server/querydefn/OrmQueryProperties.java | 1 + .../server/text/csv/TCsvReader.java | 17 +++ .../server/text/json/DJsonContext.java | 17 +++ .../server/text/json/WriteJson.java | 2 + .../server/transaction/BeanPersistIdMap.java | 1 + .../server/transaction/BeanPersistIds.java | 1 + .../DefaultPersistenceContext.java | 11 ++ .../DefaultTransactionScopeManager.java | 6 + .../DefaultTransactionThreadLocal.java | 1 + .../server/transaction/DeleteByIdMap.java | 1 + .../transaction/DocStoreOnlyTransaction.java | 1 + .../ExternalTransactionScopeManager.java | 6 + .../server/transaction/JtaTransaction.java | 3 + .../transaction/JtaTransactionManager.java | 10 ++ .../transaction/RemoteTransactionEvent.java | 2 + .../server/transaction/TransactionMap.java | 2 + .../transaction/TransactionScopeManager.java | 1 + .../server/type/DefaultTypeManager.java | 5 + .../server/type/LongToTimestampConverter.java | 3 + .../server/type/ModifyAwareIterator.java | 3 + .../server/type/ModifyAwareList.java | 1 + .../server/type/ModifyAwareMap.java | 1 + .../server/type/ModifyAwareSet.java | 14 +++ .../server/type/RsetDataReader.java | 22 ++++ .../ebeaninternal/server/type/ScalarType.java | 5 + .../server/type/ScalarTypeArrayList.java | 1 + .../server/type/ScalarTypeArrayListH2.java | 1 + .../server/type/ScalarTypeBase.java | 5 + .../server/type/ScalarTypeBaseDate.java | 8 ++ .../server/type/ScalarTypeBaseDateTime.java | 8 ++ .../server/type/ScalarTypeBaseVarchar.java | 3 + .../server/type/ScalarTypeBigDecimal.java | 10 ++ .../server/type/ScalarTypeBoolean.java | 24 ++++ .../server/type/ScalarTypeByte.java | 10 ++ .../server/type/ScalarTypeBytesBase.java | 9 ++ .../server/type/ScalarTypeBytesBinary.java | 1 + .../server/type/ScalarTypeBytesBlob.java | 1 + .../server/type/ScalarTypeBytesEncrypted.java | 16 +++ .../type/ScalarTypeBytesLongVarbinary.java | 1 + .../server/type/ScalarTypeBytesVarbinary.java | 1 + .../server/type/ScalarTypeCalendar.java | 1 + .../server/type/ScalarTypeChar.java | 6 + .../server/type/ScalarTypeCharArray.java | 6 + .../server/type/ScalarTypeClass.java | 2 + .../server/type/ScalarTypeDate.java | 4 + .../server/type/ScalarTypeEnumStandard.java | 9 ++ .../type/ScalarTypeEnumWithMapping.java | 5 + .../server/type/ScalarTypeFile.java | 1 + .../server/type/ScalarTypeWrapper.java | 1 + .../server/type/SimpleAesEncryptor.java | 4 + .../ebeaninternal/server/util/ArrayStack.java | 1 + .../ebeaninternal/util/ParamTypeHelper.java | 1 + .../io/ebeaninternal/util/SortByClause.java | 1 + .../docstore/api/DocStoreBeanAdapter.java | 7 ++ .../api/mapping/DocPropertyMapping.java | 1 + .../api/mapping/DocPropertyOptions.java | 1 + .../api/support/DocStoreBeanBaseAdapter.java | 2 + .../java/io/ebean/common/BeanListTest.java | 1 + .../lib/sql/TestDataSourceMaxWithEntity.java | 1 + .../json/TestTextJsonBeanReadVisitor.java | 3 + .../test/model/rawsql/inherit/ChildA.java | 1 + .../test/model/rawsql/inherit/ChildB.java | 1 + .../basic/MyTestDataSourcePoolListener.java | 2 + .../tests/basic/encrypt/BasicEncryptKey.java | 1 + .../basic/encrypt/BasicEncyptKeyManager.java | 2 + .../org/tests/compositekeys/db/CaoKey.java | 2 + .../org/tests/compositekeys/db/RegionKey.java | 2 + .../tests/compositekeys/db/SubTypeKey.java | 2 + .../org/tests/compositekeys/db/TypeKey.java | 2 + .../idkeys/TestPropertyChangeSupport.java | 1 + .../java/org/tests/model/basic/Address.java | 1 + .../java/org/tests/model/basic/Country.java | 1 + .../java/org/tests/model/basic/Customer.java | 1 + .../tests/model/basic/CustomerAggregate.java | 1 + .../java/org/tests/model/basic/ESomeType.java | 1 + .../java/org/tests/model/basic/MNonEnum.java | 1 + .../model/basic/MyEBasicConfigStartup.java | 6 + .../java/org/tests/model/basic/Order.java | 1 + .../org/tests/model/basic/OrderAggregate.java | 1 + .../java/org/tests/model/basic/SomeEnum.java | 1 + .../java/org/tests/model/basic/UTDetail.java | 1 + .../basic/event/SimpleTOneQueryAdapter.java | 3 + .../java/org/tests/model/ddd/DPerson.java | 1 + src/test/java/org/tests/model/ivo/Money.java | 2 + src/test/java/org/tests/model/ivo/Oid.java | 1 + .../java/org/tests/model/ivo/Segment.java | 1 + .../ivo/converter/MoneyTypeConverter.java | 2 + .../model/ivo/converter/OidTypeConverter.java | 2 + .../model/ivo/converter/SysTimeConverter.java | 3 + .../java/org/tests/model/json/PlainBean.java | 1 + .../singleTableInheritance/model/Zone.java | 1 + .../org/tests/transaction/TestNested.java | 1 + 300 files changed, 1492 insertions(+), 12 deletions(-) diff --git a/src/main/java/io/ebean/OrderBy.java b/src/main/java/io/ebean/OrderBy.java index 373574fd4..e9f68f6f5 100644 --- a/src/main/java/io/ebean/OrderBy.java +++ b/src/main/java/io/ebean/OrderBy.java @@ -162,6 +162,7 @@ public final class OrderBy implements Serializable { list.add(p); } + @Override public String toString() { return list.toString(); } @@ -201,6 +202,7 @@ public final class OrderBy implements Serializable { * Return a hash value for this OrderBy. This can be to determine logical * equality for OrderBy clauses. */ + @Override public int hashCode() { return list.hashCode(); } @@ -276,6 +278,7 @@ public final class OrderBy implements Serializable { return highLow != null ? highLow.equals(e.highLow) : e.highLow == null; } + @Override public String toString() { return toStringFormat(); } diff --git a/src/main/java/io/ebean/QueryIterator.java b/src/main/java/io/ebean/QueryIterator.java index 46f27dc6c..f7a89223f 100644 --- a/src/main/java/io/ebean/QueryIterator.java +++ b/src/main/java/io/ebean/QueryIterator.java @@ -61,20 +61,24 @@ public interface QueryIterator extends Iterator, java.io.Closeable { /** * Returns true if the iteration has more elements. */ + @Override boolean hasNext(); /** * Returns the next element in the iteration. */ + @Override T next(); /** * Remove is not allowed. */ + @Override void remove(); /** * Close the underlying resources held by this iterator. */ + @Override void close(); } diff --git a/src/main/java/io/ebean/RawSql.java b/src/main/java/io/ebean/RawSql.java index 53879c8d7..937161e2a 100644 --- a/src/main/java/io/ebean/RawSql.java +++ b/src/main/java/io/ebean/RawSql.java @@ -292,6 +292,7 @@ public final class RawSql implements Serializable { this.distinct = distinct; } + @Override public String toString() { if (!parsed) { return "unparsed[" + unparsedSql + "]"; @@ -642,6 +643,7 @@ public final class RawSql implements Serializable { return result; } + @Override public String toString() { return dbColumn + "->" + propertyName; } diff --git a/src/main/java/io/ebean/SqlRow.java b/src/main/java/io/ebean/SqlRow.java index 22fe00f40..d3d614bf4 100644 --- a/src/main/java/io/ebean/SqlRow.java +++ b/src/main/java/io/ebean/SqlRow.java @@ -39,16 +39,19 @@ public interface SqlRow extends Serializable, Map { /** * Remove a property from the map. Returns the value of the removed property. */ + @Override Object remove(Object name); /** * Return a property value by its name. */ + @Override Object get(Object name); /** * Set a value to a property. */ + @Override Object put(String name, Object value); /** @@ -118,51 +121,61 @@ public interface SqlRow extends Serializable, Map { /** * String description of the underlying map. */ + @Override String toString(); /** * Clear the map. */ + @Override void clear(); /** * Returns true if the map contains the property. */ + @Override boolean containsKey(Object key); /** * Returns true if the map contains the value. */ + @Override boolean containsValue(Object value); /** * Returns the entrySet of the map. */ + @Override Set> entrySet(); /** * Returns true if the map is empty. */ + @Override boolean isEmpty(); /** * Returns the key set of the map. */ + @Override Set keySet(); /** * Put all the values from t into this map. */ + @Override void putAll(Map t); /** * Return the size of the map. */ + @Override int size(); /** * Return the values from this map. */ + @Override Collection values(); } diff --git a/src/main/java/io/ebean/TxScope.java b/src/main/java/io/ebean/TxScope.java index 745391636..49e372a79 100644 --- a/src/main/java/io/ebean/TxScope.java +++ b/src/main/java/io/ebean/TxScope.java @@ -101,6 +101,7 @@ public final class TxScope { /** * Describes this TxScope instance. */ + @Override public String toString() { return "TxScope[" + type + "] readOnly[" + readOnly + "] isolation[" + isolation + "] serverName[" + serverName + "] rollbackFor[" + rollbackFor + "] noRollbackFor[" + noRollbackFor + "]"; diff --git a/src/main/java/io/ebean/ValuePair.java b/src/main/java/io/ebean/ValuePair.java index 38c6efa88..afe1f6eaf 100644 --- a/src/main/java/io/ebean/ValuePair.java +++ b/src/main/java/io/ebean/ValuePair.java @@ -51,6 +51,7 @@ public class ValuePair { this.oldValue = oldValue; } + @Override public String toString() { return newValue + "," + oldValue; } diff --git a/src/main/java/io/ebean/bean/CallStack.java b/src/main/java/io/ebean/bean/CallStack.java index 16d8b7aac..3202f5e9a 100644 --- a/src/main/java/io/ebean/bean/CallStack.java +++ b/src/main/java/io/ebean/bean/CallStack.java @@ -32,6 +32,7 @@ public final class CallStack implements Serializable { this.pathHash = enc(pathHash); } + @Override public int hashCode() { int hc = 0; for (StackTraceElement aCallStack : callStack) { @@ -40,6 +41,7 @@ public final class CallStack implements Serializable { return hc; } + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -79,6 +81,7 @@ public final class CallStack implements Serializable { return pathHash; } + @Override public String toString() { return zeroHash + ":" + pathHash + ":" + callStack[0]; } diff --git a/src/main/java/io/ebean/bean/NodeUsageCollector.java b/src/main/java/io/ebean/bean/NodeUsageCollector.java index 535f1092f..bb65f6735 100644 --- a/src/main/java/io/ebean/bean/NodeUsageCollector.java +++ b/src/main/java/io/ebean/bean/NodeUsageCollector.java @@ -120,6 +120,7 @@ public final class NodeUsageCollector { return loadProperty; } + @Override public String toString() { return node + " read:" + used + " modified:" + modified; } diff --git a/src/main/java/io/ebean/bean/ObjectGraphNode.java b/src/main/java/io/ebean/bean/ObjectGraphNode.java index 828705463..21f242360 100644 --- a/src/main/java/io/ebean/bean/ObjectGraphNode.java +++ b/src/main/java/io/ebean/bean/ObjectGraphNode.java @@ -63,16 +63,19 @@ public final class ObjectGraphNode implements Serializable { return path; } + @Override public String toString() { return "origin:" + originQueryPoint + " path[" + path + "]"; } + @Override public int hashCode() { int hc = 92821 * originQueryPoint.hashCode(); hc = 92821 * hc + (path == null ? 0 : path.hashCode()); return hc; } + @Override public boolean equals(Object obj) { if (obj == this) { return true; diff --git a/src/main/java/io/ebean/bean/ObjectGraphOrigin.java b/src/main/java/io/ebean/bean/ObjectGraphOrigin.java index a5f6ea752..5f32f44ef 100644 --- a/src/main/java/io/ebean/bean/ObjectGraphOrigin.java +++ b/src/main/java/io/ebean/bean/ObjectGraphOrigin.java @@ -57,10 +57,12 @@ public final class ObjectGraphOrigin implements Serializable { return callStack.getFirstStackTraceElement().toString(); } + @Override public String toString() { return "key[" + key + "] type[" + beanType + "] " + callStack.getFirstStackTraceElement() + " "; } + @Override public int hashCode() { int hc = 92821 * callStack.hashCode(); hc = 92821 * hc + beanType.hashCode(); @@ -68,6 +70,7 @@ public final class ObjectGraphOrigin implements Serializable { return hc; } + @Override public boolean equals(Object obj) { if (obj == this) { return true; diff --git a/src/main/java/io/ebean/cache/ServerCacheStatistics.java b/src/main/java/io/ebean/cache/ServerCacheStatistics.java index a6b1d2edc..bbe4de7c4 100644 --- a/src/main/java/io/ebean/cache/ServerCacheStatistics.java +++ b/src/main/java/io/ebean/cache/ServerCacheStatistics.java @@ -39,6 +39,7 @@ public class ServerCacheStatistics { protected long evictByLRU; + @Override public String toString() { //noinspection StringBufferReplaceableByString StringBuilder sb = new StringBuilder(80); diff --git a/src/main/java/io/ebean/common/AbstractBeanCollection.java b/src/main/java/io/ebean/common/AbstractBeanCollection.java index dee22048e..5aceb959e 100644 --- a/src/main/java/io/ebean/common/AbstractBeanCollection.java +++ b/src/main/java/io/ebean/common/AbstractBeanCollection.java @@ -68,18 +68,22 @@ abstract class AbstractBeanCollection implements BeanCollection { this.readOnly = ownerBean._ebean_getIntercept().isReadOnly(); } + @Override public EntityBean getOwnerBean() { return ownerBean; } + @Override public String getPropertyName() { return propertyName; } + @Override public ExpressionList getFilterMany() { return filterMany; } + @Override public void setFilterMany(ExpressionList filterMany) { this.filterMany = filterMany; } @@ -104,20 +108,24 @@ abstract class AbstractBeanCollection implements BeanCollection { checkEmptyLazyLoad(); } + @Override public boolean isRegisteredWithLoadContext() { return registeredWithLoadContext; } + @Override public void setLoader(BeanCollectionLoader loader) { this.registeredWithLoadContext = true; this.loader = loader; this.ebeanServerName = loader.getName(); } + @Override public boolean isReadOnly() { return readOnly; } + @Override public void setReadOnly(boolean readOnly) { this.readOnly = readOnly; } @@ -136,6 +144,7 @@ abstract class AbstractBeanCollection implements BeanCollection { /** * set modifyListening to be on or off. */ + @Override public void setModifyListening(ModifyListenMode mode) { this.modifyListenMode = mode; @@ -162,24 +171,28 @@ abstract class AbstractBeanCollection implements BeanCollection { return modifyHolder; } + @Override public void modifyAddition(E bean) { if (modifyAddListening) { getModifyHolder().modifyAddition(bean); } } + @Override public void modifyRemoval(Object bean) { if (modifyRemoveListening) { getModifyHolder().modifyRemoval(bean); } } + @Override public void modifyReset() { if (modifyHolder != null) { modifyHolder.reset(); } } + @Override public Set getModifyAdditions() { if (modifyHolder == null) { return null; @@ -188,6 +201,7 @@ abstract class AbstractBeanCollection implements BeanCollection { } } + @Override public Set getModifyRemovals() { if (modifyHolder == null) { return null; diff --git a/src/main/java/io/ebean/common/BeanList.java b/src/main/java/io/ebean/common/BeanList.java index 28d9d1a65..2093c5177 100644 --- a/src/main/java/io/ebean/common/BeanList.java +++ b/src/main/java/io/ebean/common/BeanList.java @@ -59,6 +59,7 @@ public final class BeanList extends AbstractBeanCollection implements List return list == null || (list.isEmpty() && !holdsModifications()); } + @Override @SuppressWarnings("unchecked") public void addEntityBean(EntityBean bean) { list.add((E) bean); @@ -73,6 +74,7 @@ public final class BeanList extends AbstractBeanCollection implements List list.addAll((Collection) other.getActualDetails()); } + @Override @SuppressWarnings("unchecked") public void internalAdd(Object bean) { if (list == null) { @@ -102,6 +104,7 @@ public final class BeanList extends AbstractBeanCollection implements List return false; } + @Override public boolean checkEmptyLazyLoad() { if (list == null) { list = new ArrayList<>(); @@ -153,6 +156,7 @@ public final class BeanList extends AbstractBeanCollection implements List return list; } + @Override public Collection getActualDetails() { return list; } @@ -165,6 +169,7 @@ public final class BeanList extends AbstractBeanCollection implements List /** * Return true if the underlying list is populated. */ + @Override public boolean isPopulated() { return list != null; } @@ -173,10 +178,12 @@ public final class BeanList extends AbstractBeanCollection implements List * Return true if this is a reference (lazy loading) bean collection. This is * the same as !isPopulated(); */ + @Override public boolean isReference() { return list == null; } + @Override public String toString() { StringBuilder sb = new StringBuilder(50); sb.append("BeanList "); @@ -201,11 +208,13 @@ public final class BeanList extends AbstractBeanCollection implements List * test. *

*/ + @Override public boolean equals(Object obj) { init(); return list.equals(obj); } + @Override public int hashCode() { init(); return list.hashCode(); @@ -219,6 +228,7 @@ public final class BeanList extends AbstractBeanCollection implements List // proxy method for List // -----------------------------------------------------// + @Override public void add(int index, E element) { checkReadOnly(); init(); @@ -233,6 +243,7 @@ public final class BeanList extends AbstractBeanCollection implements List add(bean); } + @Override public boolean add(E o) { checkReadOnly(); init(); @@ -247,6 +258,7 @@ public final class BeanList extends AbstractBeanCollection implements List return list.add(o); } + @Override public boolean addAll(Collection c) { checkReadOnly(); init(); @@ -257,6 +269,7 @@ public final class BeanList extends AbstractBeanCollection implements List return list.addAll(c); } + @Override public boolean addAll(int index, Collection c) { checkReadOnly(); init(); @@ -267,6 +280,7 @@ public final class BeanList extends AbstractBeanCollection implements List return list.addAll(index, c); } + @Override public void clear() { checkReadOnly(); // TODO: when clear() and not initialised could be more clever @@ -280,31 +294,37 @@ public final class BeanList extends AbstractBeanCollection implements List list.clear(); } + @Override public boolean contains(Object o) { init(); return list.contains(o); } + @Override public boolean containsAll(Collection c) { init(); return list.containsAll(c); } + @Override public E get(int index) { init(); return list.get(index); } + @Override public int indexOf(Object o) { init(); return list.indexOf(o); } + @Override public boolean isEmpty() { init(); return list.isEmpty(); } + @Override public Iterator iterator() { init(); if (isReadOnly()) { @@ -317,11 +337,13 @@ public final class BeanList extends AbstractBeanCollection implements List return list.iterator(); } + @Override public int lastIndexOf(Object o) { init(); return list.lastIndexOf(o); } + @Override public ListIterator listIterator() { init(); if (isReadOnly()) { @@ -334,6 +356,7 @@ public final class BeanList extends AbstractBeanCollection implements List return list.listIterator(); } + @Override public ListIterator listIterator(int index) { init(); if (isReadOnly()) { @@ -353,6 +376,7 @@ public final class BeanList extends AbstractBeanCollection implements List } } + @Override public E remove(int index) { checkReadOnly(); init(); @@ -364,6 +388,7 @@ public final class BeanList extends AbstractBeanCollection implements List return list.remove(index); } + @Override public boolean remove(Object o) { checkReadOnly(); init(); @@ -377,6 +402,7 @@ public final class BeanList extends AbstractBeanCollection implements List return list.remove(o); } + @Override public boolean removeAll(Collection beans) { checkReadOnly(); init(); @@ -394,6 +420,7 @@ public final class BeanList extends AbstractBeanCollection implements List return list.removeAll(beans); } + @Override public boolean retainAll(Collection retainBeans) { checkReadOnly(); init(); @@ -414,6 +441,7 @@ public final class BeanList extends AbstractBeanCollection implements List return list.retainAll(retainBeans); } + @Override public E set(int index, E element) { checkReadOnly(); init(); @@ -426,11 +454,13 @@ public final class BeanList extends AbstractBeanCollection implements List return list.set(index, element); } + @Override public int size() { init(); return list.size(); } + @Override public List subList(int fromIndex, int toIndex) { init(); if (isReadOnly()) { @@ -442,11 +472,13 @@ public final class BeanList extends AbstractBeanCollection implements List return list.subList(fromIndex, toIndex); } + @Override public Object[] toArray() { init(); return list.toArray(); } + @Override public T[] toArray(T[] a) { init(); //noinspection SuspiciousToArrayCall @@ -463,38 +495,47 @@ public final class BeanList extends AbstractBeanCollection implements List this.i = i; } + @Override public void add(E o) { throw new IllegalStateException("This collection is in ReadOnly mode"); } + @Override public void remove() { throw new IllegalStateException("This collection is in ReadOnly mode"); } + @Override public void set(E o) { throw new IllegalStateException("This collection is in ReadOnly mode"); } + @Override public boolean hasNext() { return i.hasNext(); } + @Override public boolean hasPrevious() { return i.hasPrevious(); } + @Override public E next() { return i.next(); } + @Override public int nextIndex() { return i.nextIndex(); } + @Override public E previous() { return i.previous(); } + @Override public int previousIndex() { return i.previousIndex(); } diff --git a/src/main/java/io/ebean/common/BeanMap.java b/src/main/java/io/ebean/common/BeanMap.java index f9270bda2..7bf211ee1 100644 --- a/src/main/java/io/ebean/common/BeanMap.java +++ b/src/main/java/io/ebean/common/BeanMap.java @@ -47,6 +47,7 @@ public final class BeanMap extends AbstractBeanCollection implements Ma this.map = null; } + @Override public boolean isSkipSave() { return map == null || (map.isEmpty() && !holdsModifications()); } @@ -86,6 +87,7 @@ public final class BeanMap extends AbstractBeanCollection implements Ma throw new RuntimeException("Not allowed for map"); } + @Override public void internalAdd(Object bean) { throw new RuntimeException("Not allowed for map"); } @@ -94,6 +96,7 @@ public final class BeanMap extends AbstractBeanCollection implements Ma * Return true if the underlying map has been populated. Returns false if it * has a deferred fetch pending. */ + @Override public boolean isPopulated() { return map != null; } @@ -102,10 +105,12 @@ public final class BeanMap extends AbstractBeanCollection implements Ma * Return true if this is a reference (lazy loading) bean collection. This is * the same as !isPopulated(); */ + @Override public boolean isReference() { return map == null; } + @Override public boolean checkEmptyLazyLoad() { if (map == null) { map = new LinkedHashMap<>(); @@ -153,6 +158,7 @@ public final class BeanMap extends AbstractBeanCollection implements Ma /** * Returns the collection of beans (map values). */ + @Override public Collection getActualDetails() { return map.values(); } @@ -164,10 +170,12 @@ public final class BeanMap extends AbstractBeanCollection implements Ma * they don't need to be set twice). *

*/ + @Override public Collection getActualEntries() { return map.entrySet(); } + @Override public String toString() { StringBuilder sb = new StringBuilder(50); sb.append("BeanMap "); @@ -187,16 +195,19 @@ public final class BeanMap extends AbstractBeanCollection implements Ma /** * Equal if obj is a Map and equal in a Map sense. */ + @Override public boolean equals(Object obj) { init(); return map.equals(obj); } + @Override public int hashCode() { init(); return map.hashCode(); } + @Override public void clear() { checkReadOnly(); initClear(); @@ -209,16 +220,19 @@ public final class BeanMap extends AbstractBeanCollection implements Ma map.clear(); } + @Override public boolean containsKey(Object key) { init(); return map.containsKey(key); } + @Override public boolean containsValue(Object value) { init(); return map.containsValue(value); } + @Override @SuppressWarnings({"unchecked", "rawtypes"}) public Set> entrySet() { init(); @@ -232,16 +246,19 @@ public final class BeanMap extends AbstractBeanCollection implements Ma return map.entrySet(); } + @Override public E get(Object key) { init(); return map.get(key); } + @Override public boolean isEmpty() { init(); return map.isEmpty(); } + @Override public Set keySet() { init(); if (isReadOnly()) { @@ -251,6 +268,7 @@ public final class BeanMap extends AbstractBeanCollection implements Ma return map.keySet(); } + @Override public E put(K key, E value) { checkReadOnly(); init(); @@ -265,6 +283,7 @@ public final class BeanMap extends AbstractBeanCollection implements Ma return map.put(key, value); } + @Override public void putAll(Map puts) { checkReadOnly(); init(); @@ -290,6 +309,7 @@ public final class BeanMap extends AbstractBeanCollection implements Ma throw new IllegalStateException("Method not allowed on Map. Please use List instead."); } + @Override public E remove(Object key) { checkReadOnly(); init(); @@ -301,11 +321,13 @@ public final class BeanMap extends AbstractBeanCollection implements Ma return map.remove(key); } + @Override public int size() { init(); return map.size(); } + @Override public Collection values() { init(); if (isReadOnly()) { diff --git a/src/main/java/io/ebean/common/BeanSet.java b/src/main/java/io/ebean/common/BeanSet.java index ab4972b36..e0dfa4f8d 100644 --- a/src/main/java/io/ebean/common/BeanSet.java +++ b/src/main/java/io/ebean/common/BeanSet.java @@ -48,10 +48,12 @@ public final class BeanSet extends AbstractBeanCollection implements Set extends AbstractBeanCollection implements Set extends AbstractBeanCollection implements Set extends AbstractBeanCollection implements Set(); @@ -142,6 +148,7 @@ public final class BeanSet extends AbstractBeanCollection implements Set getActualDetails() { return set; } @@ -151,6 +158,7 @@ public final class BeanSet extends AbstractBeanCollection implements Set extends AbstractBeanCollection implements Set extends AbstractBeanCollection implements Set extends AbstractBeanCollection implements Set addCollection) { checkReadOnly(); init(); @@ -227,6 +239,7 @@ public final class BeanSet extends AbstractBeanCollection implements Set extends AbstractBeanCollection implements Set c) { init(); return set.containsAll(c); } + @Override public boolean isEmpty() { init(); return set.isEmpty(); } + @Override public Iterator iterator() { init(); if (isReadOnly()) { @@ -264,6 +281,7 @@ public final class BeanSet extends AbstractBeanCollection implements Set extends AbstractBeanCollection implements Set beans) { checkReadOnly(); init(); @@ -293,6 +312,7 @@ public final class BeanSet extends AbstractBeanCollection implements Set beans) { checkReadOnly(); init(); @@ -313,16 +333,19 @@ public final class BeanSet extends AbstractBeanCollection implements Set T[] toArray(T[] a) { init(); //noinspection SuspiciousToArrayCall @@ -339,14 +362,17 @@ public final class BeanSet extends AbstractBeanCollection implements Set implements Collection { this.c = c; } + @Override public boolean add(E o) { if (c.add(o)) { owner.modifyAddition(o); @@ -38,6 +39,7 @@ class ModifyCollection implements Collection { return false; } + @Override public boolean addAll(Collection collection) { boolean changed = false; for (E o : collection) { diff --git a/src/main/java/io/ebean/common/ModifyIterator.java b/src/main/java/io/ebean/common/ModifyIterator.java index fbb8045d7..d4c488a85 100644 --- a/src/main/java/io/ebean/common/ModifyIterator.java +++ b/src/main/java/io/ebean/common/ModifyIterator.java @@ -31,15 +31,18 @@ class ModifyIterator implements Iterator { this.it = it; } + @Override public boolean hasNext() { return it.hasNext(); } + @Override public E next() { last = it.next(); return last; } + @Override public void remove() { owner.modifyRemoval(last); it.remove(); diff --git a/src/main/java/io/ebean/common/ModifyList.java b/src/main/java/io/ebean/common/ModifyList.java index f9dcbad75..fa89d8b87 100644 --- a/src/main/java/io/ebean/common/ModifyList.java +++ b/src/main/java/io/ebean/common/ModifyList.java @@ -33,11 +33,13 @@ class ModifyList extends ModifyCollection implements List { this.list = list; } + @Override public void add(int index, E element) { list.add(index, element); owner.modifyAddition(element); } + @Override public boolean addAll(int index, Collection addCollection) { if (list.addAll(index, addCollection)) { for (E bean : addCollection) { @@ -48,32 +50,39 @@ class ModifyList extends ModifyCollection implements List { return false; } + @Override public E get(int index) { return list.get(index); } + @Override public int indexOf(Object o) { return list.indexOf(o); } + @Override public int lastIndexOf(Object o) { return list.lastIndexOf(o); } + @Override public ListIterator listIterator() { return new ModifyListIterator<>(owner, list.listIterator()); } + @Override public ListIterator listIterator(int index) { return new ModifyListIterator<>(owner, list.listIterator(index)); } + @Override public E remove(int index) { E o = list.remove(index); owner.modifyRemoval(o); return o; } + @Override public E set(int index, E element) { E o = list.set(index, element); owner.modifyAddition(element); @@ -81,6 +90,7 @@ class ModifyList extends ModifyCollection implements List { return o; } + @Override public List subList(int fromIndex, int toIndex) { return new ModifyList<>(owner, list.subList(fromIndex, toIndex)); } diff --git a/src/main/java/io/ebean/common/ModifyListIterator.java b/src/main/java/io/ebean/common/ModifyListIterator.java index 36dd7b3bd..207ce1251 100644 --- a/src/main/java/io/ebean/common/ModifyListIterator.java +++ b/src/main/java/io/ebean/common/ModifyListIterator.java @@ -28,44 +28,53 @@ class ModifyListIterator implements ListIterator { this.it = it; } + @Override public void add(E bean) { owner.modifyAddition(bean); last = null; it.add(bean); } + @Override public boolean hasNext() { return it.hasNext(); } + @Override public boolean hasPrevious() { return it.hasPrevious(); } + @Override public E next() { last = it.next(); return last; } + @Override public int nextIndex() { return it.nextIndex(); } + @Override public E previous() { last = it.previous(); return last; } + @Override public int previousIndex() { return it.previousIndex(); } + @Override public void remove() { owner.modifyRemoval(last); last = null; it.remove(); } + @Override public void set(E o) { if (last != null) { owner.modifyRemoval(last); diff --git a/src/main/java/io/ebean/config/AbstractNamingConvention.java b/src/main/java/io/ebean/config/AbstractNamingConvention.java index 9d77a42e9..e97d7a5db 100644 --- a/src/main/java/io/ebean/config/AbstractNamingConvention.java +++ b/src/main/java/io/ebean/config/AbstractNamingConvention.java @@ -76,10 +76,12 @@ public abstract class AbstractNamingConvention implements NamingConvention { this(DEFAULT_SEQ_FORMAT); } + @Override public void setDatabasePlatform(DatabasePlatform databasePlatform) { this.databasePlatform = databasePlatform; } + @Override public String getSequenceName(String tableName, String pkColumn) { String s = sequenceFormat.replace("{table}", tableName); if (pkColumn == null) { @@ -152,6 +154,7 @@ public abstract class AbstractNamingConvention implements NamingConvention { * column names. *

*/ + @Override public boolean isUseForeignKeyPrefix() { return useForeignKeyPrefix; } @@ -180,6 +183,7 @@ public abstract class AbstractNamingConvention implements NamingConvention { * @see #getTableNameFromAnnotation(Class) * @see #getTableNameByConvention(Class) */ + @Override public TableName getTableName(Class beanClass) { TableName tableName = getTableNameFromAnnotation(beanClass); @@ -221,6 +225,7 @@ public abstract class AbstractNamingConvention implements NamingConvention { return supCls.getAnnotation(annotation) != null; } + @Override public TableName getM2MJoinTableName(TableName lhsTable, TableName rhsTable) { StringBuilder buffer = new StringBuilder(); diff --git a/src/main/java/io/ebean/config/MatchingNamingConvention.java b/src/main/java/io/ebean/config/MatchingNamingConvention.java index d351631e6..10a62c582 100644 --- a/src/main/java/io/ebean/config/MatchingNamingConvention.java +++ b/src/main/java/io/ebean/config/MatchingNamingConvention.java @@ -29,15 +29,18 @@ public class MatchingNamingConvention extends AbstractNamingConvention { super(sequenceFormat); } + @Override public String getColumnFromProperty(Class beanClass, String propertyName) { return propertyName; } + @Override public TableName getTableNameByConvention(Class beanClass) { return new TableName(getCatalog(), getSchema(), beanClass.getSimpleName()); } + @Override public String getPropertyFromColumn(Class beanClass, String dbColumnName) { return dbColumnName; } diff --git a/src/main/java/io/ebean/config/PropertyMap.java b/src/main/java/io/ebean/config/PropertyMap.java index eb8069b00..2da152d78 100644 --- a/src/main/java/io/ebean/config/PropertyMap.java +++ b/src/main/java/io/ebean/config/PropertyMap.java @@ -36,6 +36,7 @@ public final class PropertyMap implements Serializable { return (disable == null || !disable.equalsIgnoreCase("true")); } + @Override public String toString() { return map.toString(); } diff --git a/src/main/java/io/ebean/config/TableName.java b/src/main/java/io/ebean/config/TableName.java index c75e89329..dba8b1d0d 100644 --- a/src/main/java/io/ebean/config/TableName.java +++ b/src/main/java/io/ebean/config/TableName.java @@ -69,6 +69,7 @@ public final class TableName { return new TableName(qualifiedTableName).getName(); } + @Override public String toString() { return getQualifiedName(); } diff --git a/src/main/java/io/ebean/config/UnderscoreNamingConvention.java b/src/main/java/io/ebean/config/UnderscoreNamingConvention.java index 4a5041d53..8fffed5fb 100644 --- a/src/main/java/io/ebean/config/UnderscoreNamingConvention.java +++ b/src/main/java/io/ebean/config/UnderscoreNamingConvention.java @@ -43,6 +43,7 @@ public class UnderscoreNamingConvention extends AbstractNamingConvention { * @param beanClass the bean class * @return the table name from class */ + @Override public TableName getTableNameByConvention(Class beanClass) { return new TableName(getCatalog(), getSchema(), toUnderscoreFromCamel(beanClass.getSimpleName())); @@ -53,6 +54,7 @@ public class UnderscoreNamingConvention extends AbstractNamingConvention { * * @return the column from property */ + @Override public String getColumnFromProperty(Class beanClass, String propertyName) { return toUnderscoreFromCamel(propertyName); @@ -65,6 +67,7 @@ public class UnderscoreNamingConvention extends AbstractNamingConvention { * @param dbColumnName the db column name * @return the property from column */ + @Override public String getPropertyFromColumn(Class beanClass, String dbColumnName) { return toCamelFromUnderscore(dbColumnName); } diff --git a/src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java b/src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java index 4e5f2072e..e4bee6ab9 100644 --- a/src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java +++ b/src/main/java/io/ebean/config/dbplatform/AbstractDbEncrypt.java @@ -39,6 +39,7 @@ public abstract class AbstractDbEncrypt implements DbEncrypt { * Null is returned if DB encryption of the type is not supported. *

*/ + @Override public DbEncryptFunction getDbEncryptFunction(int jdbcType) { switch (jdbcType) { case Types.VARCHAR: @@ -64,6 +65,7 @@ public abstract class AbstractDbEncrypt implements DbEncrypt { /** * Return the DB stored type for encrypted properties. */ + @Override public int getEncryptDbType() { return Types.VARBINARY; } @@ -71,6 +73,7 @@ public abstract class AbstractDbEncrypt implements DbEncrypt { /** * Generally encrypt function binding the data before the key (except h2). */ + @Override public boolean isBindEncryptDataFirst() { return true; } diff --git a/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java index f80bc6cc5..81f9b7625 100644 --- a/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/LimitOffsetSqlLimiter.java @@ -15,6 +15,7 @@ public class LimitOffsetSqlLimiter implements SqlLimiter { */ private static final String OFFSET = "offset"; + @Override public SqlLimitResponse limit(SqlLimitRequest request) { String dbSql = request.getDbSql(); diff --git a/src/main/java/io/ebean/config/dbplatform/RowNumberSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/RowNumberSqlLimiter.java index 3504ab437..9f6b4ad19 100644 --- a/src/main/java/io/ebean/config/dbplatform/RowNumberSqlLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/RowNumberSqlLimiter.java @@ -28,6 +28,7 @@ public class RowNumberSqlLimiter implements SqlLimiter { this("as limitresult"); } + @Override public SqlLimitResponse limit(SqlLimitRequest request) { String dbSql = request.getDbSql(); diff --git a/src/main/java/io/ebean/config/dbplatform/RownumSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/RownumSqlLimiter.java index 265e45f99..ef7656782 100644 --- a/src/main/java/io/ebean/config/dbplatform/RownumSqlLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/RownumSqlLimiter.java @@ -25,6 +25,7 @@ public class RownumSqlLimiter implements SqlLimiter { this.useFirstRowsHint = useFirstRowsHint; } + @Override public SqlLimitResponse limit(SqlLimitRequest request) { // select * diff --git a/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java index 2511b8b61..0c6399726 100644 --- a/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java +++ b/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java @@ -60,6 +60,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator { /** * Returns the sequence name. */ + @Override public String getName() { return seqName; } @@ -67,6 +68,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator { /** * Returns true. */ + @Override public boolean isDbSequence() { return true; } @@ -78,6 +80,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator { * beans Ebean can call this to ensure . *

*/ + @Override public void preAllocateIds(int allocateSize) { if (batchSize > 1 && allocateSize > batchSize) { // only bother if allocateSize is bigger than @@ -106,6 +109,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator { * If a Transaction has been passed in use the Connection from it. *

*/ + @Override public Object nextId(Transaction t) { synchronized (monitor) { diff --git a/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java index 0437f46e7..902579384 100644 --- a/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java +++ b/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java @@ -36,18 +36,22 @@ public class SimpleSequenceIdGenerator implements PlatformIdGenerator { this.seqName = seqName; } + @Override public String getName() { return seqName; } + @Override public boolean isDbSequence() { return true; } + @Override public void preAllocateIds(int batchSize) { // just ignore this } + @Override public Object nextId(Transaction t) { boolean useTxnConnection = t != null; diff --git a/src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java index 43daa34d7..788e4e396 100644 --- a/src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java +++ b/src/main/java/io/ebean/config/dbplatform/db2/DB2SequenceIdGenerator.java @@ -22,6 +22,7 @@ public class DB2SequenceIdGenerator extends SequenceIdGenerator { this.unionBaseSql = " union " + baseSql; } + @Override public String getSql(int batchSize) { StringBuilder sb = new StringBuilder(); diff --git a/src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java b/src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java index e4c00972a..ec7b1d9a7 100644 --- a/src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java +++ b/src/main/java/io/ebean/config/dbplatform/h2/H2DbEncrypt.java @@ -18,17 +18,20 @@ public class H2DbEncrypt extends AbstractDbEncrypt { /** * For H2 encrypt function returns false binding the key before the data. */ + @Override public boolean isBindEncryptDataFirst() { return false; } private static class H2VarcharFunction implements DbEncryptFunction { + @Override public String getDecryptSql(String columnWithTableAlias) { // Hmmm, this looks ugly - checking with H2 Database folks. return "TRIM(CHAR(0) FROM UTF8TOSTRING(DECRYPT('AES', STRINGTOUTF8(?), " + columnWithTableAlias + ")))"; } + @Override public String getEncryptBindSql() { return "ENCRYPT('AES', STRINGTOUTF8(?), STRINGTOUTF8(?))"; } @@ -37,10 +40,12 @@ public class H2DbEncrypt extends AbstractDbEncrypt { private static class H2DateFunction implements DbEncryptFunction { + @Override public String getDecryptSql(String columnWithTableAlias) { return "PARSEDATETIME(TRIM(CHAR(0) FROM UTF8TOSTRING(DECRYPT('AES', STRINGTOUTF8(?), " + columnWithTableAlias + "))),'yyyyMMdd')"; } + @Override public String getEncryptBindSql() { return "ENCRYPT('AES', STRINGTOUTF8(?), STRINGTOUTF8(FORMATDATETIME(?,'yyyyMMdd')))"; } diff --git a/src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java index ab4482614..4dafed231 100644 --- a/src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java +++ b/src/main/java/io/ebean/config/dbplatform/h2/H2SequenceIdGenerator.java @@ -22,6 +22,7 @@ public class H2SequenceIdGenerator extends SequenceIdGenerator { this.unionBaseSql = " union " + baseSql; } + @Override public String getSql(int batchSize) { StringBuilder sb = new StringBuilder(); diff --git a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java index 6dc3f2e60..2a22d8ab2 100644 --- a/src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java +++ b/src/main/java/io/ebean/config/dbplatform/mysql/MySqlDbEncrypt.java @@ -17,10 +17,12 @@ public class MySqlDbEncrypt extends AbstractDbEncrypt { private static class MyVarcharFunction implements DbEncryptFunction { + @Override public String getDecryptSql(String columnWithTableAlias) { return "CONVERT(AES_DECRYPT(" + columnWithTableAlias + ",?) USING UTF8)"; } + @Override public String getEncryptBindSql() { return "AES_ENCRYPT(?,?)"; } @@ -28,10 +30,12 @@ public class MySqlDbEncrypt extends AbstractDbEncrypt { private static class MyDateFunction implements DbEncryptFunction { + @Override public String getDecryptSql(String columnWithTableAlias) { return "STR_TO_DATE(AES_DECRYPT(" + columnWithTableAlias + ",?),'%Y%d%m')"; } + @Override public String getEncryptBindSql() { return "AES_ENCRYPT(DATE_FORMAT(?,'%Y%d%m'),?)"; } diff --git a/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java b/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java index bdfc5562b..e1194ac37 100644 --- a/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java +++ b/src/main/java/io/ebean/config/dbplatform/oracle/OracleDbEncrypt.java @@ -78,10 +78,12 @@ public class OracleDbEncrypt extends AbstractDbEncrypt { this.decryptfunction = decryptfunction; } + @Override public String getDecryptSql(String columnWithTableAlias) { return decryptfunction + "(" + columnWithTableAlias + ",?)"; } + @Override public String getEncryptBindSql() { return encryptfunction + "(?,?)"; } @@ -101,10 +103,12 @@ public class OracleDbEncrypt extends AbstractDbEncrypt { this.decryptfunction = decryptfunction; } + @Override public String getDecryptSql(String columnWithTableAlias) { return "to_date(" + decryptfunction + "(" + columnWithTableAlias + ",?),'YYYYMMDD')"; } + @Override public String getEncryptBindSql() { return encryptfunction + "(to_char(?,'YYYYMMDD'),?)"; } diff --git a/src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java index b5bc283b7..b0a7a2f70 100644 --- a/src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java +++ b/src/main/java/io/ebean/config/dbplatform/oracle/OracleSequenceIdGenerator.java @@ -20,6 +20,7 @@ public class OracleSequenceIdGenerator extends SequenceIdGenerator { this.baseSql = "select " + seqName + ".nextval, a from (select level as a FROM dual CONNECT BY level <= "; } + @Override public String getSql(int batchSize) { return baseSql + batchSize + ")"; } diff --git a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresDbEncrypt.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresDbEncrypt.java index a4e36f699..b2d24aaf3 100644 --- a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresDbEncrypt.java +++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresDbEncrypt.java @@ -15,10 +15,12 @@ public class PostgresDbEncrypt extends AbstractDbEncrypt { private static class PgVarcharFunction implements DbEncryptFunction { + @Override public String getDecryptSql(String columnWithTableAlias) { return "pgp_sym_decrypt(" + columnWithTableAlias + ",?)"; } + @Override public String getEncryptBindSql() { return "pgp_sym_encrypt(?,?)"; } @@ -26,10 +28,12 @@ public class PostgresDbEncrypt extends AbstractDbEncrypt { private static class PgDateFunction implements DbEncryptFunction { + @Override public String getDecryptSql(String columnWithTableAlias) { return "to_date(pgp_sym_decrypt(" + columnWithTableAlias + ",?),'YYYYMMDD')"; } + @Override public String getEncryptBindSql() { return "pgp_sym_encrypt(to_char(?::date,'YYYYMMDD'),?)"; } diff --git a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java index 374aa28d9..1ec7ef667 100644 --- a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java @@ -70,6 +70,7 @@ public class PostgresPlatform extends DatabasePlatform { dbTypeMap.put(DbType.LONGVARCHAR, dbTypeText); } + @Override protected void addGeoTypes(int srid) { dbTypeMap.put(DbType.POINT, geoType("point", srid)); dbTypeMap.put(DbType.POLYGON, geoType("polygon", srid)); @@ -86,6 +87,7 @@ public class PostgresPlatform extends DatabasePlatform { /** * Return a DdlHandler instance for generating DDL for the specific platform. */ + @Override public DdlHandler createDdlHandler(ServerConfig serverConfig) { return this.platformDdl.createDdlHandler(serverConfig); } diff --git a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java index e55334e35..d01a70db5 100644 --- a/src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java +++ b/src/main/java/io/ebean/config/dbplatform/postgres/PostgresSequenceIdGenerator.java @@ -20,6 +20,7 @@ public class PostgresSequenceIdGenerator extends SequenceIdGenerator { this.baseSql = "select nextval('" + seqName + "'), s.generate_series from (select generate_series from generate_series(1,"; } + @Override public String getSql(int batchSize) { return baseSql + batchSize + ") ) as s"; } diff --git a/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywhereLimiter.java b/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywhereLimiter.java index d07011808..a304fc8f8 100644 --- a/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywhereLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlanywhere/SqlAnywhereLimiter.java @@ -9,6 +9,7 @@ import io.ebean.config.dbplatform.SqlLimiter; */ public class SqlAnywhereLimiter implements SqlLimiter { + @Override public SqlLimitResponse limit(SqlLimitRequest request) { String dbSql = request.getDbSql(); diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005SqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005SqlLimiter.java index f73e41f37..cccef861e 100644 --- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005SqlLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServer2005SqlLimiter.java @@ -22,6 +22,7 @@ public class SqlServer2005SqlLimiter implements SqlLimiter { this("as limitresult"); } + @Override public SqlLimitResponse limit(SqlLimitRequest request) { StringBuilder sb = new StringBuilder(500); diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java index f8b7a70a3..0ca126b34 100644 --- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerSqlLimiter.java @@ -12,6 +12,7 @@ public class SqlServerSqlLimiter implements SqlLimiter { public SqlServerSqlLimiter() { } + @Override public SqlLimitResponse limit(SqlLimitRequest request) { String dbSql = request.getDbSql(); diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java index 138d15cc2..bf44201b9 100644 --- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java @@ -83,6 +83,7 @@ public class BaseDdlBuffer implements DdlBuffer { return this; } + @Override public String getBuffer() { return writer.toString(); } diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java index d41795317..dbd77ee90 100644 --- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DefaultConstraintMaxLength.java @@ -19,6 +19,7 @@ public class DefaultConstraintMaxLength implements DbConstraintNaming.MaxLength *

* This implementation should work well apart from perhaps DB2 where the limit is 18. */ + @Override public String maxLength(String constraintName, int count) { if (constraintName.length() < maxConstraintNameLength) { return constraintName; diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java index 33d5e873a..94109cb25 100644 --- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java @@ -31,6 +31,7 @@ public class HistoryTableUpdate { this.column = column; } + @Override public String toString() { return description(); } diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java index 75372efd7..692d575b7 100644 --- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/MySqlDdl.java @@ -49,12 +49,14 @@ public class MySqlDdl extends PlatformDdl { return null; } + @Override public String alterColumnNotnull(String tableName, String columnName, boolean notnull) { // can't alter itself - done in alterColumnBaseAttributes() return null; } + @Override public String alterColumnDefaultValue(String tableName, String columnName, String defaultValue) { String suffix = isDropDefault(defaultValue) ? columnDropDefault : columnSetDefault + " " + defaultValue; @@ -63,6 +65,7 @@ public class MySqlDdl extends PlatformDdl { return "alter table " + tableName + " alter " + columnName + " " + suffix; } + @Override public String alterColumnBaseAttributes(AlterColumn alter) { String tableName = alter.getTableName(); @@ -89,6 +92,7 @@ public class MySqlDdl extends PlatformDdl { } + @Override public void inlineTableComment(DdlBuffer apply, String tableComment) throws IOException { if (tableComment.length() > 1000) { tableComment = tableComment.substring(0, 1000); diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerDdl.java index 1ed1c1b60..6b5814274 100644 --- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerDdl.java @@ -64,6 +64,7 @@ public class SqlServerDdl extends PlatformDdl { } } + @Override public String alterColumnBaseAttributes(AlterColumn alter) { String tableName = alter.getTableName(); @@ -82,6 +83,7 @@ public class SqlServerDdl extends PlatformDdl { return null; } + @Override public String alterColumnNotnull(String tableName, String columnName, boolean notnull) { // can't alter itself - done in alterColumnBaseAttributes() @@ -91,6 +93,7 @@ public class SqlServerDdl extends PlatformDdl { /** * Add table comment as a separate statement (from the create table statement). */ + @Override public void addTableComment(DdlBuffer apply, String tableName, String tableComment) throws IOException { // do nothing for MS SQL Server (cause it requires stored procedures etc) @@ -99,6 +102,7 @@ public class SqlServerDdl extends PlatformDdl { /** * Add column comment as a separate statement. */ + @Override public void addColumnComment(DdlBuffer apply, String table, String column, String comment) throws IOException { // do nothing for MS SQL Server (cause it requires stored procedures etc) diff --git a/src/main/java/io/ebean/dbmigration/model/MigrationResource.java b/src/main/java/io/ebean/dbmigration/model/MigrationResource.java index 75d9f710c..0e70aced3 100644 --- a/src/main/java/io/ebean/dbmigration/model/MigrationResource.java +++ b/src/main/java/io/ebean/dbmigration/model/MigrationResource.java @@ -22,6 +22,7 @@ public class MigrationResource implements Comparable { this.version = version; } + @Override public String toString() { return migrationFile.getName(); } diff --git a/src/main/java/io/ebean/dbmigration/model/MigrationVersion.java b/src/main/java/io/ebean/dbmigration/model/MigrationVersion.java index e78d20308..6cad47b2a 100644 --- a/src/main/java/io/ebean/dbmigration/model/MigrationVersion.java +++ b/src/main/java/io/ebean/dbmigration/model/MigrationVersion.java @@ -59,6 +59,7 @@ public class MigrationVersion implements Comparable { return raw; } + @Override public String toString() { return raw; } diff --git a/src/main/java/io/ebean/dbmigration/model/build/ModelBuildBeanVisitor.java b/src/main/java/io/ebean/dbmigration/model/build/ModelBuildBeanVisitor.java index 4cd623802..dc9f09b5b 100644 --- a/src/main/java/io/ebean/dbmigration/model/build/ModelBuildBeanVisitor.java +++ b/src/main/java/io/ebean/dbmigration/model/build/ModelBuildBeanVisitor.java @@ -28,6 +28,7 @@ public class ModelBuildBeanVisitor implements BeanVisitor { * This creates an MTable and adds it to the model. *

*/ + @Override public ModelBuildPropertyVisitor visitBean(BeanDescriptor descriptor) { if (!descriptor.isInheritanceRoot()) { diff --git a/src/main/java/io/ebean/dbmigration/model/visitor/BaseTablePropertyVisitor.java b/src/main/java/io/ebean/dbmigration/model/visitor/BaseTablePropertyVisitor.java index 0244a8d28..73d489fb1 100644 --- a/src/main/java/io/ebean/dbmigration/model/visitor/BaseTablePropertyVisitor.java +++ b/src/main/java/io/ebean/dbmigration/model/visitor/BaseTablePropertyVisitor.java @@ -13,34 +13,40 @@ public abstract class BaseTablePropertyVisitor implements BeanPropertyVisitor { /** * Not required in that you can use the visitEmbeddedScalar. */ + @Override public void visitEmbedded(BeanPropertyAssocOne p) { } /** * Override this method. */ + @Override public abstract void visitEmbeddedScalar(BeanProperty p, BeanPropertyAssocOne embedded); /** * Not part of base table. */ + @Override public void visitMany(BeanPropertyAssocMany p) { } /** * Not part of base table. */ + @Override public void visitOneExported(BeanPropertyAssocOne p) { } /** * Override this method for the foreign key. */ + @Override public abstract void visitOneImported(BeanPropertyAssocOne p); /** * Override this method for normal scalar property. */ + @Override public abstract void visitScalar(BeanProperty p); } diff --git a/src/main/java/io/ebean/dbmigration/model/visitor/VisitAllUsing.java b/src/main/java/io/ebean/dbmigration/model/visitor/VisitAllUsing.java index a17497810..00716b711 100644 --- a/src/main/java/io/ebean/dbmigration/model/visitor/VisitAllUsing.java +++ b/src/main/java/io/ebean/dbmigration/model/visitor/VisitAllUsing.java @@ -137,6 +137,7 @@ public class VisitAllUsing { this.pv = pv; } + @Override public void visit(InheritInfo inheritInfo) { BeanProperty[] propertiesLocal = inheritInfo.desc().propertiesLocal(); for (BeanProperty aPropertiesLocal : propertiesLocal) { diff --git a/src/main/java/io/ebean/event/BeanPersistAdapter.java b/src/main/java/io/ebean/event/BeanPersistAdapter.java index 06056e7a8..6e38ce2aa 100644 --- a/src/main/java/io/ebean/event/BeanPersistAdapter.java +++ b/src/main/java/io/ebean/event/BeanPersistAdapter.java @@ -14,6 +14,7 @@ import io.ebean.config.ServerConfig; */ public abstract class BeanPersistAdapter implements BeanPersistController { + @Override public abstract boolean isRegisterFor(Class cls); /** @@ -21,6 +22,7 @@ public abstract class BeanPersistAdapter implements BeanPersistController { * BeanPersistController's are executed when there is multiple of them * registered for a given entity type (class). */ + @Override public int getExecutionOrder() { return 10; } @@ -28,6 +30,7 @@ public abstract class BeanPersistAdapter implements BeanPersistController { /** * Returns true indicating normal processing should continue. */ + @Override public boolean preDelete(BeanPersistRequest request) { return true; } @@ -35,6 +38,7 @@ public abstract class BeanPersistAdapter implements BeanPersistController { /** * Returns true indicating normal processing should continue. */ + @Override public boolean preInsert(BeanPersistRequest request) { return true; } @@ -42,6 +46,7 @@ public abstract class BeanPersistAdapter implements BeanPersistController { /** * Returns true indicating normal processing should continue. */ + @Override public boolean preUpdate(BeanPersistRequest request) { return true; } @@ -49,6 +54,7 @@ public abstract class BeanPersistAdapter implements BeanPersistController { /** * Returns true indicating normal processing should continue. */ + @Override public boolean preSoftDelete(BeanPersistRequest request) { return true; } @@ -56,24 +62,28 @@ public abstract class BeanPersistAdapter implements BeanPersistController { /** * Does nothing by default. */ + @Override public void postDelete(BeanPersistRequest request) { } /** * Does nothing by default. */ + @Override public void postInsert(BeanPersistRequest request) { } /** * Does nothing by default. */ + @Override public void postUpdate(BeanPersistRequest request) { } /** * Does nothing by default. */ + @Override public void postSoftDelete(BeanPersistRequest request) { } diff --git a/src/main/java/io/ebean/event/changelog/BeanChange.java b/src/main/java/io/ebean/event/changelog/BeanChange.java index 83df95e16..c7fe3186f 100644 --- a/src/main/java/io/ebean/event/changelog/BeanChange.java +++ b/src/main/java/io/ebean/event/changelog/BeanChange.java @@ -51,6 +51,7 @@ public class BeanChange { public BeanChange() { } + @Override public String toString() { return "table:" + table + " id:" + id + " values:" + values; } diff --git a/src/main/java/io/ebean/event/changelog/ChangeSet.java b/src/main/java/io/ebean/event/changelog/ChangeSet.java index 0891edb9d..252f4bcab 100644 --- a/src/main/java/io/ebean/event/changelog/ChangeSet.java +++ b/src/main/java/io/ebean/event/changelog/ChangeSet.java @@ -66,6 +66,7 @@ public class ChangeSet { public ChangeSet() { } + @Override public String toString() { return "txnId:" + txnId + " txnState:" + txnState + " txnBatch:" + txnBatch; } diff --git a/src/main/java/io/ebean/event/readaudit/ReadAuditQueryPlan.java b/src/main/java/io/ebean/event/readaudit/ReadAuditQueryPlan.java index 4bb284330..aff5aa656 100644 --- a/src/main/java/io/ebean/event/readaudit/ReadAuditQueryPlan.java +++ b/src/main/java/io/ebean/event/readaudit/ReadAuditQueryPlan.java @@ -29,6 +29,7 @@ public class ReadAuditQueryPlan { public ReadAuditQueryPlan() { } + @Override public String toString() { return "beanType:" + beanType + " queryKey:" + queryKey + " sql:" + sql; } diff --git a/src/main/java/io/ebean/text/PathProperties.java b/src/main/java/io/ebean/text/PathProperties.java index 642704cdb..3775ef6ee 100644 --- a/src/main/java/io/ebean/text/PathProperties.java +++ b/src/main/java/io/ebean/text/PathProperties.java @@ -46,6 +46,7 @@ public class PathProperties implements FetchPath { this.pathMap.put(null, rootProps); } + @Override public String toString() { return pathMap.toString(); } @@ -103,6 +104,7 @@ public class PathProperties implements FetchPath { /** * Apply these path properties as fetch paths to the query. */ + @Override public void apply(Query query) { for (Entry entry : pathMap.entrySet()) { @@ -179,6 +181,7 @@ public class PathProperties implements FetchPath { return path; } + @Override public String toString() { return propSet.toString(); } diff --git a/src/main/java/io/ebean/text/TimeStringParser.java b/src/main/java/io/ebean/text/TimeStringParser.java index fa185eafb..53ecab696 100644 --- a/src/main/java/io/ebean/text/TimeStringParser.java +++ b/src/main/java/io/ebean/text/TimeStringParser.java @@ -19,6 +19,7 @@ public final class TimeStringParser implements StringParser { /** * Parse the String supporting both HH:mm:ss and HH:mm formats. */ + @Override @SuppressWarnings("deprecation") public Object parse(String value) { if (value == null || value.trim().isEmpty()) { diff --git a/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java b/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java index 13e7f5f0e..b9c7daa46 100644 --- a/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java +++ b/src/main/java/io/ebean/text/csv/DefaultCsvCallback.java @@ -77,6 +77,7 @@ public class DefaultCsvCallback implements CsvCallback { /** * Create a transaction if required. */ + @Override public void begin(EbeanServer server) { this.server = server; this.startTime = System.currentTimeMillis(); @@ -92,6 +93,7 @@ public class DefaultCsvCallback implements CsvCallback { *

* By default this does nothing (effectively ignoring the heading). */ + @Override public void readHeader(String[] line) { } @@ -109,6 +111,7 @@ public class DefaultCsvCallback implements CsvCallback { * error). *

*/ + @Override public boolean processLine(int row, String[] line) { return true; } @@ -121,6 +124,7 @@ public class DefaultCsvCallback implements CsvCallback { * to use Cascade.PERSIST etc). *

*/ + @Override public void processBean(int row, String[] line, T bean) { // assumes single bean or Cascade.PERSIST will save any @@ -135,6 +139,7 @@ public class DefaultCsvCallback implements CsvCallback { /** * Commit the transaction if one was created. */ + @Override public void end(int row) { commitTransactionIfCreated(); @@ -146,6 +151,7 @@ public class DefaultCsvCallback implements CsvCallback { /** * Rollback the transaction if one was created. */ + @Override public void endWithError(int row, Exception e) { rollbackTransactionIfCreated(e); } diff --git a/src/main/java/io/ebean/text/json/EJsonReader.java b/src/main/java/io/ebean/text/json/EJsonReader.java index edf6652b6..9b00ed67f 100644 --- a/src/main/java/io/ebean/text/json/EJsonReader.java +++ b/src/main/java/io/ebean/text/json/EJsonReader.java @@ -304,22 +304,27 @@ class EJsonReader { map = new ModifyAwareMap<>(owner, new LinkedHashMap<>()); } + @Override public void popContext(Context temp) { setValue(temp.getValue()); } + @Override Object getValue() { return map; } + @Override void setKey(String key) { this.key = key; } + @Override void setValue(Object value) { map.put(key, value); } + @Override void setValueNull() { map.put(key, null); } @@ -337,22 +342,27 @@ class EJsonReader { values = new ModifyAwareList<>(owner, new ArrayList<>()); } + @Override public void popContext(Context temp) { values.add(temp.getValue()); } + @Override Object getValue() { return values; } + @Override void setValue(Object value) { values.add(value); } + @Override void setValueNull() { // ignore } + @Override void setKey(String key) { // not expected } diff --git a/src/main/java/io/ebeaninternal/api/BindParams.java b/src/main/java/io/ebeaninternal/api/BindParams.java index 9b848bc3c..2bd9e3515 100644 --- a/src/main/java/io/ebeaninternal/api/BindParams.java +++ b/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()); } diff --git a/src/main/java/io/ebeaninternal/api/HashQuery.java b/src/main/java/io/ebeaninternal/api/HashQuery.java index e58ff8226..c14cb88d7 100644 --- a/src/main/java/io/ebeaninternal/api/HashQuery.java +++ b/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; diff --git a/src/main/java/io/ebeaninternal/api/HashQueryPlan.java b/src/main/java/io/ebeaninternal/api/HashQueryPlan.java index 879592088..49cfb755d 100644 --- a/src/main/java/io/ebeaninternal/api/HashQueryPlan.java +++ b/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; diff --git a/src/main/java/io/ebeaninternal/api/HashQueryPlanBuilder.java b/src/main/java/io/ebeaninternal/api/HashQueryPlanBuilder.java index be337d202..71ccb9f36 100644 --- a/src/main/java/io/ebeaninternal/api/HashQueryPlanBuilder.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/api/ScopeTrans.java b/src/main/java/io/ebeaninternal/api/ScopeTrans.java index 0f4f1f390..cca956d60 100644 --- a/src/main/java/io/ebeaninternal/api/ScopeTrans.java +++ b/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 diff --git a/src/main/java/io/ebeaninternal/api/SpiQuery.java b/src/main/java/io/ebeaninternal/api/SpiQuery.java index 5dd405414..8f8f6fb27 100644 --- a/src/main/java/io/ebeaninternal/api/SpiQuery.java +++ b/src/main/java/io/ebeaninternal/api/SpiQuery.java @@ -275,6 +275,7 @@ public interface SpiQuery extends Query { /** * Return a copy of the query. */ + @Override SpiQuery copy(); /** @@ -650,11 +651,13 @@ public interface SpiQuery extends Query { /** * 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(); /** diff --git a/src/main/java/io/ebeaninternal/api/SpiUpdate.java b/src/main/java/io/ebeaninternal/api/SpiUpdate.java index 613e1f592..ebe8e5ab8 100644 --- a/src/main/java/io/ebeaninternal/api/SpiUpdate.java +++ b/src/main/java/io/ebeaninternal/api/SpiUpdate.java @@ -12,21 +12,25 @@ public interface SpiUpdate extends Update { */ 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"; } diff --git a/src/main/java/io/ebeaninternal/api/TransactionEventTable.java b/src/main/java/io/ebeaninternal/api/TransactionEventTable.java index 17a884b89..cde507c1a 100644 --- a/src/main/java/io/ebeaninternal/api/TransactionEventTable.java +++ b/src/main/java/io/ebeaninternal/api/TransactionEventTable.java @@ -18,6 +18,7 @@ public final class TransactionEventTable implements Serializable { private final Map 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; } diff --git a/src/main/java/io/ebeaninternal/server/autotune/AutoTuneService.java b/src/main/java/io/ebeaninternal/server/autotune/AutoTuneService.java index 05fd5d128..047eb9e08 100644 --- a/src/main/java/io/ebeaninternal/server/autotune/AutoTuneService.java +++ b/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(); /** diff --git a/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java b/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java index 9e71ec617..a9c49bcb3 100644 --- a/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java +++ b/src/main/java/io/ebeaninternal/server/autotune/service/DefaultAutoTuneService.java @@ -235,6 +235,7 @@ public class DefaultAutoTuneService implements AutoTuneService { * to the existing tuning. *

*/ + @Override public void reportProfiling() { saveProfilingOnShutdown(false); } diff --git a/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java index ee93cc1ce..030bf205a 100644 --- a/src/main/java/io/ebeaninternal/server/autotune/service/ProfileManager.java +++ b/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. *

*/ + @Override public void collectNodeUsage(NodeUsageCollector usageCollector) { ProfileOrigin profileOrigin = getProfileOrigin(usageCollector.getNode().getOriginQueryPoint()); diff --git a/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java b/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java index e19e8703f..6bbf32ce2 100644 --- a/src/main/java/io/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/autotune/service/TunedQueryInfo.java b/src/main/java/io/ebeaninternal/server/autotune/service/TunedQueryInfo.java index f8faa0952..374a8d722 100644 --- a/src/main/java/io/ebeaninternal/server/autotune/service/TunedQueryInfo.java +++ b/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(); } diff --git a/src/main/java/io/ebeaninternal/server/cache/CachedBeanData.java b/src/main/java/io/ebeaninternal/server/cache/CachedBeanData.java index eb1b3389a..930adae21 100644 --- a/src/main/java/io/ebeaninternal/server/cache/CachedBeanData.java +++ b/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(); } diff --git a/src/main/java/io/ebeaninternal/server/cache/CachedManyIds.java b/src/main/java/io/ebeaninternal/server/cache/CachedManyIds.java index 15fcf0d8f..155a43ff5 100644 --- a/src/main/java/io/ebeaninternal/server/cache/CachedManyIds.java +++ b/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(); } diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java index 4ce91d4e3..5a12d19d8 100644 --- a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java +++ b/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(); diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java index 23ce910b6..76ef67f71 100644 --- a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheFactory.java +++ b/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); diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java index ea399165c..09a100c69 100644 --- a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java +++ b/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 getCollectionIdsCache(Class beanType, String propertyName) { return cacheHolder.getCache(beanType, name(beanType) + "." + propertyName, ServerCacheType.COLLECTION_IDS); } + @Override public Supplier 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 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 getBeanCache(Class beanType) { return cacheHolder.getCache(beanType, name(beanType), ServerCacheType.BEAN); } diff --git a/src/main/java/io/ebeaninternal/server/core/CObjectGraphNodeStatistics.java b/src/main/java/io/ebeaninternal/server/core/CObjectGraphNodeStatistics.java index 2fbfaa9be..eb4aa2a16 100644 --- a/src/main/java/io/ebeaninternal/server/core/CObjectGraphNodeStatistics.java +++ b/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 + "]"; } diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java b/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java index 7cd0b1500..3e1b94d93 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultBackgroundExecutor.java +++ b/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(); diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java b/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java index b211c9159..22500ff17 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultBeanState.java +++ b/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 getLoadedProps() { return intercept.getLoadedPropertyNames(); } + @Override public Set getChangedProps() { return intercept.getDirtyPropertyNames(); } + @Override public Map 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(); } diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java b/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java index 60bd0e16a..f41919ce2 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultCallableSql.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java index 717112ad1..4f686a404 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java +++ b/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) { diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java b/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java index cf454f3cd..f1ceb982f 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java @@ -40,6 +40,7 @@ public class DefaultMetaInfoManager implements MetaInfoManager { return list; } + @Override public List collectNodeStatistics(boolean reset) { List list = new ArrayList<>(); diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 6c3ff080f..102d63290 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/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 CQuery compileQuery(Query query, Transaction t) { SpiOrmQueryRequest qr = createQueryRequest(Type.SUBQUERY, query, t); OrmQueryRequest orm = (OrmQueryRequest) 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 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. *

*/ + @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. *

*/ + @Override @SuppressWarnings("unchecked") public T createEntityBean(Class type) { BeanDescriptor desc = getBeanDescriptor(type); @@ -568,6 +590,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * then it will returned that object. *

*/ + @Override @SuppressWarnings({"unchecked", "rawtypes"}) public T getReference(Class 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. *

*/ + @Override public Transaction createTransaction(TxIsolation isolation) { return transactionManager.createTransaction(true, isolation.getLevel()); } + @Override public T execute(TxCallable c) { return execute(null, c); } + @Override public T execute(TxScope scope, TxCallable 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. *

*/ + @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. *

*/ + @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 { *

*

*/ + @Override public void endTransaction() { transactionScopeManager.end(); } @@ -858,11 +896,13 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * use. *

*/ + @Override public Object nextId(Class beanType) { BeanDescriptor desc = getBeanDescriptor(beanType); return desc.nextId(null); } + @Override @SuppressWarnings("unchecked") public void sort(List list, String sortByClause) { @@ -895,6 +935,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { return ((SpiQuery) query).validate(beanDescriptor); } + @Override public Filter filter(Class beanType) { BeanDescriptor desc = getBeanDescriptor(beanType); if (desc == null) { @@ -904,6 +945,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { return new ElFilter<>(desc); } + @Override public CsvReader createCsvReader(Class beanType) { BeanDescriptor descriptor = getBeanDescriptor(beanType); if (descriptor == null) { @@ -912,10 +954,12 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { return new TCsvReader<>(this, descriptor); } + @Override public UpdateQuery update(Class beanType) { return new DefaultUpdateQuery<>(createQuery(beanType)); } + @Override public Query find(Class beanType) { return createQuery(beanType); } @@ -957,6 +1001,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { return query; } + @Override public DefaultOrmQuery createQuery(Class beanType) { BeanDescriptor 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 Update createUpdate(Class 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 find(Class 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 find(Class 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 findUnique(Query query, Transaction transaction) { SpiQuery spiQuery = (SpiQuery) query; @@ -1157,6 +1210,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } } + @Override @SuppressWarnings({"unchecked", "rawtypes"}) public Set findSet(Query query, Transaction t) { @@ -1176,6 +1230,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } } + @Override @SuppressWarnings({"unchecked", "rawtypes"}) public Map findMap(Query query, Transaction t) { @@ -1213,12 +1268,14 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } } + @Override public int findCount(Query query, Transaction t) { SpiQuery copy = ((SpiQuery) query).copy(); return findCountWithCopy(copy, t); } + @Override public int findCountWithCopy(Query query, Transaction t) { SpiOrmQueryRequest request = createQueryRequest(Type.COUNT, query, t); @@ -1231,11 +1288,13 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } } + @Override public List findIds(Query query, Transaction t) { return findIdsWithCopy(((SpiQuery) query).copy(), t); } + @Override public List findIdsWithCopy(Query query, Transaction t) { SpiOrmQueryRequest request = createQueryRequest(Type.ID_LIST, query, t); @@ -1248,6 +1307,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } } + @Override public int delete(Query query, Transaction t) { SpiOrmQueryRequest request = createQueryRequest(Type.DELETE, query, t); @@ -1260,6 +1320,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } } + @Override public int update(Query query, Transaction t) { SpiOrmQueryRequest request = createQueryRequest(Type.UPDATE, query, t); @@ -1272,6 +1333,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } } + @Override public FutureRowCount findFutureCount(Query q, Transaction t) { SpiQuery copy = ((SpiQuery) q).copy(); @@ -1291,6 +1353,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { return findFutureCount(q, t); } + @Override public FutureIds findFutureIds(Query query, Transaction t) { SpiQuery copy = ((SpiQuery) query).copy(); @@ -1306,6 +1369,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { return queryFuture; } + @Override public FutureList findFutureList(Query query, Transaction t) { SpiQuery spiQuery = (SpiQuery) query; @@ -1343,6 +1407,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { return new LimitOffsetPagedList<>(this, spiQuery); } + @Override public QueryIterator findIterate(Query query, Transaction t) { SpiOrmQueryRequest request = createQueryRequest(Type.ITERATE, query, t); @@ -1356,6 +1421,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } } + @Override public void findEach(Query query, Consumer consumer, Transaction t) { SpiOrmQueryRequest 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 void findEachWhile(Query query, Predicate consumer, Transaction t) { SpiOrmQueryRequest request = createQueryRequest(Type.ITERATE, query, t); @@ -1396,6 +1463,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } } + @Override @SuppressWarnings("unchecked") public List findList(Query 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 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 List publish(Query 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> 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 BeanDescriptor getBeanDescriptor(Class 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> 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> 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> 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. *

*/ + @Override public CallStack createCallStack() { StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace(); diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java b/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java index 8b5ea418d..ea8a4c3cc 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index 037a24be1..f1e2c361b 100644 --- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -92,6 +92,7 @@ public final class OrmQueryRequest 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 extends BeanRequest implements BeanQueryRe /** * Return the BeanDescriptor for the associated bean. */ + @Override public BeanDescriptor getBeanDescriptor() { return beanDescriptor; } @@ -216,6 +218,7 @@ public final class OrmQueryRequest 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 extends BeanRequest implements BeanQueryRe * It ends the query only transaction. *

*/ + @Override public void endTransIfRequired() { if (createdTransaction) { transaction.commit(); @@ -282,6 +286,7 @@ public final class OrmQueryRequest 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 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 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 List findIds() { return queryEngine.findIds(this); } + @Override public void findEach(Consumer consumer) { try (QueryIterator it = queryEngine.findIterate(this)) { while (it.hasNext()) { @@ -316,6 +326,7 @@ public final class OrmQueryRequest extends BeanRequest implements BeanQueryRe } } + @Override public void findEachWhile(Predicate consumer) { try (QueryIterator it = queryEngine.findIterate(this)) { while (it.hasNext()) { @@ -326,6 +337,7 @@ public final class OrmQueryRequest extends BeanRequest implements BeanQueryRe } } + @Override public QueryIterator findIterate() { return queryEngine.findIterate(this); } @@ -333,11 +345,13 @@ public final class OrmQueryRequest extends BeanRequest implements BeanQueryRe /** * Execute the query as findList. */ + @Override @SuppressWarnings("unchecked") public List findList() { return (List) queryEngine.findMany(this); } + @Override public List> findVersions() { return queryEngine.findVersions(this); } @@ -345,6 +359,7 @@ public final class OrmQueryRequest extends BeanRequest implements BeanQueryRe /** * Execute the query as findSet. */ + @Override @SuppressWarnings("unchecked") public Set findSet() { return (Set) queryEngine.findMany(this); @@ -353,6 +368,7 @@ public final class OrmQueryRequest 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 extends BeanRequest implements BeanQueryRe /** * Return the find that is to be performed. */ + @Override public SpiQuery getQuery() { return query; } @@ -430,6 +447,7 @@ public final class OrmQueryRequest extends BeanRequest implements BeanQueryRe /** * Try to get the query result from the query cache. */ + @Override public BeanCollection getFromQueryCache() { if (!query.isUseQueryCache()) { diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequest.java b/src/main/java/io/ebeaninternal/server/core/PersistRequest.java index 918032895..0f828c52f 100644 --- a/src/main/java/io/ebeaninternal/server/core/PersistRequest.java +++ b/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(); } diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java index 6ca034b82..afcc0ebd3 100644 --- a/src/main/java/io/ebeaninternal/server/core/PersistRequestCallableSql.java +++ b/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()) { diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java index f4bc66eda..92818330b 100644 --- a/src/main/java/io/ebeaninternal/server/core/PersistRequestOrmUpdate.java +++ b/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(); diff --git a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java b/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java index fee7e76df..6e863cdfe 100644 --- a/src/main/java/io/ebeaninternal/server/core/PersistRequestUpdateSql.java +++ b/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()) { diff --git a/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java b/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java index 743aca4e1..e77aa24f2 100644 --- a/src/main/java/io/ebeaninternal/server/core/ServletContextListener.java +++ b/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) { } diff --git a/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java index 7c2f74942..ecf3afdc9 100644 --- a/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java @@ -21,6 +21,7 @@ public interface SpiOrmQueryRequest extends DocQueryRequest { /** * Return the query. */ + @Override SpiQuery getQuery(); /** diff --git a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java index 7cf4cc5d2..b15650e53 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/AssocOneHelpEmbedded.java +++ b/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); diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index 6e1562d38..e65a559da 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -596,6 +596,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { /** * 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 implements MetaBeanInfo, BeanType { /** * 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 implements MetaBeanInfo, BeanType { /** * Return the 'when modified' property if there is one defined. */ + @Override public BeanProperty getWhenModifiedProperty() { return whenModifiedProperty; } @@ -1530,6 +1533,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { /** * Return the 'when created' property if there is one defined. */ + @Override public BeanProperty getWhenCreatedProperty() { return whenCreatedProperty; } @@ -1830,6 +1834,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { /** * Return the short name of the entity bean. */ + @Override public String getName() { return name; } @@ -1837,6 +1842,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { /** * Summary description. */ + @Override public String toString() { return fullName; } @@ -2321,6 +2327,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { /** * Return the beanListener. */ + @Override public BeanPersistListener getPersistListener() { return persistListener; } @@ -2343,6 +2350,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { /** * Return the BeanQueryAdapter or null if none is defined. */ + @Override public BeanQueryAdapter getQueryAdapter() { return queryAdapter; } @@ -2429,6 +2437,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { /** * Return the Controller. */ + @Override public BeanPersistController getPersistController() { return persistController; } @@ -2461,6 +2470,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { * 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 implements MetaBeanInfo, BeanType { /** * Return the identity generation type. */ + @Override public IdType getIdType() { return idType; } @@ -2625,6 +2636,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { /** * Return the sequence name. */ + @Override public String getSequenceName() { return sequenceName; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index 5a7ea7161..bd25ccda7 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/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 BeanDescriptor getBeanDescriptor(Class entityType) { return (BeanDescriptor) descMap.get(entityType.getName()); @@ -274,14 +275,17 @@ public class BeanDescriptorManager implements BeanDescriptorMap { return (BeanDescriptor) 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()); diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java index ab56c714a..c2545d06f 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java +++ b/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"); } diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java index 81fa4971d..fbf668781 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java @@ -85,6 +85,7 @@ public final class BeanMapHelp implements BeanCollectionHelp { this.map = map; } + @Override public void addEntityBean(EntityBean bean) { Object keyValue = beanProperty.getValue(bean); map.put(keyValue, bean); diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index c5a4e0c88..23dfa610e 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java index 8ba10eabd..710bddfe4 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java @@ -144,6 +144,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty { /** * Return false. */ + @Override public boolean isScalar() { return false; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index 555881d03..ad9c989f8 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -127,6 +127,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc { this.jsonHelp = new BeanPropertyAssocManyJsonHelp(this); } + @Override public void initialise() { super.initialise(); @@ -268,6 +269,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc { } } + @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 extends BeanPropertyAssoc { /** * 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 extends BeanPropertyAssoc { 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 extends BeanPropertyAssoc { } } + @Override public void jsonRead(ReadJson readJson, EntityBean parentBean) throws IOException { jsonHelp.jsonRead(readJson, parentBean); } diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index 029c0e414..178a0a434 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -168,6 +168,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc { } } + @Override public ElPropertyValue buildElPropertyValue(String propName, String remainder, ElPropertyChainBuilder chain, boolean propertyDeploy) { if (embedded) { @@ -399,6 +400,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc { * 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 extends BeanPropertyAssoc { /** * Return the Id expression to add to where clause etc. */ + @Override public String getAssocIdExpression(String prefix, String operator) { return targetDescriptor.getIdBinder().getAssocOneIdExpr(prefix, operator); } diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java index 4d2221cf3..48702967a 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java @@ -61,6 +61,7 @@ public final class BeanSetHelp implements BeanCollectionHelp { } } + @Override public void add(BeanCollection collection, EntityBean bean, boolean withCheck) { if (withCheck) { collection.internalAddWithCheck(bean); diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java b/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java index 972ecfd45..32feaf137 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanTable.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java index d5e0efdab..2fc4a332f 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java +++ b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistController.java @@ -174,7 +174,8 @@ public class ChainedBeanPersistController implements BeanPersistController { */ private static class Sorter implements Comparator { - public int compare(BeanPersistController o1, BeanPersistController o2) { + @Override + public int compare(BeanPersistController o1, BeanPersistController o2) { int i1 = o1.getExecutionOrder() ; int i2 = o2.getExecutionOrder() ; diff --git a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java index 2dd0b5ee9..905169419 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanPersistListener.java +++ b/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 updatedProperties) { + @Override + public void updated(Object bean, Set updatedProperties) { for (BeanPersistListener aChain : chain) { aChain.updated(bean, updatedProperties); } diff --git a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java b/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java index b0d12312a..87b64c0c8 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java +++ b/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 { - public int compare(BeanQueryAdapter o1, BeanQueryAdapter o2) { + @Override + public int compare(BeanQueryAdapter o1, BeanQueryAdapter o2) { int i1 = o1.getExecutionOrder() ; int i2 = o2.getExecutionOrder() ; diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java index d1fc24cad..48060652f 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java +++ b/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 getIncludes() { return includes; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParserMap.java b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParserMap.java index 0ade33ff9..415ffd9d0 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParserMap.java +++ b/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 getIncludes() { return Collections.emptySet(); } + @Override public String convertWord() { String r = getDeployWord(word); return r == null ? word : r; diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java index 8f26809f5..e81578cd6 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/DeployUpdateParser.java +++ b/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(); diff --git a/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java b/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java index 6859eeafc..098b0f402 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java +++ b/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 + "]"; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java index a22f6acf0..ca671c114 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java +++ b/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(" "); diff --git a/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java b/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java index fad822aeb..fed73ce8a 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java +++ b/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); diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java index fe0fa1a12..10ccdfd0f 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounter.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java index 72ad7cb7c..01c33b649 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterInteger.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java index d10c6f9a8..830b9af15 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLong.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java index 0a2ada4dc..209500300 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertDate.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java index db3a589da..f56f97490 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertLong.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java index 11cd627df..abc7f963c 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertTimestamp.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java index 5b0339cd2..f9cd94659 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateDate.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java index b18934f18..2d4c85192 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateLong.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java b/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java index 26dff129e..f493401d8 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedUpdateTimestamp.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java index ae748a093..bc37212be 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java +++ b/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 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 diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java index 8cd0ec903..03ff6ecb0 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java +++ b/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 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 { } diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java index bd7a7963d..1072fbf23 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java +++ b/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 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)) { diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java index 4a58960d1..e5016608d 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java +++ b/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) { diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java index 98b7fca4f..6051d8b99 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java +++ b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java @@ -27,6 +27,7 @@ public final class ImportedIdSimple implements ImportedId, Comparable { + @Override public int compare(ImportedIdSimple o1, ImportedIdSimple o2) { return o1.compareTo(o2); } @@ -73,19 +74,23 @@ public final class ImportedIdSimple implements ImportedId, Comparable { private static class PropOrder implements Comparator { + @Override public int compare(DeployBeanProperty o1, DeployBeanProperty o2) { int v2 = o1.getSortOrder(); @@ -821,6 +822,7 @@ public class DeployBeanDescriptor { /** * Summary description. */ + @Override public String toString() { return getFullName(); } diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java index c6cf4c229..979831ab5 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java index 0fc738b82..3161e0dfc 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java index f80f77280..7d4804f3f 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoinColumn.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java index 0332082ef..41f8b3867 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java +++ b/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) { diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java index 901cd22a8..74c5789f7 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java +++ b/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()) { diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java index 91fdcf141..344d3d435 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java +++ b/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(); diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java index 66793a20b..0cb9c969a 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java +++ b/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()) { diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java index ec3f40551..90d8253d6 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java +++ b/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(); /** diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationSql.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationSql.java index fad15f283..773321511 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationSql.java +++ b/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); diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java index 925524f3a..a1ca4515b 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java @@ -30,6 +30,7 @@ public class DeployBeanInfo { this.descriptor = descriptor; } + @Override public String toString() { return String.valueOf(descriptor); } diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java index c5c9fd442..052a304b6 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java +++ b/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 + "]"; } diff --git a/src/main/java/io/ebeaninternal/server/el/ElComparator.java b/src/main/java/io/ebeaninternal/server/el/ElComparator.java index c5f7c3396..5dcd6ead0 100644 --- a/src/main/java/io/ebeaninternal/server/el/ElComparator.java +++ b/src/main/java/io/ebeaninternal/server/el/ElComparator.java @@ -10,6 +10,7 @@ public interface ElComparator extends Comparator { /** * Compare given 2 beans. */ + @Override int compare(T o1, T o2); /** diff --git a/src/main/java/io/ebeaninternal/server/el/ElComparatorCompound.java b/src/main/java/io/ebeaninternal/server/el/ElComparatorCompound.java index 3ce52a6e2..390de6d61 100644 --- a/src/main/java/io/ebeaninternal/server/el/ElComparatorCompound.java +++ b/src/main/java/io/ebeaninternal/server/el/ElComparatorCompound.java @@ -16,6 +16,7 @@ public final class ElComparatorCompound implements Comparator, ElComparato this.array = array; } + @Override public int compare(T o1, T o2) { for (ElComparator anArray : array) { @@ -28,6 +29,7 @@ public final class ElComparatorCompound implements Comparator, ElComparato return 0; } + @Override public int compareValue(Object value, T o2) { for (ElComparator anArray : array) { diff --git a/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java b/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java index 818e6fdcb..e142850cc 100644 --- a/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java +++ b/src/main/java/io/ebeaninternal/server/el/ElComparatorProperty.java @@ -19,6 +19,7 @@ public final class ElComparatorProperty implements Comparator, 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 implements Comparator, ElComparato return compareValues(val1, val2); } + @Override public int compareValue(Object value, T o2) { Object val2 = elGetValue.pathGet(o2); diff --git a/src/main/java/io/ebeaninternal/server/el/ElFilter.java b/src/main/java/io/ebeaninternal/server/el/ElFilter.java index 55fb3ef6b..4b205fb19 100644 --- a/src/main/java/io/ebeaninternal/server/el/ElFilter.java +++ b/src/main/java/io/ebeaninternal/server/el/ElFilter.java @@ -41,6 +41,7 @@ public final class ElFilter implements Filter { return beanDescriptor.getElGetValue(propertyName); } + @Override public Filter sort(String sortByClause) { this.sortByClause = sortByClause; return this; @@ -56,6 +57,7 @@ public final class ElFilter implements Filter { } + @Override public Filter in(String propertyName, Set matchingValues) { ElPropertyValue elGetValue = getElGetValue(propertyName); @@ -64,6 +66,7 @@ public final class ElFilter implements Filter { return this; } + @Override public Filter eq(String propertyName, Object value) { value = convertValue(propertyName, value); @@ -74,6 +77,7 @@ public final class ElFilter implements Filter { } + @Override public Filter ne(String propertyName, Object value) { value = convertValue(propertyName, value); @@ -83,6 +87,7 @@ public final class ElFilter implements Filter { return this; } + @Override public Filter between(String propertyName, Object min, Object max) { ElPropertyValue elGetValue = getElGetValue(propertyName); @@ -96,6 +101,7 @@ public final class ElFilter implements Filter { } + @Override public Filter gt(String propertyName, Object value) { value = convertValue(propertyName, value); @@ -105,6 +111,7 @@ public final class ElFilter implements Filter { return this; } + @Override public Filter ge(String propertyName, Object value) { value = convertValue(propertyName, value); @@ -114,6 +121,7 @@ public final class ElFilter implements Filter { return this; } + @Override public Filter ieq(String propertyName, String value) { ElPropertyValue elGetValue = getElGetValue(propertyName); @@ -123,6 +131,7 @@ public final class ElFilter implements Filter { } + @Override public Filter isNotNull(String propertyName) { ElPropertyValue elGetValue = getElGetValue(propertyName); @@ -132,6 +141,7 @@ public final class ElFilter implements Filter { } + @Override public Filter isNull(String propertyName) { ElPropertyValue elGetValue = getElGetValue(propertyName); @@ -141,6 +151,7 @@ public final class ElFilter implements Filter { } + @Override public Filter le(String propertyName, Object value) { value = convertValue(propertyName, value); @@ -151,6 +162,7 @@ public final class ElFilter implements Filter { } + @Override public Filter lt(String propertyName, Object value) { value = convertValue(propertyName, value); @@ -172,6 +184,7 @@ public final class ElFilter implements Filter { return this; } + @Override public Filter contains(String propertyName, String value) { String quote = ".*" + Pattern.quote(value) + ".*"; @@ -181,6 +194,7 @@ public final class ElFilter implements Filter { return this; } + @Override public Filter icontains(String propertyName, String value) { String quote = ".*" + Pattern.quote(value) + ".*"; @@ -191,6 +205,7 @@ public final class ElFilter implements Filter { } + @Override public Filter endsWith(String propertyName, String value) { ElPropertyValue elGetValue = getElGetValue(propertyName); @@ -198,6 +213,7 @@ public final class ElFilter implements Filter { return this; } + @Override public Filter startsWith(String propertyName, String value) { ElPropertyValue elGetValue = getElGetValue(propertyName); @@ -205,6 +221,7 @@ public final class ElFilter implements Filter { return this; } + @Override public Filter iendsWith(String propertyName, String value) { ElPropertyValue elGetValue = getElGetValue(propertyName); @@ -212,6 +229,7 @@ public final class ElFilter implements Filter { return this; } + @Override public Filter istartsWith(String propertyName, String value) { ElPropertyValue elGetValue = getElGetValue(propertyName); @@ -219,11 +237,13 @@ public final class ElFilter implements Filter { return this; } + @Override public Filter maxRows(int maxRows) { this.maxRows = maxRows; return this; } + @Override public List filter(List list) { if (sortByClause != null) { diff --git a/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java b/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java index 730798e14..79c88d1d3 100644 --- a/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java b/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java index 267fca5c4..b87a4099e 100644 --- a/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java +++ b/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); diff --git a/src/main/java/io/ebeaninternal/server/el/ElPropertyValue.java b/src/main/java/io/ebeaninternal/server/el/ElPropertyValue.java index d22585ce9..7f59fcc19 100644 --- a/src/main/java/io/ebeaninternal/server/el/ElPropertyValue.java +++ b/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(); /** diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java index 516964b69..269a65c61 100644 --- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java +++ b/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 propertyMap) { return new AllEqualsExpression(propertyMap); } @@ -441,6 +484,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory { * parameter. *

*/ + @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. *

*/ + @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 Junction conjunction(Query 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 Junction disjunction(Query 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 Junction conjunction(Query query, ExpressionList 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 Junction disjunction(Query query, ExpressionList parent) { return new JunctionExpression<>(Junction.Type.OR, query, parent); } diff --git a/src/main/java/io/ebeaninternal/server/idgen/UuidIdGenerator.java b/src/main/java/io/ebeaninternal/server/idgen/UuidIdGenerator.java index 12a1d3b28..06a0f8edc 100644 --- a/src/main/java/io/ebeaninternal/server/idgen/UuidIdGenerator.java +++ b/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 } diff --git a/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java b/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java index 942be926f..e3b4e0be0 100644 --- a/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java +++ b/src/main/java/io/ebeaninternal/server/lib/DaemonScheduleThreadPool.java @@ -36,6 +36,7 @@ public final class DaemonScheduleThreadPool extends ScheduledThreadPoolExecutor * working. *

*/ + @Override public void shutdown() { synchronized (this) { if (super.isShutdown()) { diff --git a/src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java b/src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java index 69c8b2067..6656c1fdd 100644 --- a/src/main/java/io/ebeaninternal/server/lib/DaemonThreadFactory.java +++ b/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); diff --git a/src/main/java/io/ebeaninternal/server/lib/ShutdownHook.java b/src/main/java/io/ebeaninternal/server/lib/ShutdownHook.java index 882796480..dd617e381 100644 --- a/src/main/java/io/ebeaninternal/server/lib/ShutdownHook.java +++ b/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(); } diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java index cb69a1843..8f98c38ba 100644 --- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java +++ b/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; } diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java index 09b74b8e9..be0099dc8 100644 --- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadContext.java +++ b/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); } diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java index 2684ca13c..f5412939f 100644 --- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadManyContext.java +++ b/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) { diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchDepthComparator.java b/src/main/java/io/ebeaninternal/server/persist/BatchDepthComparator.java index 5bec5c320..cbc3a3cb6 100644 --- a/src/main/java/io/ebeaninternal/server/persist/BatchDepthComparator.java +++ b/src/main/java/io/ebeaninternal/server/persist/BatchDepthComparator.java @@ -16,6 +16,7 @@ public class BatchDepthComparator implements Comparator, Seri private static final long serialVersionUID = 264611821665757991L; + @Override public int compare(BatchedBeanHolder b1, BatchedBeanHolder b2) { if (b1.getOrder() < b2.getOrder()) { diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java b/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java index 0dd343eed..b5fed8155 100644 --- a/src/main/java/io/ebeaninternal/server/persist/BatchedBeanHolder.java +++ b/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); diff --git a/src/main/java/io/ebeaninternal/server/persist/BindValues.java b/src/main/java/io/ebeaninternal/server/persist/BindValues.java index d10a6ebec..169c37d2b 100644 --- a/src/main/java/io/ebeaninternal/server/persist/BindValues.java +++ b/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); } diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java index 8d2cf2ed0..edaee965d 100644 --- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java +++ b/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); } diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index a5c63bfe0..cc5f4a8f0 100644 --- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/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); diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java index 2975fce3e..2b876df14 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersister.java +++ b/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); diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java b/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java index 0236d6574..ca3e8f8fa 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java @@ -19,6 +19,7 @@ public class DmlBeanPersisterFactory implements BeanPersisterFactory { /** * Create a DmlBeanPersister for the given bean type. */ + @Override public BeanPersister create(BeanDescriptor desc) { if (desc.isDocStoreOnly()) { diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java b/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java index 2a0ad38dc..23e687ea1 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/GenerateDmlRequest.java @@ -69,6 +69,7 @@ public class GenerateDmlRequest { return insertBindBuffer.toString(); } + @Override public String toString() { return sb.toString(); } diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java b/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java index f5290e20f..c641265b4 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java +++ b/src/main/java/io/ebeaninternal/server/persist/dml/UpdatePlan.java @@ -45,6 +45,7 @@ public class UpdatePlan implements SpiUpdatePlan { this.timeCreated = System.currentTimeMillis(); } + @Override public boolean isEmptySetClause() { return emptySetClause; } @@ -52,6 +53,7 @@ public class UpdatePlan implements SpiUpdatePlan { /** * Run the prepared statement binding for the 'update set' properties. */ + @Override public void bindSet(DmlHandler bind, EntityBean bean) throws SQLException { set.dmlBind(bind, bean); // atomic on 64 bit jvm @@ -61,6 +63,7 @@ public class UpdatePlan implements SpiUpdatePlan { /** * Return the time this plan was created. */ + @Override public long getTimeCreated() { return timeCreated; } @@ -68,6 +71,7 @@ public class UpdatePlan implements SpiUpdatePlan { /** * Return the time this plan was last used. */ + @Override public long getTimeLastUsed() { return timeLastUsed; } @@ -75,6 +79,7 @@ public class UpdatePlan implements SpiUpdatePlan { /** * Return the key. */ + @Override public String getKey() { return key; } @@ -82,6 +87,7 @@ public class UpdatePlan implements SpiUpdatePlan { /** * Return the concurrency mode for this plan. */ + @Override public ConcurrencyMode getMode() { return mode; } @@ -89,6 +95,7 @@ public class UpdatePlan implements SpiUpdatePlan { /** * Return the DML statement. */ + @Override public String getSql() { return sql; } @@ -96,6 +103,7 @@ public class UpdatePlan implements SpiUpdatePlan { /** * Return the Bindable properties for the update set. */ + @Override public Bindable getSet() { return set; } diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java index 023f4f268..9ccb00aea 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOne.java @@ -23,6 +23,7 @@ class BindableAssocOne implements Bindable { this.importedId = assocOne.getImportedId(); } + @Override public String toString() { return "BindableAssocOne " + assocOne; } @@ -32,16 +33,19 @@ class BindableAssocOne implements Bindable { return assocOne.isDraftOnly(); } + @Override public void addToUpdate(PersistRequestBean request, List list) { if (request.isAddToUpdate(assocOne)) { list.add(this); } } + @Override public void dmlAppend(GenerateDmlRequest request) { importedId.dmlAppend(request); } + @Override public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { EntityBean assocBean = (EntityBean) assocOne.getValue(bean); diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOneGeneratedInsert.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOneGeneratedInsert.java index 646684f50..f084b7998 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOneGeneratedInsert.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOneGeneratedInsert.java @@ -25,6 +25,7 @@ class BindableAssocOneGeneratedInsert extends BindableAssocOne { throw new RuntimeException("never called"); } + @Override public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { Object objectValue = generatedProperty.getInsertValue(assocOne, bean, request.now()); diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOneGeneratedUpdate.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOneGeneratedUpdate.java index 752f31394..302c806c8 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOneGeneratedUpdate.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableAssocOneGeneratedUpdate.java @@ -27,6 +27,7 @@ class BindableAssocOneGeneratedUpdate extends BindableAssocOne { } } + @Override public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { Object objectValue = generatedProperty.getUpdateValue(assocOne, bean, request.now()); diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java index 7006431e5..1079df8e0 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java @@ -24,6 +24,7 @@ public class BindableDiscriminator implements Bindable { this.sqlType = inheritInfo.getDiscriminatorType(); } + @Override public String toString() { return columnName + " = " + discValue; } diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java index fb077a66a..0f149ac76 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java @@ -23,6 +23,7 @@ public class BindableEmbedded implements Bindable { this.items = bindList.toArray(new Bindable[bindList.size()]); //this.props = propList.toArray(new BeanProperty[propList.size()]); } + @Override public String toString() { return "BindableEmbedded " + embProp + " items:" + Arrays.toString(items); } @@ -32,6 +33,7 @@ public class BindableEmbedded implements Bindable { return embProp.isDraftOnly(); } + @Override public void dmlAppend(GenerateDmlRequest request) { for (Bindable item : items) { @@ -39,12 +41,14 @@ public class BindableEmbedded implements Bindable { } } + @Override public void addToUpdate(PersistRequestBean request, List list) { if (request.isAddToUpdate(embProp)) { list.add(this); } } + @Override public void dmlBind(BindableRequest bindRequest, EntityBean bean) throws SQLException { // get the embedded bean diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java index b57010d1d..b855fef00 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java @@ -23,6 +23,7 @@ public class BindableEncryptedProperty implements Bindable { this.bindEncryptDataFirst = bindEncryptDataFirst; } + @Override public String toString() { return prop.toString(); } @@ -32,12 +33,14 @@ public class BindableEncryptedProperty implements Bindable { return prop.isDraftOnly(); } + @Override public void addToUpdate(PersistRequestBean request, List list) { if (request.isAddToUpdate(prop)) { list.add(this); } } + @Override public void dmlAppend(GenerateDmlRequest request) { // columnName = AES_ENCRYPT(?,?) @@ -48,6 +51,7 @@ public class BindableEncryptedProperty implements Bindable { /** * Bind a value in a Insert SET clause. */ + @Override public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { Object value = null; diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java index 3a13f3ab7..c415eb943 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java @@ -34,14 +34,17 @@ public final class BindableIdEmbedded implements BindableId { return false; } + @Override public boolean isEmpty() { return false; } + @Override public boolean isConcatenated() { return true; } + @Override public String getIdentityColumn() { // return null for concatenated keys return null; @@ -55,10 +58,12 @@ public final class BindableIdEmbedded implements BindableId { /** * Does nothing for BindableId. */ + @Override public void addToUpdate(PersistRequestBean request, List list) { // do nothing (id not changing) } + @Override public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { EntityBean idValue = (EntityBean) embId.getValue(bean); @@ -72,12 +77,14 @@ public final class BindableIdEmbedded implements BindableId { request.setIdValue(idValue); } + @Override public void dmlAppend(GenerateDmlRequest request) { for (BeanProperty prop : props) { request.appendColumn(prop.getDbColumn()); } } + @Override public boolean deriveConcatenatedId(PersistRequestBean persist) { if (matches == null) { diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java index 62b7fd730..2aee79b73 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java @@ -9,6 +9,7 @@ import java.util.List; public class BindableIdEmpty implements BindableId { + @Override public boolean isEmpty() { return true; } @@ -18,26 +19,32 @@ public class BindableIdEmpty implements BindableId { return false; } + @Override public void addToUpdate(PersistRequestBean request, List list) { // nothing } + @Override public void dmlAppend(GenerateDmlRequest request) { // nothing } + @Override public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { // nothing } + @Override public boolean isConcatenated() { return false; } + @Override public String getIdentityColumn() { return null; } + @Override public boolean deriveConcatenatedId(PersistRequestBean persist) { return false; } diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java index ec30ff289..4d0538f4a 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java @@ -20,14 +20,17 @@ public final class BindableIdScalar implements BindableId { this.uidProp = uidProp; } + @Override public boolean isEmpty() { return false; } + @Override public boolean isConcatenated() { return false; } + @Override public String getIdentityColumn() { return uidProp.getDbColumn(); } @@ -45,6 +48,7 @@ public final class BindableIdScalar implements BindableId { /** * Does nothing for BindableId. */ + @Override public void addToUpdate(PersistRequestBean request, List list) { // do nothing (id not changing) } @@ -52,15 +56,18 @@ public final class BindableIdScalar implements BindableId { /** * Should not be called as this is really only for concatenated keys. */ + @Override public boolean deriveConcatenatedId(PersistRequestBean persist) { throw new PersistenceException("Should not be called? only for concatinated keys"); } + @Override public void dmlAppend(GenerateDmlRequest request) { request.appendColumn(uidProp.getDbColumn()); } + @Override public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { Object value = uidProp.getValue(bean); diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java index 00b659a67..2c76a1c52 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableList.java @@ -42,18 +42,21 @@ public class BindableList implements Bindable { Collections.addAll(list, items); } + @Override public void addToUpdate(PersistRequestBean request, List list) { for (Bindable item : items) { item.addToUpdate(request, list); } } + @Override public void dmlAppend(GenerateDmlRequest request) { for (Bindable item : items) { item.dmlAppend(request); } } + @Override public void dmlBind(BindableRequest bindRequest, EntityBean bean) throws SQLException { for (Bindable item : items) { item.dmlBind(bindRequest, bean); diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java index 5f026b117..bc0840ce2 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableProperty.java @@ -19,6 +19,7 @@ public class BindableProperty implements Bindable { this.prop = prop; } + @Override public String toString() { return prop.toString(); } @@ -28,12 +29,14 @@ public class BindableProperty implements Bindable { return prop.isDraftOnly(); } + @Override public void addToUpdate(PersistRequestBean request, List list) { if (request.isAddToUpdate(prop)) { list.add(this); } } + @Override public void dmlAppend(GenerateDmlRequest request) { request.appendColumn(prop.getDbColumn()); } @@ -41,6 +44,7 @@ public class BindableProperty implements Bindable { /** * Normal binding of a property value from the bean. */ + @Override public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { Object value = null; diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java index 9d8775eab..3719b58e0 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java @@ -22,6 +22,7 @@ public class BindablePropertyInsertGenerated extends BindableProperty { this.gen = gen; } + @Override public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { Object value = gen.getInsertValue(prop, bean, request.now()); diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java index c95ae3746..01d798cd3 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java @@ -27,12 +27,14 @@ public class BindablePropertyUpdateGenerated extends BindableProperty { /** * Add BindablePropertyUpdateGenerated if the property is loaded. */ + @Override public void addToUpdate(PersistRequestBean request, List list) { if (gen.includeInAllUpdates() || request.isLoadedProperty(prop)) { list.add(this); } } + @Override public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { Object value = gen.getUpdateValue(prop, bean, request.now()); diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java index 1cb036507..4e94b85d2 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java @@ -33,6 +33,7 @@ public class BindableUnidirectional implements Bindable { } + @Override public String toString() { return "BindableShadowFKey " + unidirectional; } @@ -42,16 +43,19 @@ public class BindableUnidirectional implements Bindable { return false; } + @Override public void addToUpdate(PersistRequestBean request, List list) { throw new PersistenceException("Never called (for insert only)"); } + @Override public void dmlAppend(GenerateDmlRequest request) { // always included (in insert) importedId.dmlAppend(request); } + @Override public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { PersistRequestBean persistRequest = request.getPersistRequest(); diff --git a/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java b/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java index 86fb51b8c..e00fdf497 100644 --- a/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java +++ b/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java @@ -25,6 +25,7 @@ public class BeanPropertiesReader { return props; } + @Override public String toString() { return Arrays.toString(props); } diff --git a/src/main/java/io/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java b/src/main/java/io/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java index f7a517974..e4d9e9839 100644 --- a/src/main/java/io/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java +++ b/src/main/java/io/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java @@ -31,6 +31,7 @@ public final class EnhanceBeanPropertyAccess implements BeanPropertyAccess { return setters; } + @Override public BeanPropertyGetter getGetter(int position) { if (position < CACHE_SIZE) { return getters[position]; @@ -38,6 +39,7 @@ public final class EnhanceBeanPropertyAccess implements BeanPropertyAccess { return new Getter(position); } + @Override public BeanPropertySetter getSetter(int position) { if (position < CACHE_SIZE) { return setters[position]; @@ -53,10 +55,12 @@ public final class EnhanceBeanPropertyAccess implements BeanPropertyAccess { this.fieldIndex = fieldIndex; } + @Override public Object get(EntityBean bean) { return bean._ebean_getField(fieldIndex); } + @Override public Object getIntercept(EntityBean bean) { return bean._ebean_getFieldIntercept(fieldIndex); } @@ -70,10 +74,12 @@ public final class EnhanceBeanPropertyAccess implements BeanPropertyAccess { this.fieldIndex = fieldIndex; } + @Override public void set(EntityBean bean, Object value) { bean._ebean_setField(fieldIndex, value); } + @Override public void setIntercept(EntityBean bean, Object value) { bean._ebean_setFieldIntercept(fieldIndex, value); } diff --git a/src/main/java/io/ebeaninternal/server/query/BaseFuture.java b/src/main/java/io/ebeaninternal/server/query/BaseFuture.java index 9e22a459f..93c86fe7b 100644 --- a/src/main/java/io/ebeaninternal/server/query/BaseFuture.java +++ b/src/main/java/io/ebeaninternal/server/query/BaseFuture.java @@ -20,22 +20,27 @@ abstract class BaseFuture implements Future { this.futureTask = futureTask; } + @Override public boolean cancel(boolean mayInterruptIfRunning) { return futureTask.cancel(mayInterruptIfRunning); } + @Override public T get() throws InterruptedException, ExecutionException { return futureTask.get(); } + @Override public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { return futureTask.get(timeout, unit); } + @Override public boolean isCancelled() { return futureTask.isCancelled(); } + @Override public boolean isDone() { return futureTask.isDone(); } diff --git a/src/main/java/io/ebeaninternal/server/query/CQuery.java b/src/main/java/io/ebeaninternal/server/query/CQuery.java index bd9276297..fe8bd8cc7 100644 --- a/src/main/java/io/ebeaninternal/server/query/CQuery.java +++ b/src/main/java/io/ebeaninternal/server/query/CQuery.java @@ -252,10 +252,12 @@ public class CQuery implements DbReadContext, CancelableQuery { return disableLazyLoading; } + @Override public Boolean isReadOnly() { return readOnly; } + @Override public void propagateState(Object e) { if (Boolean.TRUE.equals(readOnly)) { if (e instanceof EntityBean) { @@ -264,10 +266,12 @@ public class CQuery implements DbReadContext, CancelableQuery { } } + @Override public DataReader getDataReader() { return dataReader; } + @Override public Mode getQueryMode() { return queryMode; } @@ -280,6 +284,7 @@ public class CQuery implements DbReadContext, CancelableQuery { return request; } + @Override public void cancel() { synchronized (this) { this.cancelled = true; @@ -394,10 +399,12 @@ public class CQuery implements DbReadContext, CancelableQuery { /** * Return the persistence context. */ + @Override public PersistenceContext getPersistenceContext() { return request.getPersistenceContext(); } + @Override public void setLazyLoadedChildBean(EntityBean bean, Object lazyLoadParentId) { if (lazyLoadParentId != null) { @@ -596,12 +603,14 @@ public class CQuery implements DbReadContext, CancelableQuery { } } + @Override public void register(String path, EntityBeanIntercept ebi) { path = getPath(path); request.getGraphContext().register(path, ebi); } + @Override public void register(String path, BeanCollection bc) { path = getPath(path); @@ -611,6 +620,7 @@ public class CQuery implements DbReadContext, CancelableQuery { /** * Return true if this is a raw sql query as opposed to Ebean generated sql. */ + @Override public boolean isRawSql() { return rawSql; } @@ -626,6 +636,7 @@ public class CQuery implements DbReadContext, CancelableQuery { * Return the property that is associated with the many. There can only be one * per SqlSelect. This can be null. */ + @Override public BeanPropertyAssocMany getManyProperty() { return manyProperty; } @@ -686,6 +697,7 @@ public class CQuery implements DbReadContext, CancelableQuery { * This is true for all queries except lazy load bean queries. *

*/ + @Override public boolean isAutoTuneProfiling() { // need query.isProfiling() because we just take the data // from the lazy loaded or refreshed beans and put it into the already @@ -709,12 +721,14 @@ public class CQuery implements DbReadContext, CancelableQuery { } } + @Override public void profileBean(EntityBeanIntercept ebi, String prefix) { ObjectGraphNode node = request.getGraphContext().getObjectGraphNode(prefix); ebi.setNodeUsageCollector(new NodeUsageCollector(node, profilingListenerRef)); } + @Override public void setCurrentPrefix(String currentPrefix, Map currentPathMap) { this.currentPrefix = currentPrefix; this.currentPathMap = currentPathMap; diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java b/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java index 93710f4b7..32f7eddff 100644 --- a/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryIteratorSimple.java @@ -20,6 +20,7 @@ class CQueryIteratorSimple implements QueryIterator { this.request = request; } + @Override public boolean hasNext() { try { request.flushPersistenceContextOnIterate(); @@ -29,17 +30,20 @@ class CQueryIteratorSimple implements QueryIterator { } } + @Override @SuppressWarnings("unchecked") public T next() { return (T) cquery.next(); } + @Override public void close() { cquery.updateExecutionStatistics(); cquery.close(); request.endTransIfRequired(); } + @Override public void remove() { throw new PersistenceException("Remove not allowed"); } diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java b/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java index e45aa24b3..8ba3fd58c 100644 --- a/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryIteratorWithBuffer.java @@ -26,6 +26,7 @@ class CQueryIteratorWithBuffer implements QueryIterator { this.buffer = new ArrayList<>(bufferSize); } + @Override @SuppressWarnings("unchecked") public boolean hasNext() { try { @@ -50,16 +51,19 @@ class CQueryIteratorWithBuffer implements QueryIterator { } } + @Override public T next() { return buffer.remove(0); } + @Override public void close() { cquery.updateExecutionStatistics(); cquery.close(); request.endTransIfRequired(); } + @Override public void remove() { throw new PersistenceException("Remove not allowed"); } diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java index 701bdd0a8..638795e3c 100644 --- a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java @@ -124,6 +124,7 @@ public class CQueryPlan { return new RawSqlQueryPlanKey(sql, rawSql, rowNumberIncluded, logWhereSql); } + @Override public String toString() { return beanType + " hash:" + planKey; } diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java index fc731eadd..7f78383de 100644 --- a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java @@ -143,6 +143,7 @@ public final class CQueryPlanStats { this.count = count; } + @Override public String toString() { return "node[" + objectGraphNode + "] count[" + count + "]"; } @@ -185,6 +186,7 @@ public final class CQueryPlanStats { this.origins = origins; } + @Override public String toString() { return queryPlan + " count:" + count + " time:" + totalTime + " maxTime:" + maxTime + " beans:" + totalBeans + " start:" + startTime + " lastQuery:" + lastQueryTime + " origins:" + origins; diff --git a/src/main/java/io/ebeaninternal/server/query/CallableQueryCount.java b/src/main/java/io/ebeaninternal/server/query/CallableQueryCount.java index 9747a67ba..d9486b2b1 100644 --- a/src/main/java/io/ebeaninternal/server/query/CallableQueryCount.java +++ b/src/main/java/io/ebeaninternal/server/query/CallableQueryCount.java @@ -24,6 +24,7 @@ public class CallableQueryCount extends CallableQuery implements Callable< /** * Execute the query returning the row count. */ + @Override public Integer call() throws Exception { try { return server.findCountWithCopy(query, transaction); diff --git a/src/main/java/io/ebeaninternal/server/query/CallableQueryIds.java b/src/main/java/io/ebeaninternal/server/query/CallableQueryIds.java index 1d9eaab17..fd4c3ac64 100644 --- a/src/main/java/io/ebeaninternal/server/query/CallableQueryIds.java +++ b/src/main/java/io/ebeaninternal/server/query/CallableQueryIds.java @@ -22,6 +22,7 @@ public class CallableQueryIds extends CallableQuery implements Callable
  • call() throws Exception { // we have already made a copy of the query // this way the same query instance is available to the diff --git a/src/main/java/io/ebeaninternal/server/query/CallableQueryList.java b/src/main/java/io/ebeaninternal/server/query/CallableQueryList.java index 083ba1d9d..9e638d942 100644 --- a/src/main/java/io/ebeaninternal/server/query/CallableQueryList.java +++ b/src/main/java/io/ebeaninternal/server/query/CallableQueryList.java @@ -22,6 +22,7 @@ public class CallableQueryList extends CallableQuery implements Callable call() throws Exception { try { return server.findList(query, transaction); diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java index 4600f70b4..726558216 100644 --- a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java +++ b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java @@ -71,6 +71,7 @@ class DefaultDbSqlContext implements DbSqlContext { this.useColumnAlias = false; } + @Override public void addEncryptedProp(BeanProperty p) { if (encryptedProps == null) { encryptedProps = new ArrayList<>(); @@ -78,6 +79,7 @@ class DefaultDbSqlContext implements DbSqlContext { encryptedProps.add(p); } + @Override public BeanProperty[] getEncryptedProps() { if (encryptedProps == null) { return null; @@ -86,18 +88,22 @@ class DefaultDbSqlContext implements DbSqlContext { return encryptedProps.toArray(new BeanProperty[encryptedProps.size()]); } + @Override public String peekJoin() { return joinStack.peek(); } + @Override public void popJoin() { joinStack.pop(); } + @Override public void pushJoin(String node) { joinStack.push(node); } + @Override public void addJoin(String type, String table, TableJoinColumn[] cols, String a1, String a2, String inheritance) { if (tableJoins == null) { @@ -179,44 +185,53 @@ class DefaultDbSqlContext implements DbSqlContext { return draftSupport != null; } + @Override public String getTableAlias(String prefix) { return alias.getTableAlias(prefix); } + @Override public String getTableAliasManyWhere(String prefix) { return alias.getTableAliasManyWhere(prefix); } + @Override public void pushSecondaryTableAlias(String alias) { tableAliasStack.push(alias); } + @Override public String getRelativePrefix(String propName) { return currentPrefix == null ? propName : currentPrefix + "." + propName; } + @Override public void pushTableAlias(String prefix) { prefixStack.push(currentPrefix); currentPrefix = prefix; tableAliasStack.push(getTableAlias(prefix)); } + @Override public void popTableAlias() { tableAliasStack.pop(); currentPrefix = prefixStack.pop(); } + @Override public DefaultDbSqlContext append(String s) { sb.append(s); return this; } + @Override public DefaultDbSqlContext append(char s) { sb.append(s); return this; } + @Override public void appendFormulaJoin(String sqlFormulaJoin, SqlJoinType joinType) { // replace ${ta} place holder with the real table alias... @@ -247,6 +262,7 @@ class DefaultDbSqlContext implements DbSqlContext { sb.append(" "); } + @Override public void appendFormulaSelect(String sqlFormulaSelect) { String tableAlias = tableAliasStack.peek(); @@ -282,10 +298,12 @@ class DefaultDbSqlContext implements DbSqlContext { columnIndex++; } + @Override public void appendColumn(String column) { appendColumn(tableAliasStack.peek(), column); } + @Override public void appendColumn(String tableAlias, String column) { sb.append(COMMA); @@ -302,10 +320,12 @@ class DefaultDbSqlContext implements DbSqlContext { appendColumnAlias(); } + @Override public String peekTableAlias() { return tableAliasStack.peek(); } + @Override public void appendRawColumn(String rawcolumnWithTableAlias) { sb.append(COMMA); sb.append(rawcolumnWithTableAlias); @@ -313,16 +333,19 @@ class DefaultDbSqlContext implements DbSqlContext { appendColumnAlias(); } + @Override public int length() { return sb.length(); } + @Override public String getContent() { String s = sb.toString(); sb = new StringBuilder(STRING_BUILDER_INITIAL_CAPACITY); return s; } + @Override public String toString() { return "DefaultDbSqlContext: " + sb.toString(); } diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java index 45e1b9e2a..806977ce2 100644 --- a/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java +++ b/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java @@ -46,24 +46,28 @@ public class DefaultOrmQueryEngine implements OrmQueryEngine { } } + @Override public int delete(OrmQueryRequest request) { flushJdbcBatchOnQuery(request); return queryEngine.delete(request); } + @Override public int update(OrmQueryRequest request) { flushJdbcBatchOnQuery(request); return queryEngine.update(request); } + @Override public int findCount(OrmQueryRequest request) { flushJdbcBatchOnQuery(request); return queryEngine.findCount(request); } + @Override public List findIds(OrmQueryRequest request) { flushJdbcBatchOnQuery(request); @@ -76,6 +80,7 @@ public class DefaultOrmQueryEngine implements OrmQueryEngine { return queryEngine.findSingleAttributeList(request); } + @Override public QueryIterator findIterate(OrmQueryRequest request) { // LIMITATION: You can not use QueryIterator to load bean cache @@ -91,6 +96,7 @@ public class DefaultOrmQueryEngine implements OrmQueryEngine { return queryEngine.findVersions(request); } + @Override public BeanCollection findMany(OrmQueryRequest request) { flushJdbcBatchOnQuery(request); @@ -127,6 +133,7 @@ public class DefaultOrmQueryEngine implements OrmQueryEngine { /** * Find a single bean using its unique id. */ + @Override public T findId(OrmQueryRequest request) { flushJdbcBatchOnQuery(request); diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java index 5712ae100..7447983db 100644 --- a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java +++ b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java @@ -68,6 +68,7 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine { } } + @Override public List findList(RelationalQueryRequest request) { long startTime = System.currentTimeMillis(); diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java b/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java index af3e226ee..df7fe5d31 100644 --- a/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java +++ b/src/main/java/io/ebeaninternal/server/query/DefaultSqlRow.java @@ -55,6 +55,7 @@ public class DefaultSqlRow implements SqlRow { this.dbTrueValue = dbTrueValue; } + @Override public Iterator keys() { return map.keySet().iterator(); } @@ -66,18 +67,22 @@ public class DefaultSqlRow implements SqlRow { return ((String) name).toLowerCase(); } + @Override public Object remove(Object name) { return map.remove(asKey(name)); } + @Override public Object get(Object name) { return map.get(asKey(name)); } + @Override public Object put(String name, Object value) { return setInternal(name, value); } + @Override public Object set(String name, Object value) { return setInternal(name, value); } @@ -86,50 +91,62 @@ public class DefaultSqlRow implements SqlRow { return map.put(name.toLowerCase(), newValue); } + @Override public UUID getUUID(String name) { return BasicTypeConverter.toUUID(get(name)); } + @Override public Boolean getBoolean(String name) { return BasicTypeConverter.toBoolean(get(name), dbTrueValue); } + @Override public Integer getInteger(String name) { return BasicTypeConverter.toInteger(get(name)); } + @Override public BigDecimal getBigDecimal(String name) { return BasicTypeConverter.toBigDecimal(get(name)); } + @Override public Long getLong(String name) { return BasicTypeConverter.toLong(get(name)); } + @Override public Double getDouble(String name) { return BasicTypeConverter.toDouble(get(name)); } + @Override public Float getFloat(String name) { return BasicTypeConverter.toFloat(get(name)); } + @Override public String getString(String name) { return BasicTypeConverter.toString(get(name)); } + @Override public java.util.Date getUtilDate(String name) { return BasicTypeConverter.toUtilDate(get(name)); } + @Override public Date getDate(String name) { return BasicTypeConverter.toDate(get(name)); } + @Override public Timestamp getTimestamp(String name) { return BasicTypeConverter.toTimestamp(get(name)); } + @Override public String toString() { return map.toString(); } @@ -137,38 +154,47 @@ public class DefaultSqlRow implements SqlRow { // ------------------------------------ // Normal map methods... + @Override public void clear() { map.clear(); } + @Override public boolean containsKey(Object key) { return map.containsKey(asKey(key)); } + @Override public boolean containsValue(Object value) { return map.containsValue(value); } + @Override public Set> entrySet() { return map.entrySet(); } + @Override public boolean isEmpty() { return map.isEmpty(); } + @Override public Set keySet() { return map.keySet(); } + @Override public void putAll(Map t) { map.putAll(t); } + @Override public int size() { return map.size(); } + @Override public Collection values() { return map.values(); } diff --git a/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java b/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java index 923dc1256..4b4f34c09 100644 --- a/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java +++ b/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java @@ -42,10 +42,12 @@ public class LimitOffsetPagedList implements PagedList { this.firstRow = query.getFirstRow(); } + @Override public void loadCount() { getFutureCount(); } + @Override public Future getFutureCount() { synchronized (monitor) { if (futureRowCount == null) { @@ -55,6 +57,7 @@ public class LimitOffsetPagedList implements PagedList { } } + @Override public List getList() { synchronized (monitor) { if (list == null) { @@ -72,6 +75,7 @@ public class LimitOffsetPagedList implements PagedList { return ((firstRow - 1) / maxRows) + 1; } + @Override public int getTotalPageCount() { int rowCount = getTotalCount(); @@ -82,6 +86,7 @@ public class LimitOffsetPagedList implements PagedList { } } + @Override public int getTotalCount() { synchronized (monitor) { if (futureRowCount != null) { @@ -101,18 +106,22 @@ public class LimitOffsetPagedList implements PagedList { } } + @Override public boolean hasNext() { return (firstRow + maxRows) < getTotalCount(); } + @Override public boolean hasPrev() { return firstRow > 0; } + @Override public int getPageSize() { return maxRows; } + @Override public String getDisplayXtoYofZ(String to, String of) { int first = firstRow + 1; diff --git a/src/main/java/io/ebeaninternal/server/query/NativeSqlQueryPlanKey.java b/src/main/java/io/ebeaninternal/server/query/NativeSqlQueryPlanKey.java index d513f8b83..ac98be5b5 100644 --- a/src/main/java/io/ebeaninternal/server/query/NativeSqlQueryPlanKey.java +++ b/src/main/java/io/ebeaninternal/server/query/NativeSqlQueryPlanKey.java @@ -13,6 +13,7 @@ public class NativeSqlQueryPlanKey implements CQueryPlanKey { this.sql = sql; } + @Override public String toString() { return getPartialKey(); } @@ -22,6 +23,7 @@ public class NativeSqlQueryPlanKey implements CQueryPlanKey { * needs to be included in order to have a complete key. Typically the MD5 of the sql * can be used as a short form proxy for the actual sql. */ + @Override public String getPartialKey() { return hashCode() + "_n"; } diff --git a/src/main/java/io/ebeaninternal/server/query/QueryFutureIds.java b/src/main/java/io/ebeaninternal/server/query/QueryFutureIds.java index c9b2cd0fe..b330d7d25 100644 --- a/src/main/java/io/ebeaninternal/server/query/QueryFutureIds.java +++ b/src/main/java/io/ebeaninternal/server/query/QueryFutureIds.java @@ -27,10 +27,12 @@ public class QueryFutureIds extends BaseFuture> implements Futur return call.transaction; } + @Override public Query getQuery() { return call.query; } + @Override public boolean cancel(boolean mayInterruptIfRunning) { call.query.cancel(); return super.cancel(mayInterruptIfRunning); diff --git a/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java b/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java index 80366228b..4a8668ca8 100644 --- a/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java +++ b/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java @@ -30,6 +30,7 @@ public class QueryFutureRowCount extends BaseFuture implements Futur return call.query; } + @Override public boolean cancel(boolean mayInterruptIfRunning) { call.query.cancel(); return super.cancel(mayInterruptIfRunning); diff --git a/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java b/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java index d196ab56d..24336fb8f 100644 --- a/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java +++ b/src/main/java/io/ebeaninternal/server/query/RawSqlQueryPlanKey.java @@ -19,6 +19,7 @@ class RawSqlQueryPlanKey implements CQueryPlanKey { this.logWhereSql = logWhereSql; } + @Override public String toString() { return getPartialKey() + ":r"; } @@ -28,6 +29,7 @@ class RawSqlQueryPlanKey implements CQueryPlanKey { * needs to be included in order to have a complete key. Typically the MD5 of the sql * can be used as a short form proxy for the actual sql. */ + @Override public String getPartialKey() { return hashCode() + "_0"; } diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java index 1a9c56dbe..68901ff42 100644 --- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java @@ -159,6 +159,7 @@ class SqlTreeNodeBean implements SqlTreeNode { } } + @Override public void buildRawSqlSelectChain(List selectChain) { if (readId) { if (desc.hasInheritance()) { @@ -181,6 +182,7 @@ class SqlTreeNodeBean implements SqlTreeNode { /** * Read the version bean. */ + @Override @SuppressWarnings("unchecked") public Version loadVersion(DbReadContext ctx) throws SQLException { @@ -196,6 +198,7 @@ class SqlTreeNodeBean implements SqlTreeNode { /** * read the properties from the resultSet. */ + @Override public EntityBean load(DbReadContext ctx, EntityBean parentBean, EntityBean contextParent) throws SQLException { Object lazyLoadParentId = null; @@ -406,6 +409,7 @@ class SqlTreeNodeBean implements SqlTreeNode { /** * Append the property columns to the buffer. */ + @Override public void appendDistinctOn(DbSqlContext ctx, boolean subQuery) { for (SqlTreeNode child : children) { child.appendDistinctOn(ctx, subQuery); @@ -415,6 +419,7 @@ class SqlTreeNodeBean implements SqlTreeNode { /** * Append the property columns to the buffer. */ + @Override public void appendSelect(DbSqlContext ctx, boolean subQuery) { ctx.pushJoin(prefix); @@ -448,6 +453,7 @@ class SqlTreeNodeBean implements SqlTreeNode { ctx.popJoin(); } + @Override public boolean isAggregation() { return aggregation; } @@ -468,6 +474,7 @@ class SqlTreeNodeBean implements SqlTreeNode { } } + @Override public void appendWhere(DbSqlContext ctx) { // Only apply inheritance to root node as any join will already have the inheritance join include - see TableJoin @@ -500,6 +507,7 @@ class SqlTreeNodeBean implements SqlTreeNode { /** * Append to the FROM clause for this node. */ + @Override public void appendFrom(DbSqlContext ctx, SqlJoinType joinType) { ctx.pushJoin(prefix); @@ -523,6 +531,7 @@ class SqlTreeNodeBean implements SqlTreeNode { ctx.popJoin(); } + @Override public void addSoftDeletePredicate(SpiQuery query) { if (desc.isSoftDelete()) { @@ -530,6 +539,7 @@ class SqlTreeNodeBean implements SqlTreeNode { } } + @Override public void addAsOfTableAlias(SpiQuery query) { // if history on this bean type add it's alias // for each alias we add an effect date predicate @@ -590,6 +600,7 @@ class SqlTreeNodeBean implements SqlTreeNode { /** * Summary description. */ + @Override public String toString() { return "SqlTreeNodeBean: " + desc; } diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java index 91dafdca3..55c1628c6 100644 --- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java @@ -97,6 +97,7 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode { children.add(child); } + @Override public void appendFrom(DbSqlContext ctx, SqlJoinType joinType) { boolean manyToMany = false; @@ -143,18 +144,21 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode { /** * Does nothing. */ + @Override public void appendSelect(DbSqlContext ctx, boolean subQuery) { } /** * Does nothing. */ + @Override public void appendWhere(DbSqlContext ctx) { } /** * Does nothing. */ + @Override public EntityBean load(DbReadContext ctx, EntityBean localBean, EntityBean parentBean) throws SQLException { return null; } diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java index 0bfe6ff90..db1173c7c 100644 --- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyRoot.java @@ -22,6 +22,7 @@ final class SqlTreeNodeManyRoot extends SqlTreeNodeBean { /** * Append the property columns to the buffer. */ + @Override public void appendDistinctOn(DbSqlContext ctx, boolean subQuery) { ctx.pushTableAlias(prefix); appendSelectId(ctx, idBinder.getBeanProperty()); diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java index ff09a1e85..bd7bf6e37 100644 --- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeManyWhereJoin.java @@ -108,18 +108,22 @@ class SqlTreeNodeManyWhereJoin implements SqlTreeNode { } } + @Override public void buildRawSqlSelectChain(List selectChain) { // nothing to add } + @Override public void appendSelect(DbSqlContext ctx, boolean subQuery) { // nothing to do here } + @Override public void appendWhere(DbSqlContext ctx) { // nothing to do here } + @Override public EntityBean load(DbReadContext ctx, EntityBean localBean, EntityBean parentBean) throws SQLException { // nothing to do here return null; diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java index 112cf16cf..1d84ba8ac 100644 --- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeRoot.java @@ -28,6 +28,7 @@ final class SqlTreeNodeRoot extends SqlTreeNodeBean { /** * Append the property columns to the buffer. */ + @Override public void appendDistinctOn(DbSqlContext ctx, boolean subQuery) { if (readId) { ctx.pushTableAlias(prefix); @@ -40,6 +41,7 @@ final class SqlTreeNodeRoot extends SqlTreeNodeBean { /** * Set AsOf support (at root level). */ + @Override public void addAsOfTableAlias(SpiQuery query) { if (desc.isHistorySupport()) { query.setAsOfBaseTable(); diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index c0f058644..4dd9bf351 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -314,10 +314,12 @@ public class DefaultOrmQuery implements SpiQuery { return softDeletePredicates; } + @Override public boolean isAsOfBaseTable() { return asOfBaseTable; } + @Override public void setAsOfBaseTable() { this.asOfBaseTable = true; } @@ -595,6 +597,7 @@ public class DefaultOrmQuery implements SpiQuery { /** * Return true if this is a single attribute query. */ + @Override public boolean isSingleAttribute() { return singleAttribute; } @@ -1047,6 +1050,7 @@ public class DefaultOrmQuery implements SpiQuery { return this; } + @Override public boolean isExcludeBeanCache() { // not using L2 cache for asDraft() query return excludeBeanCache || isAsDraft(); @@ -1370,10 +1374,12 @@ public class DefaultOrmQuery implements SpiQuery { return beanType; } + @Override public String toString() { return "Query [" + whereExpressions + "]"; } + @Override public TableJoin getM2mIncludeJoin() { return m2mIncludeJoin; } diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java index 9948e8361..0e232909f 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmUpdate.java @@ -61,11 +61,13 @@ public final class DefaultOrmUpdate implements SpiUpdate, Serializable { this.type = deriveType(updateStatement); } + @Override public DefaultOrmUpdate setTimeout(int secs) { this.timeout = secs; return this; } + @Override public Class getBeanType() { return beanType; } @@ -73,6 +75,7 @@ public final class DefaultOrmUpdate implements SpiUpdate, Serializable { /** * Return the timeout in seconds. */ + @Override public int getTimeout() { return timeout; } @@ -100,6 +103,7 @@ public final class DefaultOrmUpdate implements SpiUpdate, Serializable { } } + @Override public int execute() { return server.execute(this); } @@ -113,6 +117,7 @@ public final class DefaultOrmUpdate implements SpiUpdate, Serializable { * and you know that it is not important for cached objects or text indexes. *

    */ + @Override public DefaultOrmUpdate setNotifyCache(boolean notifyCache) { this.notifyCache = notifyCache; return this; @@ -122,53 +127,64 @@ public final class DefaultOrmUpdate implements SpiUpdate, Serializable { * Return true if the cache should be notified so that invalidates * appropriate objects. */ + @Override public boolean isNotifyCache() { return notifyCache; } + @Override public String getName() { return name; } + @Override public String getUpdateStatement() { return updateStatement; } + @Override public DefaultOrmUpdate set(int position, Object value) { bindParams.setParameter(position, value); return this; } + @Override public DefaultOrmUpdate setParameter(int position, Object value) { bindParams.setParameter(position, value); return this; } + @Override public DefaultOrmUpdate setNull(int position, int jdbcType) { bindParams.setNullParameter(position, jdbcType); return this; } + @Override public DefaultOrmUpdate setNullParameter(int position, int jdbcType) { bindParams.setNullParameter(position, jdbcType); return this; } + @Override public DefaultOrmUpdate set(String name, Object value) { bindParams.setParameter(name, value); return this; } + @Override public DefaultOrmUpdate setParameter(String name, Object param) { bindParams.setParameter(name, param); return this; } + @Override public DefaultOrmUpdate setNull(String name, int jdbcType) { bindParams.setNullParameter(name, jdbcType); return this; } + @Override public DefaultOrmUpdate setNullParameter(String name, int jdbcType) { bindParams.setNullParameter(name, jdbcType); return this; @@ -177,22 +193,27 @@ public final class DefaultOrmUpdate implements SpiUpdate, Serializable { /** * Return the bind parameters. */ + @Override public BindParams getBindParams() { return bindParams; } + @Override public String getGeneratedSql() { return generatedSql; } + @Override public void setGeneratedSql(String generatedSql) { this.generatedSql = generatedSql; } + @Override public String getBaseTable() { return baseTable; } + @Override public OrmUpdateType getOrmUpdateType() { return type; } diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java index 51946773e..d6efbeec8 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java @@ -56,68 +56,83 @@ public class DefaultRelationalQuery implements SpiSqlQuery { server.findEachWhile(this, consumer, null); } + @Override public List findList() { return server.findList(this, null); } + @Override public SqlRow findUnique() { return server.findUnique(this, null); } + @Override public DefaultRelationalQuery setParameter(int position, Object value) { bindParams.setParameter(position, value); return this; } + @Override public DefaultRelationalQuery setParameter(String paramName, Object value) { bindParams.setParameter(paramName, value); return this; } + @Override public String toString() { return "SqlQuery [" + query + "]"; } + @Override public int getFirstRow() { return firstRow; } + @Override public DefaultRelationalQuery setFirstRow(int firstRow) { this.firstRow = firstRow; return this; } + @Override public int getMaxRows() { return maxRows; } + @Override public DefaultRelationalQuery setMaxRows(int maxRows) { this.maxRows = maxRows; return this; } + @Override public int getTimeout() { return timeout; } + @Override public DefaultRelationalQuery setTimeout(int secs) { this.timeout = secs; return this; } + @Override public BindParams getBindParams() { return bindParams; } + @Override public DefaultRelationalQuery setBufferFetchSizeHint(int bufferFetchSizeHint) { this.bufferFetchSizeHint = bufferFetchSizeHint; return this; } + @Override public int getBufferFetchSizeHint() { return bufferFetchSizeHint; } + @Override public String getQuery() { return query; } diff --git a/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java b/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java index 42689ab67..e63526063 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java @@ -30,6 +30,7 @@ class ONamedParam implements SpiNamedParam { /** * Return the bind value for this named parameter. */ + @Override public Object getValue() { return value; } diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java index 7621d51f6..36f423f85 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java @@ -137,6 +137,7 @@ public class OrmQueryDetail implements Serializable { return p1 == null ? p2 == null : p1.isSameByPlan(p2); } + @Override public String toString() { return asString(); } @@ -157,6 +158,7 @@ public class OrmQueryDetail implements Serializable { return sb.toString(); } + @Override public int hashCode() { throw new RuntimeException("should not use"); } diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java index 7d4bd55ad..085586376 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryLimitRequest.java @@ -21,30 +21,37 @@ public class OrmQueryLimitRequest implements SqlLimitRequest { this.dbPlatform = dbPlatform; } + @Override public String getDbOrderBy() { return sqlOrderBy; } + @Override public String getDbSql() { return sql; } + @Override public int getFirstRow() { return ormQuery.getFirstRow(); } + @Override public int getMaxRows() { return ormQuery.getMaxRows(); } + @Override public boolean isDistinct() { return ormQuery.isDistinctQuery(); } + @Override public SpiQuery getOrmQuery() { return ormQuery; } + @Override public DatabasePlatform getDbPlatform() { return dbPlatform; } diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java index 2a017047b..a0803c6a9 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java @@ -279,6 +279,7 @@ public class OrmQueryProperties implements Serializable { return rawProperties == null || rawProperties.isEmpty(); } + @Override public String toString() { StringBuilder sb = new StringBuilder(40); append("", sb); diff --git a/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java b/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java index d74f5f5bc..e294e7e49 100644 --- a/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java +++ b/src/main/java/io/ebeaninternal/server/text/csv/TCsvReader.java @@ -60,55 +60,68 @@ public class TCsvReader implements CsvReader { this.descriptor = descriptor; } + @Override public void setDefaultLocale(Locale defaultLocale) { this.defaultLocale = defaultLocale; } + @Override public void setDefaultTimeFormat(String defaultTimeFormat) { this.defaultTimeFormat = defaultTimeFormat; } + @Override public void setDefaultDateFormat(String defaultDateFormat) { this.defaultDateFormat = defaultDateFormat; } + @Override public void setDefaultTimestampFormat(String defaultTimestampFormat) { this.defaultTimestampFormat = defaultTimestampFormat; } + @Override public void setPersistBatchSize(int persistBatchSize) { this.persistBatchSize = persistBatchSize; } + @Override public void setIgnoreHeader() { setHasHeader(true, false); } + @Override public void setAddPropertiesFromHeader() { setHasHeader(true, true); } + @Override public void setHasHeader(boolean hasHeader, boolean addPropertiesFromHeader) { this.hasHeader = hasHeader; this.addPropertiesFromHeader = addPropertiesFromHeader; } + @Override public void setLogInfoFrequency(int logInfoFrequency) { this.logInfoFrequency = logInfoFrequency; } + @Override public void addIgnore() { columnList.add(ignoreColumn); } + @Override public void addProperty(String propertyName) { addProperty(propertyName, null); } + @Override public void addDateTime(String propertyName, String dateTimeFormat) { addDateTime(propertyName, dateTimeFormat, Locale.getDefault()); } + @Override public void addDateTime(String propertyName, String dateTimeFormat, Locale locale) { ExpressionPath elProp = descriptor.getExpressionPath(propertyName); @@ -144,6 +157,7 @@ public class TCsvReader implements CsvReader { } } + @Override public void addProperty(String propertyName, StringParser parser) { ExpressionPath elProp = descriptor.getExpressionPath(propertyName); @@ -154,11 +168,13 @@ public class TCsvReader implements CsvReader { columnList.add(column); } + @Override public void process(Reader reader) throws Exception { DefaultCsvCallback callback = new DefaultCsvCallback<>(persistBatchSize, logInfoFrequency); process(reader, callback); } + @Override public void process(Reader reader, CsvCallback callback) throws Exception { if (reader == null) { @@ -328,6 +344,7 @@ public class TCsvReader implements CsvReader { this.format = format; } + @Override public Object parse(String value) { try { Date dt = dateFormat.parse(value); diff --git a/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java b/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java index c4a2ca2e2..343783648 100644 --- a/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java +++ b/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java @@ -62,14 +62,17 @@ public class DJsonContext implements JsonContext { this.jsonScalar = new DJsonScalar(typeManager); } + @Override public void writeScalar(JsonGenerator generator, Object scalarValue) throws IOException { jsonScalar.write(generator, scalarValue); } + @Override public boolean isSupportedType(Type genericType) { return server.isSupportedType(genericType); } + @Override public JsonGenerator createGenerator(Writer writer) throws JsonIOException { try { return jsonFactory.createGenerator(writer); @@ -78,6 +81,7 @@ public class DJsonContext implements JsonContext { } } + @Override public JsonParser createParser(Reader reader) throws JsonIOException { try { return jsonFactory.createParser(reader); @@ -86,6 +90,7 @@ public class DJsonContext implements JsonContext { } } + @Override public T toBean(Class cls, String json) throws JsonIOException { return toBean(cls, new StringReader(json)); } @@ -95,18 +100,22 @@ public class DJsonContext implements JsonContext { return toBean(cls, new StringReader(json), options); } + @Override public T toBean(Class cls, Reader jsonReader) throws JsonIOException { return toBean(cls, createParser(jsonReader)); } + @Override public T toBean(Class cls, Reader jsonReader, JsonReadOptions options) throws JsonIOException { return toBean(cls, createParser(jsonReader), options); } + @Override public T toBean(Class cls, JsonParser parser) throws JsonIOException { return toBean(cls, parser, null); } + @Override public T toBean(Class cls, JsonParser parser, JsonReadOptions options) throws JsonIOException { BeanDescriptor desc = getDescriptor(cls); @@ -134,6 +143,7 @@ public class DJsonContext implements JsonContext { return new DJsonBeanReader<>(desc, readJson); } + @Override public List toList(Class cls, String json) throws JsonIOException { return toList(cls, new StringReader(json)); } @@ -143,18 +153,22 @@ public class DJsonContext implements JsonContext { return toList(cls, new StringReader(json), options); } + @Override public List toList(Class cls, Reader jsonReader) throws JsonIOException { return toList(cls, createParser(jsonReader)); } + @Override public List toList(Class cls, Reader jsonReader, JsonReadOptions options) throws JsonIOException { return toList(cls, createParser(jsonReader), options); } + @Override public List toList(Class cls, JsonParser src) throws JsonIOException { return toList(cls, src, null); } + @Override public List toList(Class cls, JsonParser src, JsonReadOptions options) throws JsonIOException { BeanDescriptor desc = getDescriptor(cls); @@ -185,16 +199,19 @@ public class DJsonContext implements JsonContext { } } + @Override public Object toObject(Type genericType, String json) throws JsonIOException { return toObject(genericType, createParser(new StringReader(json))); } + @Override public Object toObject(Type genericType, Reader json) throws JsonIOException { return toObject(genericType, createParser(json)); } + @Override public Object toObject(Type genericType, JsonParser jsonParser) throws JsonIOException { TypeInfo info = ParamTypeHelper.getTypeInfo(genericType); diff --git a/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java b/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java index 45cdd3ba9..fec1d1a53 100644 --- a/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java +++ b/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java @@ -72,6 +72,7 @@ public class WriteJson implements JsonWriter { /** * Return true if null values should be included in JSON output. */ + @Override public boolean isIncludeNull() { return include == JsonConfig.Include.ALL; } @@ -79,6 +80,7 @@ public class WriteJson implements JsonWriter { /** * Return true if empty collections should be included in the JSON output. */ + @Override public boolean isIncludeEmpty() { return include != JsonConfig.Include.NON_EMPTY; } diff --git a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java index ecfbc31ee..6ecc79bcf 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java +++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIdMap.java @@ -15,6 +15,7 @@ public final class BeanPersistIdMap { private final Map beanMap = new LinkedHashMap<>(); + @Override public String toString() { return beanMap.toString(); } diff --git a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java index e53994bda..6bc530e9e 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java +++ b/src/main/java/io/ebeaninternal/server/transaction/BeanPersistIds.java @@ -147,6 +147,7 @@ public class BeanPersistIds { } } + @Override public String toString() { StringBuilder sb = new StringBuilder(); if (beanDescriptor != null) { diff --git a/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java index 79e507db9..1e989fae7 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java +++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java @@ -43,12 +43,14 @@ public final class DefaultPersistenceContext implements PersistenceContext { /** * Set an object into the PersistenceContext. */ + @Override public void put(Class rootType, Object id, Object bean) { synchronized (monitor) { getClassContext(rootType).put(id, bean); } } + @Override public Object putIfAbsent(Class rootType, Object id, Object bean) { synchronized (monitor) { return getClassContext(rootType).putIfAbsent(id, bean); @@ -58,12 +60,14 @@ public final class DefaultPersistenceContext implements PersistenceContext { /** * Return an object given its type and unique id. */ + @Override public Object get(Class rootType, Object id) { synchronized (monitor) { return getClassContext(rootType).get(id); } } + @Override public WithOption getWithOption(Class rootType, Object id) { synchronized (monitor) { return getClassContext(rootType).getWithOption(id); @@ -73,6 +77,7 @@ public final class DefaultPersistenceContext implements PersistenceContext { /** * Return the number of beans of the given type in the persistence context. */ + @Override public int size(Class rootType) { synchronized (monitor) { ClassContext classMap = typeCache.get(rootType); @@ -83,12 +88,14 @@ public final class DefaultPersistenceContext implements PersistenceContext { /** * Clear the PersistenceContext. */ + @Override public void clear() { synchronized (monitor) { typeCache.clear(); } } + @Override public void clear(Class rootType) { synchronized (monitor) { ClassContext classMap = typeCache.get(rootType); @@ -98,6 +105,7 @@ public final class DefaultPersistenceContext implements PersistenceContext { } } + @Override public void deleted(Class rootType, Object id) { synchronized (monitor) { ClassContext classMap = typeCache.get(rootType); @@ -107,6 +115,7 @@ public final class DefaultPersistenceContext implements PersistenceContext { } } + @Override public void clear(Class rootType, Object id) { synchronized (monitor) { ClassContext classMap = typeCache.get(rootType); @@ -116,6 +125,7 @@ public final class DefaultPersistenceContext implements PersistenceContext { } } + @Override public String toString() { synchronized (monitor) { return typeCache.toString(); @@ -141,6 +151,7 @@ public final class DefaultPersistenceContext implements PersistenceContext { private ClassContext() { } + @Override public String toString() { return "size:" + map.size(); } diff --git a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java index be66113d9..3d9945ac5 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java @@ -12,14 +12,17 @@ public class DefaultTransactionScopeManager extends TransactionScopeManager { super(transactionManager); } + @Override public void commit() { DefaultTransactionThreadLocal.commit(serverName); } + @Override public void end() { DefaultTransactionThreadLocal.end(serverName); } + @Override public SpiTransaction get() { SpiTransaction t = DefaultTransactionThreadLocal.get(serverName); if (t == null || !t.isActive()) { @@ -29,14 +32,17 @@ public class DefaultTransactionScopeManager extends TransactionScopeManager { } } + @Override public void replace(SpiTransaction trans) { DefaultTransactionThreadLocal.replace(serverName, trans); } + @Override public void rollback() { DefaultTransactionThreadLocal.rollback(serverName); } + @Override public void set(SpiTransaction trans) { DefaultTransactionThreadLocal.set(serverName, trans); } diff --git a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java index 6b45833ac..3502f0bc4 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java +++ b/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocal.java @@ -9,6 +9,7 @@ import io.ebeaninternal.server.transaction.TransactionMap.State; public final class DefaultTransactionThreadLocal { private static final ThreadLocal local = new ThreadLocal() { + @Override protected synchronized TransactionMap initialValue() { return new TransactionMap(); } diff --git a/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java b/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java index 5dfe723e2..e0d9bdf90 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java +++ b/src/main/java/io/ebeaninternal/server/transaction/DeleteByIdMap.java @@ -20,6 +20,7 @@ public final class DeleteByIdMap { private final Map beanMap = new LinkedHashMap<>(); + @Override public String toString() { return beanMap.toString(); } diff --git a/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java index 30378dc3c..4bb23735e 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/DocStoreOnlyTransaction.java @@ -25,6 +25,7 @@ public class DocStoreOnlyTransaction extends JdbcTransaction { // do nothing } + @Override protected void deactivate() { // do nothing } diff --git a/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java index a507d1d90..da24c50e2 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/ExternalTransactionScopeManager.java @@ -20,28 +20,34 @@ public class ExternalTransactionScopeManager extends TransactionScopeManager { this.externalManager = externalManager; } + @Override public void commit() { DefaultTransactionThreadLocal.commit(serverName); } + @Override public void end() { DefaultTransactionThreadLocal.end(serverName); } + @Override public SpiTransaction get() { return (SpiTransaction) externalManager.getCurrentTransaction(); } + @Override public void replace(SpiTransaction trans) { DefaultTransactionThreadLocal.replace(serverName, trans); } + @Override public void rollback() { DefaultTransactionThreadLocal.rollback(serverName); } + @Override public void set(SpiTransaction trans) { DefaultTransactionThreadLocal.set(serverName, trans); } diff --git a/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java b/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java index f8b3fec84..811d9d1d6 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java +++ b/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java @@ -50,6 +50,7 @@ public class JtaTransaction extends JdbcTransaction { /** * Commit the transaction. */ + @Override public void commit() { if (commmitted) { throw new PersistenceException("This transaction has already been committed."); @@ -69,6 +70,7 @@ public class JtaTransaction extends JdbcTransaction { commmitted = true; } + @Override public void rollback() { rollback(null); } @@ -76,6 +78,7 @@ public class JtaTransaction extends JdbcTransaction { /** * Rollback the transaction. */ + @Override public void rollback(Throwable e) { if (!commmitted) { try { diff --git a/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java index 99abff78a..64350b7ec 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java @@ -52,6 +52,7 @@ public class JtaTransactionManager implements ExternalTransactionManager { /** * Initialise this with the Ebean internal transaction manager. */ + @Override public void setTransactionManager(Object txnMgr) { // RB: At this stage not exposing TransactionManager to @@ -87,6 +88,7 @@ public class JtaTransactionManager implements ExternalTransactionManager { * Returns null if there is no current spring transaction (lazy loading outside a spring txn etc). *

    */ + @Override public Object getCurrentTransaction() { TransactionSynchronizationRegistry syncRegistry = getSyncRegistry(); @@ -147,23 +149,29 @@ public class JtaTransactionManager implements ExternalTransactionManager { private static class DummyUserTransaction implements UserTransaction { + @Override public void begin() throws NotSupportedException, SystemException { } + @Override public void commit() throws RollbackException, HeuristicMixedException, HeuristicRollbackException, SecurityException, IllegalStateException, SystemException { } + @Override public int getStatus() throws SystemException { return 0; } + @Override public void rollback() throws IllegalStateException, SecurityException, SystemException { } + @Override public void setRollbackOnly() throws IllegalStateException, SystemException { } + @Override public void setTransactionTimeout(int seconds) throws SystemException { } } @@ -190,11 +198,13 @@ public class JtaTransactionManager implements ExternalTransactionManager { this.serverName = transactionManager.getServerName(); } + @Override public void beforeCompletion() { // Future note: for JPA2 locking we will // have beforeCommit events to fire } + @Override public void afterCompletion(int status) { switch (status) { diff --git a/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java b/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java index b658a29a3..6a4ffc630 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java +++ b/src/main/java/io/ebeaninternal/server/transaction/RemoteTransactionEvent.java @@ -28,10 +28,12 @@ public class RemoteTransactionEvent implements Runnable { this.server = server; } + @Override public void run() { server.remoteTransactionEvent(this); } + @Override public String toString() { StringBuilder sb = new StringBuilder(100); if (!beanPersistList.isEmpty()) { diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionMap.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionMap.java index 75e301d98..d5cc325d0 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/TransactionMap.java +++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionMap.java @@ -16,6 +16,7 @@ public class TransactionMap { */ private final HashMap map = new HashMap<>(); + @Override public String toString() { return map.toString(); } @@ -59,6 +60,7 @@ public class TransactionMap { SpiTransaction transaction; + @Override public String toString() { return "txn[" + transaction + "]"; } diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java index e83b8a955..e833f82bc 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionScopeManager.java @@ -54,5 +54,6 @@ public abstract class TransactionScopeManager implements SpiTransactionScopeMana * thread so it can continue the fetch. *

    */ + @Override public abstract void replace(SpiTransaction trans); } diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index b108cad94..6acbfb064 100644 --- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -239,6 +239,7 @@ public final class DefaultTypeManager implements TypeManager { /** * Register a custom ScalarType. */ + @Override public void add(ScalarType scalarType) { typeMap.put(scalarType.getType(), scalarType); logAdd(scalarType); @@ -273,6 +274,7 @@ public final class DefaultTypeManager implements TypeManager { /** * Return the ScalarType for the given jdbc type as per java.sql.Types. */ + @Override public ScalarType getScalarType(int jdbcType) { return nativeMap.get(jdbcType); } @@ -280,6 +282,7 @@ public final class DefaultTypeManager implements TypeManager { /** * This can return null if no matching ScalarType is found. */ + @Override public ScalarType getScalarType(Class type) { ScalarType found = typeMap.get(type); if (found == null) { @@ -420,6 +423,7 @@ public final class DefaultTypeManager implements TypeManager { * different jdbcTypes in a single system. *

    */ + @Override @SuppressWarnings("unchecked") public ScalarType getScalarType(Class type, int jdbcType) { @@ -545,6 +549,7 @@ public final class DefaultTypeManager implements TypeManager { * much shorter codes used in the DB. *

    */ + @Override public ScalarType createEnumScalarType(Class> enumType) { Method[] methods = enumType.getMethods(); diff --git a/src/main/java/io/ebeaninternal/server/type/LongToTimestampConverter.java b/src/main/java/io/ebeaninternal/server/type/LongToTimestampConverter.java index 6eda1a940..e396602d4 100644 --- a/src/main/java/io/ebeaninternal/server/type/LongToTimestampConverter.java +++ b/src/main/java/io/ebeaninternal/server/type/LongToTimestampConverter.java @@ -6,15 +6,18 @@ import java.sql.Timestamp; public class LongToTimestampConverter implements ScalarTypeConverter { + @Override public Long getNullValue() { return null; } + @Override public Timestamp unwrapValue(Long beanType) { return new Timestamp(beanType); } + @Override public Long wrapValue(Timestamp scalarType) { return scalarType.getTime(); diff --git a/src/main/java/io/ebeaninternal/server/type/ModifyAwareIterator.java b/src/main/java/io/ebeaninternal/server/type/ModifyAwareIterator.java index 18f055764..22814c873 100644 --- a/src/main/java/io/ebeaninternal/server/type/ModifyAwareIterator.java +++ b/src/main/java/io/ebeaninternal/server/type/ModifyAwareIterator.java @@ -22,14 +22,17 @@ public class ModifyAwareIterator implements Iterator { this.it = it; } + @Override public boolean hasNext() { return it.hasNext(); } + @Override public E next() { return it.next(); } + @Override public void remove() { owner.markAsModified(); it.remove(); diff --git a/src/main/java/io/ebeaninternal/server/type/ModifyAwareList.java b/src/main/java/io/ebeaninternal/server/type/ModifyAwareList.java index 11becd35d..e1efafd92 100644 --- a/src/main/java/io/ebeaninternal/server/type/ModifyAwareList.java +++ b/src/main/java/io/ebeaninternal/server/type/ModifyAwareList.java @@ -27,6 +27,7 @@ public class ModifyAwareList implements List, ModifyAwareOwner { this.owner = owner; } + @Override public String toString() { return list.toString(); } diff --git a/src/main/java/io/ebeaninternal/server/type/ModifyAwareMap.java b/src/main/java/io/ebeaninternal/server/type/ModifyAwareMap.java index 8e2b76318..c028af31d 100644 --- a/src/main/java/io/ebeaninternal/server/type/ModifyAwareMap.java +++ b/src/main/java/io/ebeaninternal/server/type/ModifyAwareMap.java @@ -29,6 +29,7 @@ public class ModifyAwareMap implements Map, ModifyAwareOwner { this.map = underyling; } + @Override public String toString() { return map.toString(); } diff --git a/src/main/java/io/ebeaninternal/server/type/ModifyAwareSet.java b/src/main/java/io/ebeaninternal/server/type/ModifyAwareSet.java index 365eff2b4..70147b99f 100644 --- a/src/main/java/io/ebeaninternal/server/type/ModifyAwareSet.java +++ b/src/main/java/io/ebeaninternal/server/type/ModifyAwareSet.java @@ -46,10 +46,12 @@ public class ModifyAwareSet implements Set, ModifyAwareOwner { } + @Override public String toString() { return set.toString(); } + @Override public boolean add(E o) { if (set.add(o)) { owner.markAsModified(); @@ -58,6 +60,7 @@ public class ModifyAwareSet implements Set, ModifyAwareOwner { return false; } + @Override public boolean addAll(Collection collection) { boolean changed = false; for (E o : collection) { @@ -69,6 +72,7 @@ public class ModifyAwareSet implements Set, ModifyAwareOwner { return changed; } + @Override public void clear() { if (!set.isEmpty()) { owner.markAsModified(); @@ -76,22 +80,27 @@ public class ModifyAwareSet implements Set, ModifyAwareOwner { set.clear(); } + @Override public boolean contains(Object o) { return set.contains(o); } + @Override public boolean containsAll(Collection collection) { return set.containsAll(collection); } + @Override public boolean isEmpty() { return set.isEmpty(); } + @Override public Iterator iterator() { return new ModifyAwareIterator<>(owner, set.iterator()); } + @Override public boolean remove(Object o) { if (set.remove(o)) { owner.markAsModified(); @@ -100,6 +109,7 @@ public class ModifyAwareSet implements Set, ModifyAwareOwner { return false; } + @Override public boolean removeAll(Collection collection) { boolean changed = false; for (Object element : collection) { @@ -111,6 +121,7 @@ public class ModifyAwareSet implements Set, ModifyAwareOwner { return changed; } + @Override public boolean retainAll(Collection collection) { boolean changed = false; Iterator it = set.iterator(); @@ -125,14 +136,17 @@ public class ModifyAwareSet implements Set, ModifyAwareOwner { return changed; } + @Override public int size() { return set.size(); } + @Override public Object[] toArray() { return set.toArray(); } + @Override public T[] toArray(T[] a) { return set.toArray(a); } diff --git a/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java b/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java index d5aaee43a..2d5b5e3b4 100644 --- a/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java +++ b/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java @@ -36,18 +36,22 @@ public class RsetDataReader implements DataReader { this.rset = rset; } + @Override public void close() throws SQLException { rset.close(); } + @Override public boolean next() throws SQLException { return rset.next(); } + @Override public void resetColumnPosition() { pos = 0; } + @Override public void incrementPos(int increment) { pos += increment; } @@ -56,23 +60,28 @@ public class RsetDataReader implements DataReader { return ++pos; } + @Override public Array getArray() throws SQLException { return rset.getArray(pos()); } + @Override public Object getObject() throws SQLException { return rset.getObject(pos()); } + @Override public BigDecimal getBigDecimal() throws SQLException { return rset.getBigDecimal(pos()); } + @Override public InputStream getBinaryStream() throws SQLException { return rset.getBinaryStream(pos()); } + @Override public Boolean getBoolean() throws SQLException { boolean v = rset.getBoolean(pos()); if (rset.wasNull()) { @@ -81,6 +90,7 @@ public class RsetDataReader implements DataReader { return v; } + @Override public Byte getByte() throws SQLException { byte v = rset.getByte(pos()); if (rset.wasNull()) { @@ -89,14 +99,17 @@ public class RsetDataReader implements DataReader { return v; } + @Override public byte[] getBytes() throws SQLException { return rset.getBytes(pos()); } + @Override public Date getDate() throws SQLException { return rset.getDate(pos()); } + @Override public Double getDouble() throws SQLException { double v = rset.getDouble(pos()); if (rset.wasNull()) { @@ -105,6 +118,7 @@ public class RsetDataReader implements DataReader { return v; } + @Override public Float getFloat() throws SQLException { float v = rset.getFloat(pos()); if (rset.wasNull()) { @@ -113,6 +127,7 @@ public class RsetDataReader implements DataReader { return v; } + @Override public Integer getInt() throws SQLException { int v = rset.getInt(pos()); if (rset.wasNull()) { @@ -122,6 +137,7 @@ public class RsetDataReader implements DataReader { } + @Override public Long getLong() throws SQLException { long v = rset.getLong(pos()); if (rset.wasNull()) { @@ -136,6 +152,7 @@ public class RsetDataReader implements DataReader { } + @Override public Short getShort() throws SQLException { short s = rset.getShort(pos()); if (rset.wasNull()) { @@ -145,15 +162,18 @@ public class RsetDataReader implements DataReader { } + @Override public String getString() throws SQLException { return rset.getString(pos()); } + @Override public Time getTime() throws SQLException { return rset.getTime(pos()); } + @Override public Timestamp getTimestamp() throws SQLException { Calendar cal = dataTimeZone.getTimeZone(); if (cal != null) { @@ -163,6 +183,7 @@ public class RsetDataReader implements DataReader { } } + @Override public String getStringFromStream() throws SQLException { Reader reader = rset.getCharacterStream(pos()); if (reader == null) { @@ -188,6 +209,7 @@ public class RsetDataReader implements DataReader { return out.toString(); } + @Override public byte[] getBinaryBytes() throws SQLException { InputStream in = rset.getBinaryStream(pos()); return getBinaryLob(in); diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarType.java b/src/main/java/io/ebeaninternal/server/type/ScalarType.java index 9c4082a61..e8e609a73 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarType.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarType.java @@ -96,12 +96,14 @@ public interface ScalarType extends StringParser, StringFormatter, ScalarData * Read the value from the resultSet and convert if necessary to the logical * bean property value. */ + @Override T read(DataReader reader) throws SQLException; /** * Ignore the reading of this value. Typically this means moving the index * position in the ResultSet. */ + @Override void loadIgnore(DataReader reader); /** @@ -111,6 +113,7 @@ public interface ScalarType extends StringParser, StringFormatter, ScalarData * JDBC type. *

    */ + @Override void bind(DataBind bind, T value) throws SQLException; /** @@ -155,6 +158,7 @@ public interface ScalarType extends StringParser, StringFormatter, ScalarData * This is so that ScalarType also implements the StringFormatter interface. *

    */ + @Override String format(Object value); /** @@ -166,6 +170,7 @@ public interface ScalarType extends StringParser, StringFormatter, ScalarData * Reciprocal of formatValue(). *

    */ + @Override T parse(String value); /** diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java index 70e904098..b697a3dd1 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java @@ -36,6 +36,7 @@ public class ScalarTypeArrayList extends ScalarTypeJsonCollection { /** * Return the ScalarType to use based on the List's generic parameter type. */ + @Override public ScalarTypeArrayList typeFor(Type valueType) { if (valueType.equals(UUID.class)) { return UUID; diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java index 5c8de33cb..daf2bab06 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java @@ -27,6 +27,7 @@ class ScalarTypeArrayListH2 extends ScalarTypeArrayList { /** * Return the ScalarType to use based on the List's generic parameter type. */ + @Override public ScalarTypeArrayListH2 typeFor(Type valueType) { if (valueType.equals(java.util.UUID.class)) { return UUID; diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java index 6f0cd1fd0..5aa6b7366 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBase.java @@ -52,23 +52,28 @@ public abstract class ScalarTypeBase implements ScalarType { return 0; } + @Override public boolean isJdbcNative() { return jdbcNative; } + @Override public int getJdbcType() { return jdbcType; } + @Override public Class getType() { return type; } + @Override @SuppressWarnings("unchecked") public String format(Object value) { return formatValue((T) value); } + @Override public void loadIgnore(DataReader reader) { reader.incrementPos(1); } diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java index 82af4bcf1..c28637cb6 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java @@ -36,6 +36,7 @@ public abstract class ScalarTypeBaseDate extends ScalarTypeBase { */ public abstract T convertFromDate(java.sql.Date ts); + @Override public void bind(DataBind b, T value) throws SQLException { if (value == null) { b.setNull(Types.DATE); @@ -44,12 +45,14 @@ public abstract class ScalarTypeBaseDate extends ScalarTypeBase { } } + @Override public T read(DataReader dataReader) throws SQLException { Date ts = dataReader.getDate(); return ts == null ? null : convertFromDate(ts); } + @Override public String formatValue(T t) { Date date = convertToDate(t); // format all dates into epoch millis @@ -57,6 +60,7 @@ public abstract class ScalarTypeBaseDate extends ScalarTypeBase { return Long.toString(epochMillis); } + @Override public T parse(String value) { try { long epochMillis = Long.parseLong(value); @@ -67,11 +71,13 @@ public abstract class ScalarTypeBaseDate extends ScalarTypeBase { } } + @Override public T convertFromMillis(long systemTimeMillis) { Date ts = new Date(systemTimeMillis); return convertFromDate(ts); } + @Override public boolean isDateTimeCapable() { return true; } @@ -95,6 +101,7 @@ public abstract class ScalarTypeBaseDate extends ScalarTypeBase { return DocPropertyType.DATE; } + @Override public T readData(DataInput dataInput) throws IOException { if (!dataInput.readBoolean()) { return null; @@ -105,6 +112,7 @@ public abstract class ScalarTypeBaseDate extends ScalarTypeBase { } } + @Override @SuppressWarnings("unchecked") public void writeData(DataOutput dataOutput, T value) throws IOException { diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java index 8beec2b27..af15abfa2 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDateTime.java @@ -46,6 +46,7 @@ public abstract class ScalarTypeBaseDateTime extends ScalarTypeBase { /** * Convert from epoch millis to the value. */ + @Override public abstract T convertFromMillis(long systemTimeMillis); /** @@ -63,6 +64,7 @@ public abstract class ScalarTypeBaseDateTime extends ScalarTypeBase { */ protected abstract String toJsonISO8601(T value); + @Override public void bind(DataBind b, T value) throws SQLException { if (value == null) { b.setNull(Types.TIMESTAMP); @@ -71,6 +73,7 @@ public abstract class ScalarTypeBaseDateTime extends ScalarTypeBase { } } + @Override public T read(DataReader dataReader) throws SQLException { Timestamp ts = dataReader.getTimestamp(); @@ -130,12 +133,14 @@ public abstract class ScalarTypeBaseDateTime extends ScalarTypeBase { return DocPropertyType.DATETIME; } + @Override public String formatValue(T value) { // format all timestamps into epoch millis long epochMillis = convertToMillis(value); return Long.toString(epochMillis); } + @Override public T parse(String value) { try { long epochMillis = Long.parseLong(value); @@ -145,10 +150,12 @@ public abstract class ScalarTypeBaseDateTime extends ScalarTypeBase { } } + @Override public boolean isDateTimeCapable() { return true; } + @Override public T readData(DataInput dataInput) throws IOException { if (!dataInput.readBoolean()) { return null; @@ -159,6 +166,7 @@ public abstract class ScalarTypeBaseDateTime extends ScalarTypeBase { } } + @Override public void writeData(DataOutput dataOutput, T value) throws IOException { if (value == null) { diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java index 155e6eb6e..2a1cb148f 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseVarchar.java @@ -28,11 +28,13 @@ public abstract class ScalarTypeBaseVarchar extends ScalarTypeBase { /** * Format the target type to a string. */ + @Override public abstract String formatValue(T v); /** * Parse from a formatted string value. */ + @Override public abstract T parse(String value); /** @@ -109,6 +111,7 @@ public abstract class ScalarTypeBaseVarchar extends ScalarTypeBase { } } + @Override public void writeData(DataOutput dataOutput, T value) throws IOException { if (value == null) { dataOutput.writeBoolean(false); diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java index 86e27de90..f66149ad0 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBigDecimal.java @@ -21,6 +21,7 @@ public class ScalarTypeBigDecimal extends ScalarTypeBase { super(BigDecimal.class, true, Types.DECIMAL); } + @Override public void bind(DataBind b, BigDecimal value) throws SQLException { if (value == null) { b.setNull(Types.DECIMAL); @@ -29,35 +30,43 @@ public class ScalarTypeBigDecimal extends ScalarTypeBase { } } + @Override public BigDecimal read(DataReader dataReader) throws SQLException { return dataReader.getBigDecimal(); } + @Override public Object toJdbcType(Object value) { return BasicTypeConverter.toBigDecimal(value); } + @Override public BigDecimal toBeanType(Object value) { return BasicTypeConverter.toBigDecimal(value); } + @Override public String formatValue(BigDecimal t) { return t.toPlainString(); } + @Override public BigDecimal parse(String value) { return new BigDecimal(value); } + @Override public BigDecimal convertFromMillis(long systemTimeMillis) { return BigDecimal.valueOf(systemTimeMillis); } + @Override public boolean isDateTimeCapable() { return true; } + @Override public BigDecimal readData(DataInput dataInput) throws IOException { if (!dataInput.readBoolean()) { return null; @@ -66,6 +75,7 @@ public class ScalarTypeBigDecimal extends ScalarTypeBase { } } + @Override public void writeData(DataOutput dataOutput, BigDecimal b) throws IOException { if (b == null) { diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java index 5b59e2920..b25df4beb 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java @@ -40,14 +40,17 @@ public class ScalarTypeBoolean { return "true"; } + @Override public Boolean toBeanType(Object value) { return BasicTypeConverter.toBoolean(value); } + @Override public Object toJdbcType(Object value) { return BasicTypeConverter.convert(value, jdbcType); } + @Override public void bind(DataBind b, Boolean value) throws SQLException { if (value == null) { b.setNull(Types.BOOLEAN); @@ -57,6 +60,7 @@ public class ScalarTypeBoolean { } + @Override public Boolean read(DataReader dataReader) throws SQLException { return dataReader.getBoolean(); } @@ -89,15 +93,18 @@ public class ScalarTypeBoolean { return "1"; } + @Override public Boolean toBeanType(Object value) { return BasicTypeConverter.toBoolean(value); } + @Override public Object toJdbcType(Object value) { // use JDBC driver to convert boolean to bit return BasicTypeConverter.toBoolean(value); } + @Override public void bind(DataBind b, Boolean value) throws SQLException { if (value == null) { b.setNull(Types.BIT); @@ -107,6 +114,7 @@ public class ScalarTypeBoolean { } } + @Override public Boolean read(DataReader dataReader) throws SQLException { return dataReader.getBoolean(); } @@ -142,6 +150,7 @@ public class ScalarTypeBoolean { return 1; } + @Override public void bind(DataBind b, Boolean value) throws SQLException { if (value == null) { b.setNull(Types.INTEGER); @@ -150,6 +159,7 @@ public class ScalarTypeBoolean { } } + @Override public Boolean read(DataReader dataReader) throws SQLException { Integer i = dataReader.getInt(); if (i == null) { @@ -162,6 +172,7 @@ public class ScalarTypeBoolean { } } + @Override public Object toJdbcType(Object value) { return toInteger(value); } @@ -180,6 +191,7 @@ public class ScalarTypeBoolean { /** * Convert the db value to the Boolean value. */ + @Override public Boolean toBeanType(Object value) { if (value == null) { return null; @@ -226,6 +238,7 @@ public class ScalarTypeBoolean { return Math.max(trueValue.length(), falseValue.length()); } + @Override public void bind(DataBind b, Boolean value) throws SQLException { if (value == null) { b.setNull(Types.VARCHAR); @@ -234,6 +247,7 @@ public class ScalarTypeBoolean { } } + @Override public Boolean read(DataReader dataReader) throws SQLException { String string = dataReader.getString(); if (string == null) { @@ -247,6 +261,7 @@ public class ScalarTypeBoolean { } } + @Override public Object toJdbcType(Object value) { return toString(value); } @@ -265,6 +280,7 @@ public class ScalarTypeBoolean { /** * Convert the db value to the Boolean value. */ + @Override public Boolean toBeanType(Object value) { if (value == null) { return null; @@ -289,29 +305,36 @@ public class ScalarTypeBoolean { /** * Return the DB literal value for false. */ + @Override public abstract String getDbFalseLiteral(); /** * Return the DB literal value for true. */ + @Override public abstract String getDbTrueLiteral(); + @Override public String formatValue(Boolean t) { return t.toString(); } + @Override public Boolean parse(String value) { return Boolean.valueOf(value); } + @Override public Boolean convertFromMillis(long systemTimeMillis) { throw new TextException("Not Supported"); } + @Override public boolean isDateTimeCapable() { return false; } + @Override public Boolean readData(DataInput dataInput) throws IOException { if (!dataInput.readBoolean()) { return null; @@ -320,6 +343,7 @@ public class ScalarTypeBoolean { } } + @Override public void writeData(DataOutput dataOutput, Boolean val) throws IOException { if (val == null) { diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java index 1dc439beb..07d6835cf 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java @@ -27,6 +27,7 @@ public class ScalarTypeByte extends ScalarTypeBase { return true; } + @Override public void bind(DataBind b, Byte value) throws SQLException { if (value == null) { b.setNull(Types.TINYINT); @@ -35,14 +36,17 @@ public class ScalarTypeByte extends ScalarTypeBase { } } + @Override public Byte read(DataReader dataReader) throws SQLException { return dataReader.getByte(); } + @Override public Object toJdbcType(Object value) { return BasicTypeConverter.toByte(value); } + @Override public Byte toBeanType(Object value) { return BasicTypeConverter.toByte(value); } @@ -69,22 +73,27 @@ public class ScalarTypeByte extends ScalarTypeBase { return DocPropertyType.BINARY; } + @Override public String formatValue(Byte t) { return t.toString(); } + @Override public Byte parse(String value) { throw new TextException("Not supported"); } + @Override public Byte convertFromMillis(long systemTimeMillis) { throw new TextException("Not Supported"); } + @Override public boolean isDateTimeCapable() { return false; } + @Override public Byte readData(DataInput dataInput) throws IOException { if (!dataInput.readBoolean()) { return null; @@ -93,6 +102,7 @@ public class ScalarTypeByte extends ScalarTypeBase { } } + @Override public void writeData(DataOutput dataOutput, Byte val) throws IOException { if (val == null) { diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java index 5c51d3908..45e4cf522 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBase.java @@ -29,6 +29,7 @@ public abstract class ScalarTypeBytesBase extends ScalarTypeBase { return (byte[]) value; } + @Override public void bind(DataBind b, byte[] value) throws SQLException { if (value == null) { b.setNull(jdbcType); @@ -37,30 +38,37 @@ public abstract class ScalarTypeBytesBase extends ScalarTypeBase { } } + @Override public Object toJdbcType(Object value) { return value; } + @Override public byte[] toBeanType(Object value) { return (byte[]) value; } + @Override public String formatValue(byte[] t) { throw new TextException("Not supported"); } + @Override public byte[] parse(String value) { throw new TextException("Not supported"); } + @Override public byte[] convertFromMillis(long systemTimeMillis) { throw new TextException("Not supported"); } + @Override public boolean isDateTimeCapable() { return false; } + @Override public byte[] readData(DataInput dataInput) throws IOException { if (!dataInput.readBoolean()) { return null; @@ -72,6 +80,7 @@ public abstract class ScalarTypeBytesBase extends ScalarTypeBase { } } + @Override public void writeData(DataOutput dataOutput, byte[] v) throws IOException { if (v == null) { dataOutput.writeBoolean(false); diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java index 78224cb51..1fe515225 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java @@ -12,6 +12,7 @@ public class ScalarTypeBytesBinary extends ScalarTypeBytesBase { super(true, Types.BINARY); } + @Override public byte[] read(DataReader dataReader) throws SQLException { return dataReader.getBytes(); } diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java index 0da7fe016..fe6a5bd09 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java @@ -12,6 +12,7 @@ public class ScalarTypeBytesBlob extends ScalarTypeBytesBase { super(true, Types.BLOB); } + @Override public byte[] read(DataReader dataReader) throws SQLException { return dataReader.getBinaryBytes(); diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java index a434b7c34..3a740f062 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java @@ -44,31 +44,38 @@ public class ScalarTypeBytesEncrypted implements ScalarType { return false; } + @Override public void bind(DataBind b, byte[] value) throws SQLException { value = dataEncryptSupport.encrypt(value); baseType.bind(b, value); } + @Override public int getJdbcType() { return baseType.getJdbcType(); } + @Override public int getLength() { return baseType.getLength(); } + @Override public Class getType() { return byte[].class; } + @Override public boolean isDateTimeCapable() { return baseType.isDateTimeCapable(); } + @Override public boolean isJdbcNative() { return baseType.isJdbcNative(); } + @Override public void loadIgnore(DataReader dataReader) { baseType.loadIgnore(dataReader); } @@ -90,22 +97,27 @@ public class ScalarTypeBytesEncrypted implements ScalarType { return baseType.getDocType(); } + @Override public String format(Object v) { throw new RuntimeException("Not used"); } + @Override public String formatValue(byte[] v) { throw new RuntimeException("Not used"); } + @Override public byte[] parse(String value) { return baseType.parse(value); } + @Override public byte[] convertFromMillis(long systemTimeMillis) { return baseType.convertFromMillis(systemTimeMillis); } + @Override public byte[] read(DataReader dataReader) throws SQLException { byte[] data = baseType.read(dataReader); @@ -113,14 +125,17 @@ public class ScalarTypeBytesEncrypted implements ScalarType { return data; } + @Override public byte[] toBeanType(Object value) { return baseType.toBeanType(value); } + @Override public Object toJdbcType(Object value) { return baseType.toJdbcType(value); } + @Override public byte[] readData(DataInput dataInput) throws IOException { if (!dataInput.readBoolean()) { return null; @@ -132,6 +147,7 @@ public class ScalarTypeBytesEncrypted implements ScalarType { } } + @Override public void writeData(DataOutput dataOutput, byte[] value) throws IOException { if (value == null) { diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java index ce5d8fe37..1644337f8 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java @@ -12,6 +12,7 @@ public class ScalarTypeBytesLongVarbinary extends ScalarTypeBytesBase { super(true, Types.LONGVARBINARY); } + @Override public byte[] read(DataReader dataReader) throws SQLException { return dataReader.getBinaryBytes(); } diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java index 7cfd61974..5d65089b9 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java @@ -12,6 +12,7 @@ public class ScalarTypeBytesVarbinary extends ScalarTypeBytesBase { super(true, Types.VARBINARY); } + @Override public byte[] read(DataReader dataReader) throws SQLException { return dataReader.getBytes(); } diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java index 8c311f542..056794583 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java @@ -18,6 +18,7 @@ public class ScalarTypeCalendar extends ScalarTypeBaseDateTime { super(mode, Calendar.class, false, jdbcType); } + @Override public void bind(DataBind b, Calendar value) throws SQLException { if (value == null) { b.setNull(Types.TIMESTAMP); diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java index 04790eec0..5fd8a1c5d 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java @@ -24,6 +24,7 @@ public class ScalarTypeChar extends ScalarTypeBaseVarchar { return beanValue.toString(); } + @Override public void bind(DataBind b, Character value) throws SQLException { if (value == null) { b.setNull(Types.VARCHAR); @@ -33,6 +34,7 @@ public class ScalarTypeChar extends ScalarTypeBaseVarchar { } } + @Override public Character read(DataReader dataReader) throws SQLException { String string = dataReader.getString(); if (string == null || string.isEmpty()) { @@ -42,19 +44,23 @@ public class ScalarTypeChar extends ScalarTypeBaseVarchar { } } + @Override public Object toJdbcType(Object value) { return BasicTypeConverter.toString(value); } + @Override public Character toBeanType(Object value) { String s = BasicTypeConverter.toString(value); return s.charAt(0); } + @Override public String formatValue(Character t) { return t.toString(); } + @Override public Character parse(String value) { return value.charAt(0); } diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java index 868d272c6..f966a2ff9 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java @@ -27,6 +27,7 @@ public class ScalarTypeCharArray extends ScalarTypeBaseVarchar { return new String(beanValue); } + @Override public void bind(DataBind b, char[] value) throws SQLException { if (value == null) { b.setNull(Types.VARCHAR); @@ -36,6 +37,7 @@ public class ScalarTypeCharArray extends ScalarTypeBaseVarchar { } } + @Override public char[] read(DataReader dataReader) throws SQLException { String string = dataReader.getString(); if (string == null) { @@ -45,19 +47,23 @@ public class ScalarTypeCharArray extends ScalarTypeBaseVarchar { } } + @Override public Object toJdbcType(Object value) { return BasicTypeConverter.toString(value); } + @Override public char[] toBeanType(Object value) { String s = BasicTypeConverter.toString(value); return s.toCharArray(); } + @Override public String formatValue(char[] t) { return String.valueOf(t); } + @Override public char[] parse(String value) { return value.toCharArray(); } diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java index 4d5987dd2..112e08459 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java @@ -30,10 +30,12 @@ public class ScalarTypeClass extends ScalarTypeBaseVarchar { return beanValue.getCanonicalName(); } + @Override public String formatValue(Class v) { return v.getCanonicalName(); } + @Override public Class parse(String value) { try { return Class.forName(value); diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java index fbe003746..90d478bd9 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java @@ -30,6 +30,7 @@ public class ScalarTypeDate extends ScalarTypeBaseDate { return t; } + @Override public void bind(DataBind b, java.sql.Date value) throws SQLException { if (value == null) { b.setNull(Types.DATE); @@ -38,14 +39,17 @@ public class ScalarTypeDate extends ScalarTypeBaseDate { } } + @Override public java.sql.Date read(DataReader dataReader) throws SQLException { return dataReader.getDate(); } + @Override public Object toJdbcType(Object value) { return BasicTypeConverter.toDate(value); } + @Override public java.sql.Date toBeanType(Object value) { return BasicTypeConverter.toDate(value); } diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java index bf7699c94..aff4d7678 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java @@ -69,10 +69,12 @@ public class ScalarTypeEnumStandard { return maxLen; } + @Override public int getLength() { return length; } + @Override public void bind(DataBind b, Object value) throws SQLException { if (value == null) { b.setNull(Types.VARCHAR); @@ -81,6 +83,7 @@ public class ScalarTypeEnumStandard { } } + @Override public Object read(DataReader dataReader) throws SQLException { String string = dataReader.getString(); @@ -94,6 +97,7 @@ public class ScalarTypeEnumStandard { /** * Convert the Boolean value to the db value. */ + @Override public Object toJdbcType(Object beanValue) { if (beanValue == null) { return null; @@ -101,6 +105,7 @@ public class ScalarTypeEnumStandard { return format(beanValue); } + @Override public Object toBeanType(Object dbValue) { if (dbValue == null || dbValue instanceof Enum) { return dbValue; @@ -137,6 +142,7 @@ public class ScalarTypeEnumStandard { return values; } + @Override public void bind(DataBind b, Object value) throws SQLException { if (value == null) { b.setNull(Types.INTEGER); @@ -145,6 +151,7 @@ public class ScalarTypeEnumStandard { } } + @Override public Object read(DataReader dataReader) throws SQLException { Integer ordinal = dataReader.getInt(); @@ -162,6 +169,7 @@ public class ScalarTypeEnumStandard { /** * Convert the Enum value to the db value. */ + @Override public Object toJdbcType(Object beanValue) { if (beanValue == null) { return null; @@ -172,6 +180,7 @@ public class ScalarTypeEnumStandard { /** * Convert the db value to the Enum value. */ + @Override public Object toBeanType(Object dbValue) { if (dbValue == null || dbValue instanceof Enum) { return dbValue; diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java index c44e22d2e..56e3674fc 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java @@ -60,18 +60,22 @@ public class ScalarTypeEnumWithMapping extends ScalarTypeEnumStandard.EnumBase i * This is for enum's mapped to strings. *

    */ + @Override public int getLength() { return length; } + @Override public void bind(DataBind b, Object value) throws SQLException { beanDbMap.bind(b, value); } + @Override public Object read(DataReader dataReader) throws SQLException { return beanDbMap.read(dataReader); } + @Override public Object toBeanType(Object dbValue) { if (dbValue == null || dbValue instanceof Enum) { return dbValue; @@ -79,6 +83,7 @@ public class ScalarTypeEnumWithMapping extends ScalarTypeEnumStandard.EnumBase i return beanDbMap.getBeanValue(dbValue); } + @Override public Object toJdbcType(Object beanValue) { return beanDbMap.getDbValue(beanValue); } diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java index bb282adab..4ad941c27 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java @@ -162,6 +162,7 @@ public class ScalarTypeFile extends ScalarTypeBase { return null; } + @Override public void writeData(DataOutput dataOutput, File file) throws IOException { // skip writing large file } diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java index fac3e8efe..5114cf9ac 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java @@ -37,6 +37,7 @@ public class ScalarTypeWrapper implements ScalarType { this.wrapperType = wrapperType; } + @Override public String toString() { return "ScalarTypeWrapper " + wrapperType + " to " + scalarType.getType(); } diff --git a/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java b/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java index 7ccb38005..4b9c92d35 100644 --- a/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java +++ b/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java @@ -45,6 +45,7 @@ public class SimpleAesEncryptor implements Encryptor { return new IvParameterSpec(initialVector.getBytes()); } + @Override public byte[] decrypt(byte[] data, EncryptKey encryptKey) { if (data == null) { @@ -70,6 +71,7 @@ public class SimpleAesEncryptor implements Encryptor { } } + @Override public byte[] encrypt(byte[] data, EncryptKey encryptKey) { if (data == null) { @@ -94,6 +96,7 @@ public class SimpleAesEncryptor implements Encryptor { } } + @Override public String decryptString(byte[] data, EncryptKey key) { if (data == null) { return null; @@ -108,6 +111,7 @@ public class SimpleAesEncryptor implements Encryptor { } } + @Override public byte[] encryptString(String valueFormatValue, EncryptKey key) { if (valueFormatValue == null) { diff --git a/src/main/java/io/ebeaninternal/server/util/ArrayStack.java b/src/main/java/io/ebeaninternal/server/util/ArrayStack.java index 2f7ecbea4..50d71ddac 100644 --- a/src/main/java/io/ebeaninternal/server/util/ArrayStack.java +++ b/src/main/java/io/ebeaninternal/server/util/ArrayStack.java @@ -26,6 +26,7 @@ public class ArrayStack { this.list = new ArrayList<>(); } + @Override public String toString() { return list.toString(); } diff --git a/src/main/java/io/ebeaninternal/util/ParamTypeHelper.java b/src/main/java/io/ebeaninternal/util/ParamTypeHelper.java index 63af496c9..bd94c18a2 100644 --- a/src/main/java/io/ebeaninternal/util/ParamTypeHelper.java +++ b/src/main/java/io/ebeaninternal/util/ParamTypeHelper.java @@ -34,6 +34,7 @@ public class ParamTypeHelper { return beanType; } + @Override public String toString() { if (isManyType()) { return manyType + " " + beanType; diff --git a/src/main/java/io/ebeaninternal/util/SortByClause.java b/src/main/java/io/ebeaninternal/util/SortByClause.java index 6d8099721..02884990e 100644 --- a/src/main/java/io/ebeaninternal/util/SortByClause.java +++ b/src/main/java/io/ebeaninternal/util/SortByClause.java @@ -69,6 +69,7 @@ public class SortByClause { this.nullsHigh = nullsHigh; } + @Override public String toString() { return name + " asc:" + ascending; } diff --git a/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java b/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java index f79d4436c..687942bac 100644 --- a/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java +++ b/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java @@ -29,6 +29,7 @@ public interface DocStoreBeanAdapter extends BeanDocType { * Apply the document structure to the query so that it fetches the required properties to build * the document (typically in JSON form). */ + @Override void applyPath(Query query); /** @@ -52,21 +53,25 @@ public interface DocStoreBeanAdapter extends BeanDocType { /** * Return the index type for this bean type. */ + @Override String getIndexType(); /** * Return the index name for this bean type. */ + @Override String getIndexName(); /** * Process a delete by id of a given document. */ + @Override void deleteById(Object idValue, DocStoreUpdateContext txn) throws IOException; /** * Process an index event which is effectively an insert or update (or put). */ + @Override void index(Object idValue, T entityBean, DocStoreUpdateContext txn) throws IOException; /** @@ -98,6 +103,7 @@ public interface DocStoreBeanAdapter extends BeanDocType { * @param embeddedRawContent the embedded content for this property in JSON form * @param txn the doc store transaction to use to process the update */ + @Override void updateEmbedded(Object idValue, String embeddedProperty, String embeddedRawContent, DocStoreUpdateContext txn) throws IOException; /** @@ -112,6 +118,7 @@ public interface DocStoreBeanAdapter extends BeanDocType { * 'raw' property that we can use for sorting etc. *

    */ + @Override String rawProperty(String property); /** diff --git a/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyMapping.java b/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyMapping.java index 045fbf5cf..c34bb9a65 100644 --- a/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyMapping.java +++ b/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyMapping.java @@ -75,6 +75,7 @@ public class DocPropertyMapping { } } + @Override public String toString() { return "name:" + name + " type:" + type + " options(" + options + ")"; } diff --git a/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java b/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java index e9bc51d20..d33eec7aa 100644 --- a/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java +++ b/src/main/java/io/ebeanservice/docstore/api/mapping/DocPropertyOptions.java @@ -60,6 +60,7 @@ public class DocPropertyOptions { this.enabled = source.enabled; } + @Override public String toString() { StringBuilder sb = new StringBuilder(); if (code != null) { diff --git a/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java b/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java index 228fdfc90..ff2d5c3b4 100644 --- a/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java +++ b/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java @@ -274,10 +274,12 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< return docStructure; } + @Override public FetchPath getEmbedded(String path) { return docStructure.getEmbedded(path); } + @Override public FetchPath getEmbeddedManyRoot(String path) { return docStructure.getEmbeddedManyRoot(path); } diff --git a/src/test/java/io/ebean/common/BeanListTest.java b/src/test/java/io/ebean/common/BeanListTest.java index 509a76aa1..a5b0bafc6 100644 --- a/src/test/java/io/ebean/common/BeanListTest.java +++ b/src/test/java/io/ebean/common/BeanListTest.java @@ -260,6 +260,7 @@ public class BeanListTest { this.val = val; } + @Override public int hashCode() { return 42; } diff --git a/src/test/java/io/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java b/src/test/java/io/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java index dbdd0de5f..73d93c6fb 100644 --- a/src/test/java/io/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java +++ b/src/test/java/io/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java @@ -51,6 +51,7 @@ public class TestDataSourceMaxWithEntity extends BaseTestCase { this.position = position; } + @Override public void run() { server.find(Customer.class).findCount(); diff --git a/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java b/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java index b6a623109..b557f6b45 100644 --- a/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java +++ b/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java @@ -61,6 +61,7 @@ public class TestTextJsonBeanReadVisitor extends BaseTestCase { private static class AVisitor implements JsonReadBeanVisitor
    { + @Override public void visit(Address bean, Map unmapped) { bean.getId(); } @@ -68,6 +69,7 @@ public class TestTextJsonBeanReadVisitor extends BaseTestCase { private static class ASVisitor implements JsonReadBeanVisitor
    { + @Override public void visit(Address bean, Map unmapped) { bean.getId(); } @@ -75,6 +77,7 @@ public class TestTextJsonBeanReadVisitor extends BaseTestCase { private static class ContactVisitor implements JsonReadBeanVisitor { + @Override public void visit(Contact bean, Map unmapped) { bean.getId(); } diff --git a/src/test/java/org/avaje/test/model/rawsql/inherit/ChildA.java b/src/test/java/org/avaje/test/model/rawsql/inherit/ChildA.java index 030a99f85..fe9a467e9 100644 --- a/src/test/java/org/avaje/test/model/rawsql/inherit/ChildA.java +++ b/src/test/java/org/avaje/test/model/rawsql/inherit/ChildA.java @@ -7,6 +7,7 @@ import javax.persistence.Entity; @DiscriminatorValue("A") public class ChildA extends Parent { + @Override public String getName() { return "A Name"; } diff --git a/src/test/java/org/avaje/test/model/rawsql/inherit/ChildB.java b/src/test/java/org/avaje/test/model/rawsql/inherit/ChildB.java index e6deab956..205a1b547 100644 --- a/src/test/java/org/avaje/test/model/rawsql/inherit/ChildB.java +++ b/src/test/java/org/avaje/test/model/rawsql/inherit/ChildB.java @@ -7,6 +7,7 @@ import javax.persistence.Entity; @DiscriminatorValue("B") public class ChildB extends Parent { + @Override public String getName() { return "B Name"; } diff --git a/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java b/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java index fb24af23a..f73cb92ee 100644 --- a/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java +++ b/src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java @@ -7,6 +7,7 @@ import java.sql.Connection; public class MyTestDataSourcePoolListener implements DataSourcePoolListener { public static int SLEEP_AFTER_BORROW = 0; + @Override public void onAfterBorrowConnection(Connection c) { if (SLEEP_AFTER_BORROW > 0) { try { @@ -17,6 +18,7 @@ public class MyTestDataSourcePoolListener implements DataSourcePoolListener { } } + @Override public void onBeforeReturnConnection(Connection c) { } } diff --git a/src/test/java/org/tests/basic/encrypt/BasicEncryptKey.java b/src/test/java/org/tests/basic/encrypt/BasicEncryptKey.java index 56a240696..d56a6c814 100644 --- a/src/test/java/org/tests/basic/encrypt/BasicEncryptKey.java +++ b/src/test/java/org/tests/basic/encrypt/BasicEncryptKey.java @@ -10,6 +10,7 @@ public class BasicEncryptKey implements EncryptKey { this.key = key; } + @Override public String getStringValue() { return key; } diff --git a/src/test/java/org/tests/basic/encrypt/BasicEncyptKeyManager.java b/src/test/java/org/tests/basic/encrypt/BasicEncyptKeyManager.java index 7eb4dfa83..1033ce076 100644 --- a/src/test/java/org/tests/basic/encrypt/BasicEncyptKeyManager.java +++ b/src/test/java/org/tests/basic/encrypt/BasicEncyptKeyManager.java @@ -8,10 +8,12 @@ public class BasicEncyptKeyManager implements EncryptKeyManager { /** * Initialise the key manager. */ + @Override public void initialise() { } + @Override public EncryptKey getEncryptKey(String tableName, String columnName) { // Must be 16 Chars for Oracle function return new BasicEncryptKey("simple0123456789"); diff --git a/src/test/java/org/tests/compositekeys/db/CaoKey.java b/src/test/java/org/tests/compositekeys/db/CaoKey.java index ee6350950..4d56e0cf6 100644 --- a/src/test/java/org/tests/compositekeys/db/CaoKey.java +++ b/src/test/java/org/tests/compositekeys/db/CaoKey.java @@ -24,12 +24,14 @@ public class CaoKey { this.type = type; } + @Override public int hashCode() { int hc = 31 * 7 + customer; hc = 31 * hc + type; return hc; } + @Override public boolean equals(Object o) { if (this == o) { return true; diff --git a/src/test/java/org/tests/compositekeys/db/RegionKey.java b/src/test/java/org/tests/compositekeys/db/RegionKey.java index 50bee3c69..ecf8b3f86 100644 --- a/src/test/java/org/tests/compositekeys/db/RegionKey.java +++ b/src/test/java/org/tests/compositekeys/db/RegionKey.java @@ -24,12 +24,14 @@ public class RegionKey { this.type = type; } + @Override public int hashCode() { int hc = 31 * 7 + customer; hc = 31 * hc + type; return hc; } + @Override public boolean equals(Object o) { if (this == o) { return true; diff --git a/src/test/java/org/tests/compositekeys/db/SubTypeKey.java b/src/test/java/org/tests/compositekeys/db/SubTypeKey.java index ef7cb7a06..0a98564e1 100644 --- a/src/test/java/org/tests/compositekeys/db/SubTypeKey.java +++ b/src/test/java/org/tests/compositekeys/db/SubTypeKey.java @@ -14,10 +14,12 @@ public class SubTypeKey { this.subTypeId = subTypeId; } + @Override public int hashCode() { return 31 * 7 + subTypeId; } + @Override public boolean equals(Object o) { if (this == o) { return true; diff --git a/src/test/java/org/tests/compositekeys/db/TypeKey.java b/src/test/java/org/tests/compositekeys/db/TypeKey.java index cdbc87a45..2725c0867 100644 --- a/src/test/java/org/tests/compositekeys/db/TypeKey.java +++ b/src/test/java/org/tests/compositekeys/db/TypeKey.java @@ -24,12 +24,14 @@ public class TypeKey { this.type = type; } + @Override public int hashCode() { int hc = 31 + customer; hc = hc * 31 + type; return hc; } + @Override public boolean equals(Object o) { if (this == o) { return true; diff --git a/src/test/java/org/tests/idkeys/TestPropertyChangeSupport.java b/src/test/java/org/tests/idkeys/TestPropertyChangeSupport.java index 850c28ab3..67063d596 100644 --- a/src/test/java/org/tests/idkeys/TestPropertyChangeSupport.java +++ b/src/test/java/org/tests/idkeys/TestPropertyChangeSupport.java @@ -22,6 +22,7 @@ public class TestPropertyChangeSupport extends EbeanTestCase implements Property private List pces = new ArrayList<>(); private PropertyChangeEvent lastPce; + @Override public void propertyChange(PropertyChangeEvent evt) { nuofEvents++; lastPce = evt; diff --git a/src/test/java/org/tests/model/basic/Address.java b/src/test/java/org/tests/model/basic/Address.java index a7f6dbc3c..83d1b5c18 100644 --- a/src/test/java/org/tests/model/basic/Address.java +++ b/src/test/java/org/tests/model/basic/Address.java @@ -41,6 +41,7 @@ public class Address { Country country; + @Override public String toString() { return id + " " + line1 + " " + line2 + " " + city + " " + country; } diff --git a/src/test/java/org/tests/model/basic/Country.java b/src/test/java/org/tests/model/basic/Country.java index 597a707b8..c2de046f1 100644 --- a/src/test/java/org/tests/model/basic/Country.java +++ b/src/test/java/org/tests/model/basic/Country.java @@ -31,6 +31,7 @@ public class Country { @Size(max = 60) String name; + @Override public String toString() { return code; } diff --git a/src/test/java/org/tests/model/basic/Customer.java b/src/test/java/org/tests/model/basic/Customer.java index 8334549e7..4f8c7d206 100644 --- a/src/test/java/org/tests/model/basic/Customer.java +++ b/src/test/java/org/tests/model/basic/Customer.java @@ -107,6 +107,7 @@ public class Customer extends BasicDomain { @OneToMany(mappedBy = "customer", cascade = CascadeType.ALL) List contacts; + @Override public String toString() { return id + " " + status + " " + name; } diff --git a/src/test/java/org/tests/model/basic/CustomerAggregate.java b/src/test/java/org/tests/model/basic/CustomerAggregate.java index 56612bb0d..5c4887e9a 100644 --- a/src/test/java/org/tests/model/basic/CustomerAggregate.java +++ b/src/test/java/org/tests/model/basic/CustomerAggregate.java @@ -22,6 +22,7 @@ public class CustomerAggregate { int totalContacts; + @Override public String toString() { return customer.getId() + " totalContacts:" + totalContacts; } diff --git a/src/test/java/org/tests/model/basic/ESomeType.java b/src/test/java/org/tests/model/basic/ESomeType.java index a09b9c8af..5db551231 100644 --- a/src/test/java/org/tests/model/basic/ESomeType.java +++ b/src/test/java/org/tests/model/basic/ESomeType.java @@ -18,6 +18,7 @@ public class ESomeType { TimeZone timeZone; + @Override public String toString() { return id + " " + locale + " " + currency + " " + timeZone; } diff --git a/src/test/java/org/tests/model/basic/MNonEnum.java b/src/test/java/org/tests/model/basic/MNonEnum.java index ec02d0129..cf3ade6fa 100644 --- a/src/test/java/org/tests/model/basic/MNonEnum.java +++ b/src/test/java/org/tests/model/basic/MNonEnum.java @@ -11,6 +11,7 @@ public enum MNonEnum { this.value = value; } + @Override public String toString() { return value; } diff --git a/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java b/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java index 9fd6266d5..0441b40ff 100644 --- a/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java +++ b/src/test/java/org/tests/model/basic/MyEBasicConfigStartup.java @@ -22,6 +22,7 @@ public class MyEBasicConfigStartup implements ServerConfigStartup { deleteCount.set(0); } + @Override public void onStart(ServerConfig serverConfig) { serverConfig.add(new EbasicPersistList()); @@ -36,10 +37,12 @@ public class MyEBasicConfigStartup implements ServerConfigStartup { s.add("e_basic"); } + @Override public Set registeredTables() { return s; } + @Override public void process(BulkTableEvent bulkTableEvent) { System.out.println("-- " + bulkTableEvent); } @@ -53,16 +56,19 @@ public class MyEBasicConfigStartup implements ServerConfigStartup { return EBasic.class.isAssignableFrom(cls); } + @Override public void inserted(Object bean) { insertCount.incrementAndGet(); System.out.println("-- EBasic inserted " + ((EBasic) bean).getId()); } + @Override public void updated(Object bean, Set updatedProperties) { updateCount.incrementAndGet(); System.out.println("-- EBasic updated " + ((EBasic) bean).getId() + " updatedProperties: " + updatedProperties); } + @Override public void deleted(Object bean) { deleteCount.incrementAndGet(); System.out.println("-- EBasic deleted " + ((EBasic) bean).getId()); diff --git a/src/test/java/org/tests/model/basic/Order.java b/src/test/java/org/tests/model/basic/Order.java index 697802e2f..b15765b51 100644 --- a/src/test/java/org/tests/model/basic/Order.java +++ b/src/test/java/org/tests/model/basic/Order.java @@ -104,6 +104,7 @@ public class Order implements Serializable { @OneToMany(cascade = CascadeType.ALL, mappedBy = "order") List shipments; + @Override public String toString() { return id + " totalAmount:" + totalAmount + " totalItems:" + totalItems; } diff --git a/src/test/java/org/tests/model/basic/OrderAggregate.java b/src/test/java/org/tests/model/basic/OrderAggregate.java index d4f3da517..364d94f2f 100644 --- a/src/test/java/org/tests/model/basic/OrderAggregate.java +++ b/src/test/java/org/tests/model/basic/OrderAggregate.java @@ -25,6 +25,7 @@ public class OrderAggregate { Long totalItems; + @Override public String toString() { return order.getId() + " totalAmount:" + totalAmount + " totalItems:" + totalItems; } diff --git a/src/test/java/org/tests/model/basic/SomeEnum.java b/src/test/java/org/tests/model/basic/SomeEnum.java index 3a07120bb..f2d9b9815 100644 --- a/src/test/java/org/tests/model/basic/SomeEnum.java +++ b/src/test/java/org/tests/model/basic/SomeEnum.java @@ -11,6 +11,7 @@ public enum SomeEnum { this.description = description; } + @Override public String toString() { return description; } diff --git a/src/test/java/org/tests/model/basic/UTDetail.java b/src/test/java/org/tests/model/basic/UTDetail.java index 560c14654..2d214ff75 100644 --- a/src/test/java/org/tests/model/basic/UTDetail.java +++ b/src/test/java/org/tests/model/basic/UTDetail.java @@ -30,6 +30,7 @@ public class UTDetail { this.amount = amount; } + @Override public String toString() { return id + " name:" + name + " qty:" + qty + " amt:" + amount; } diff --git a/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java b/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java index 0fce17a9e..040fc5cef 100644 --- a/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java +++ b/src/test/java/org/tests/model/basic/event/SimpleTOneQueryAdapter.java @@ -7,15 +7,18 @@ import org.tests.model.basic.TOne; public class SimpleTOneQueryAdapter implements BeanQueryAdapter { + @Override public int getExecutionOrder() { // just return 0 return 0; } + @Override public boolean isRegisterFor(Class cls) { return TOne.class.equals(cls); } + @Override public void preQuery(BeanQueryRequest request) { Query query = request.getQuery(); diff --git a/src/test/java/org/tests/model/ddd/DPerson.java b/src/test/java/org/tests/model/ddd/DPerson.java index bb18f4252..f1ce5936e 100644 --- a/src/test/java/org/tests/model/ddd/DPerson.java +++ b/src/test/java/org/tests/model/ddd/DPerson.java @@ -18,6 +18,7 @@ public class DPerson { Money salary; + @Override public String toString() { return id + " " + firstName + " " + lastName + " " + salary; } diff --git a/src/test/java/org/tests/model/ivo/Money.java b/src/test/java/org/tests/model/ivo/Money.java index e12502994..652d7ed6a 100644 --- a/src/test/java/org/tests/model/ivo/Money.java +++ b/src/test/java/org/tests/model/ivo/Money.java @@ -37,6 +37,7 @@ public final class Money implements Comparable, Serializable { this(new BigDecimal(val)); } + @Override public String toString() { return amount.toString(); } @@ -56,6 +57,7 @@ public final class Money implements Comparable, Serializable { return false; } + @Override public int compareTo(Money o) { return amount.compareTo(o.amount); } diff --git a/src/test/java/org/tests/model/ivo/Oid.java b/src/test/java/org/tests/model/ivo/Oid.java index 16f9ccf1b..11c2c2691 100644 --- a/src/test/java/org/tests/model/ivo/Oid.java +++ b/src/test/java/org/tests/model/ivo/Oid.java @@ -9,6 +9,7 @@ public class Oid { this.value = value; } + @Override public String toString() { return String.valueOf(value); } diff --git a/src/test/java/org/tests/model/ivo/Segment.java b/src/test/java/org/tests/model/ivo/Segment.java index cda049ce5..05fdc35e9 100644 --- a/src/test/java/org/tests/model/ivo/Segment.java +++ b/src/test/java/org/tests/model/ivo/Segment.java @@ -15,6 +15,7 @@ public class Segment { return code; } + @Override public String toString() { return code; } diff --git a/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java b/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java index acc66bbd5..bd3979651 100644 --- a/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java +++ b/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java @@ -10,10 +10,12 @@ import java.math.BigDecimal; */ public class MoneyTypeConverter implements AttributeConverter { + @Override public BigDecimal convertToDatabaseColumn(Money beanType) { return beanType.getAmount(); } + @Override public Money convertToEntityAttribute(BigDecimal scalarType) { return new Money(scalarType); } diff --git a/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java b/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java index d223ec470..a4f7fd782 100644 --- a/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java +++ b/src/test/java/org/tests/model/ivo/converter/OidTypeConverter.java @@ -10,6 +10,7 @@ public class OidTypeConverter implements ScalarTypeConverter,Long> { return null; } + @Override public Oid wrapValue(Long scalarType) { if (scalarType == null) { return null; @@ -17,6 +18,7 @@ public class OidTypeConverter implements ScalarTypeConverter,Long> { return new Oid<>(scalarType); } + @Override public Long unwrapValue(Oid beanType) { if (beanType == null) { return null; diff --git a/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java b/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java index ad9e7c99d..259b4b958 100644 --- a/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java +++ b/src/test/java/org/tests/model/ivo/converter/SysTimeConverter.java @@ -8,14 +8,17 @@ import java.sql.Timestamp; public class SysTimeConverter implements ScalarTypeConverter { + @Override public SysTime getNullValue() { return null; } + @Override public Timestamp unwrapValue(SysTime beanType) { return new Timestamp(beanType.getMillis()); } + @Override public SysTime wrapValue(Timestamp scalarType) { return new SysTime(scalarType.getTime()); } diff --git a/src/test/java/org/tests/model/json/PlainBean.java b/src/test/java/org/tests/model/json/PlainBean.java index b9b59108c..e5fd4a647 100644 --- a/src/test/java/org/tests/model/json/PlainBean.java +++ b/src/test/java/org/tests/model/json/PlainBean.java @@ -25,6 +25,7 @@ public class PlainBean { public PlainBean() { } + @Override public String toString() { return "name:" + name; } diff --git a/src/test/java/org/tests/singleTableInheritance/model/Zone.java b/src/test/java/org/tests/singleTableInheritance/model/Zone.java index 7d64a1ab3..0c27f7742 100644 --- a/src/test/java/org/tests/singleTableInheritance/model/Zone.java +++ b/src/test/java/org/tests/singleTableInheritance/model/Zone.java @@ -26,6 +26,7 @@ public class Zone { this.id = id; } + @Override public int hashCode() { if (getId() != null) return getId().hashCode(); else return super.hashCode(); diff --git a/src/test/java/org/tests/transaction/TestNested.java b/src/test/java/org/tests/transaction/TestNested.java index c3531dec4..26f893a4a 100644 --- a/src/test/java/org/tests/transaction/TestNested.java +++ b/src/test/java/org/tests/transaction/TestNested.java @@ -20,6 +20,7 @@ public class TestNested extends BaseTestCase { private void willFail() { Ebean.execute(new TxRunnable() { + @Override public void run() { String msg = "test rollback";