From 969a3c8b8d23c135c968b4d853c8023fd025ff36 Mon Sep 17 00:00:00 2001 From: Thibault Meyer Date: Sun, 6 Nov 2016 10:00:02 +0100 Subject: [PATCH] Replace explicit type with <> --- .../com/avaje/ebean/DRawSqlColumnsParser.java | 4 +- src/main/java/com/avaje/ebean/Ebean.java | 4 +- src/main/java/com/avaje/ebean/Model.java | 2 +- src/main/java/com/avaje/ebean/OrderBy.java | 12 +++--- src/main/java/com/avaje/ebean/RawSql.java | 10 ++--- src/main/java/com/avaje/ebean/TxScope.java | 8 ++-- .../avaje/ebean/bean/EntityBeanIntercept.java | 6 +-- .../avaje/ebean/bean/NodeUsageCollector.java | 2 +- .../ebean/common/AbstractBeanCollection.java | 2 +- .../java/com/avaje/ebean/common/BeanList.java | 26 ++++++------ .../java/com/avaje/ebean/common/BeanMap.java | 12 +++--- .../java/com/avaje/ebean/common/BeanSet.java | 14 +++---- .../avaje/ebean/common/ModifyCollection.java | 2 +- .../com/avaje/ebean/common/ModifyHolder.java | 8 ++-- .../com/avaje/ebean/common/ModifyList.java | 6 +-- .../com/avaje/ebean/config/PropertyMap.java | 2 +- .../com/avaje/ebean/config/ServerConfig.java | 34 +++++++-------- .../config/dbplatform/DbDefaultValue.java | 2 +- .../dbplatform/DbPlatformTypeLookup.java | 4 +- .../dbplatform/DbPlatformTypeMapping.java | 2 +- .../dbplatform/SequenceIdGenerator.java | 4 +- .../avaje/ebean/dbmigration/DbMigration.java | 2 +- .../ddlgeneration/platform/BaseTableDdl.java | 6 +-- .../platform/HistoryTableUpdate.java | 2 +- .../platform/util/IndexColumns.java | 2 +- .../ddlgeneration/platform/util/IndexSet.java | 2 +- .../dbmigration/migration/AddColumn.java | 2 +- .../dbmigration/migration/Applications.java | 2 +- .../dbmigration/migration/ChangeSet.java | 2 +- .../dbmigration/migration/CreateTable.java | 6 +-- .../dbmigration/migration/Migration.java | 2 +- .../model/MCompoundForeignKey.java | 4 +- .../avaje/ebean/dbmigration/model/MIndex.java | 4 +- .../avaje/ebean/dbmigration/model/MTable.java | 14 +++---- .../dbmigration/model/MigrationModel.java | 2 +- .../dbmigration/model/ModelContainer.java | 4 +- .../ebean/dbmigration/model/ModelDiff.java | 4 +- .../ebean/dbmigration/model/PendingDrops.java | 6 +-- .../build/ModelBuildPropertyVisitor.java | 2 +- .../ebean/event/changelog/ChangeSet.java | 4 +- .../ebean/event/readaudit/ReadEvent.java | 2 +- .../com/avaje/ebean/text/PathProperties.java | 4 +- .../avaje/ebean/text/json/EJsonReader.java | 8 ++-- .../ebean/text/json/JsonReadOptions.java | 2 +- .../ebean/text/json/JsonWriteOptions.java | 2 +- .../com/avaje/ebean/util/StringHelper.java | 6 +-- .../avaje/ebeaninternal/api/BindParams.java | 6 +-- .../ebeaninternal/api/LoadBeanRequest.java | 4 +- .../ebeaninternal/api/LoadManyRequest.java | 2 +- .../ebeaninternal/api/ManyWhereJoins.java | 4 +- .../api/SpiExpressionValidation.java | 2 +- .../api/TransactionEventBeans.java | 2 +- .../api/TransactionEventTable.java | 2 +- .../extraddl/model/ExtraDdl.java | 2 +- .../server/autotune/AutoTuneCollection.java | 4 +- .../server/autotune/model/Autotune.java | 2 +- .../server/autotune/model/ProfileDiff.java | 2 +- .../server/autotune/model/ProfileEmpty.java | 2 +- .../server/autotune/model/ProfileNew.java | 2 +- .../autotune/service/BaseQueryTuner.java | 2 +- .../autotune/service/ProfileManager.java | 2 +- .../autotune/service/ProfileOrigin.java | 4 +- .../service/ProfileOriginNodeUsage.java | 2 +- .../server/cache/CacheChangeSet.java | 10 ++--- .../server/cache/CachedBeanData.java | 4 +- .../server/cache/CachedBeanDataFromBean.java | 2 +- .../server/cache/CachedManyIds.java | 2 +- .../server/cache/DefaultCacheHolder.java | 4 +- .../server/cache/DefaultServerCache.java | 4 +- .../changelog/DefaultChangeLogRegister.java | 2 +- .../server/cluster/BinaryMessageList.java | 2 +- .../server/cluster/ClusterManager.java | 2 +- .../server/core/ClassPathScanners.java | 2 +- .../server/core/DefaultMetaInfoManager.java | 6 +-- .../server/core/DefaultServer.java | 28 ++++++------- .../ebeaninternal/server/core/DiffHelp.java | 2 +- .../server/core/InternString.java | 2 +- .../server/core/InternalConfiguration.java | 2 +- .../server/core/OrmQueryRequest.java | 2 +- .../server/core/PersistRequestBean.java | 2 +- .../server/core/RelationalQueryRequest.java | 2 +- .../server/core/bootup/BootupClasses.java | 42 +++++++++---------- .../server/core/bootup/DistillPackages.java | 4 +- .../server/core/bootup/ManifestReader.java | 2 +- .../deploy/BeanCollectionHelpFactory.java | 8 ++-- .../server/deploy/BeanDescriptor.java | 26 ++++++------ .../deploy/BeanDescriptorCacheHelp.java | 4 +- .../deploy/BeanDescriptorDraftHelp.java | 2 +- .../server/deploy/BeanDescriptorJsonHelp.java | 2 +- .../server/deploy/BeanDescriptorManager.java | 34 +++++++-------- .../deploy/BeanLifecycleAdapterFactory.java | 16 +++---- .../server/deploy/BeanListHelp.java | 8 ++-- .../server/deploy/BeanManagerFactory.java | 2 +- .../server/deploy/BeanMapHelp.java | 2 +- .../server/deploy/BeanPropertyAssoc.java | 2 +- .../server/deploy/BeanPropertyAssocMany.java | 10 ++--- .../server/deploy/BeanPropertyAssocOne.java | 8 ++-- .../server/deploy/BeanPropertyCompound.java | 4 +- .../deploy/BeanPropertyCompoundRoot.java | 2 +- .../server/deploy/BeanSetHelp.java | 6 +-- .../deploy/ChainedBeanPersistController.java | 6 +-- .../deploy/ChainedBeanPersistListener.java | 6 +-- .../ChainedBeanPostConstructListener.java | 4 +- .../server/deploy/ChainedBeanPostLoad.java | 4 +- .../deploy/ChainedBeanQueryAdapter.java | 4 +- .../server/deploy/DeployPropertyParser.java | 2 +- .../server/deploy/InheritInfo.java | 6 +-- .../server/deploy/IntersectionRow.java | 2 +- .../GeneratedPropertyFactory.java | 4 +- .../InsertTimestampFactory.java | 2 +- .../UpdateTimestampFactory.java | 2 +- .../server/deploy/id/IdBinderEmbedded.java | 2 +- .../deploy/meta/DeployBeanDescriptor.java | 36 ++++++++-------- .../deploy/meta/DeployBeanEmbedded.java | 2 +- .../deploy/meta/DeployBeanPropertyLists.java | 32 +++++++------- .../server/deploy/meta/DeployTableJoin.java | 4 +- .../server/deploy/parse/AnnotationBase.java | 4 +- .../server/deploy/parse/AnnotationParser.java | 2 +- .../server/deploy/parse/DeployBeanInfo.java | 2 +- .../server/deploy/parse/DeployInherit.java | 4 +- .../deploy/parse/DeployInheritInfo.java | 4 +- .../server/deploy/parse/SqlReservedWords.java | 2 +- .../ebeaninternal/server/el/ElFilter.java | 42 +++++++++---------- .../server/el/ElPropertyChainBuilder.java | 2 +- .../expression/DefaultExampleExpression.java | 4 +- .../expression/DefaultExpressionFactory.java | 12 +++--- .../expression/DefaultExpressionList.java | 14 +++---- .../expression/DefaultExpressionRequest.java | 2 +- .../expression/FilterExpressionList.java | 2 +- .../server/expression/InExpression.java | 2 +- .../server/expression/JunctionExpression.java | 4 +- .../server/expression/PrepareDocNested.java | 6 +-- .../server/grammer/EqlAdapter.java | 6 +-- .../server/grammer/EqlParser.java | 2 +- .../server/grammer/OperatorMapping.java | 2 +- .../server/lib/ShutdownManager.java | 2 +- .../server/lib/util/StringHelper.java | 2 +- .../server/loadcontext/DLoadBeanContext.java | 4 +- .../server/loadcontext/DLoadContext.java | 6 +-- .../server/loadcontext/DLoadManyContext.java | 4 +- .../server/persist/BatchControl.java | 2 +- .../server/persist/BatchedBeanHolder.java | 8 ++-- .../server/persist/BatchedPstmt.java | 2 +- .../server/persist/BatchedPstmtHolder.java | 2 +- .../server/persist/BindValues.java | 2 +- .../server/persist/DefaultPersister.java | 16 +++---- .../persist/DeleteUnloadedForeignKeys.java | 2 +- .../server/persist/dml/MetaFactory.java | 4 +- .../server/persist/dml/UpdateMeta.java | 2 +- .../server/persist/dmlbind/BindableList.java | 2 +- .../dmlbind/FactoryBaseProperties.java | 2 +- .../persist/dmlbind/FactoryEmbedded.java | 2 +- .../properties/BeanPropertiesReader.java | 2 +- .../ebeaninternal/server/query/CQuery.java | 2 +- .../server/query/SqlTreeBuilder.java | 2 +- .../server/querydefn/DefaultOrmQuery.java | 2 +- .../server/text/csv/CsvUtilReader.java | 4 +- .../server/text/csv/TCsvReader.java | 4 +- .../server/text/json/DJsonContext.java | 6 +-- .../server/text/json/WriteJson.java | 2 +- .../server/transaction/BeanPersistIdMap.java | 2 +- .../server/transaction/BeanPersistIds.java | 8 ++-- .../transaction/BulkEventListenerMap.java | 4 +- .../DefaultPersistenceContext.java | 6 +-- .../server/transaction/DeleteByIdMap.java | 2 +- .../server/transaction/JdbcTransaction.java | 12 +++--- .../transaction/RemoteTransactionEvent.java | 4 +- .../server/transaction/TransactionMap.java | 2 +- .../server/type/CtCompoundTypeScalarList.java | 6 +-- .../server/type/EnumToDbValueMap.java | 6 +-- .../type/ImmutableCompoundTypeBuilder.java | 4 +- .../server/type/ModifyAwareCollection.java | 2 +- .../server/type/ModifyAwareList.java | 12 +++--- .../server/type/ModifyAwareMap.java | 6 +-- .../server/type/ScalarTypeEnumStandard.java | 4 +- .../type/reflect/ImmutableMetaFactory.java | 6 +-- .../ebeaninternal/server/util/ArrayStack.java | 4 +- .../xmlmapping/model/XmEbean.java | 2 +- .../xmlmapping/model/XmEntity.java | 4 +- .../xmlmapping/model/XmRawSql.java | 4 +- .../docstore/api/DocStoreUpdates.java | 8 ++-- .../api/support/DocStoreBeanBaseAdapter.java | 4 +- .../docstore/api/support/DocStructure.java | 4 +- .../docstore/none/NoneDocStoreFactory.java | 2 +- .../ebean/EbeanServer_deleteAllByIdTest.java | 10 ++--- .../com/avaje/ebean/EbeanServer_refresh.java | 2 +- .../avaje/ebean/EbeanServer_saveAllTest.java | 2 +- .../ebean/TestPropertyChangeListener.java | 2 +- .../ebean/bean/EntityBeanInterceptTest.java | 2 +- .../com/avaje/ebean/common/BeanListTest.java | 30 ++++++------- .../com/avaje/ebean/common/BeanMapTest.java | 24 +++++------ .../com/avaje/ebean/common/BeanSetTest.java | 30 ++++++------- .../model/MigrationVersionTest.java | 2 +- .../dbmigration/model/PendingDropsTest.java | 2 +- .../ebean/event/BeanFindControllerTest.java | 2 +- .../event/BeanPersistControllerTest.java | 2 +- .../avaje/ebean/event/BeanPostLoadTest.java | 2 +- .../cache/CachedBeanDataSerializeTest.java | 2 +- .../server/changelog/Helper.java | 6 +-- .../deploy/BeanPropertyAssocManyTest.java | 4 +- .../deploy/DeployPropertyParserMapTests.java | 2 +- .../expression/AllEqualsExpressionTest.java | 6 +-- .../DefaultExampleExpressionTest.java | 2 +- .../expression/DefaultExpressionListTest.java | 2 +- .../expression/JunctionExpressionTest.java | 6 +-- .../expression/TDSpiExpressionRequest.java | 2 +- .../query/LimitOffsetPagedListTest.java | 2 +- .../server/query/OrderVersionDescTest.java | 2 +- .../server/querydefn/OrmQueryPlanKeyTest.java | 6 +-- .../querydefn/OrmQueryPropertiesTest.java | 6 +-- .../server/type/ModifyAwareListTest.java | 4 +- .../server/type/ModifyAwareMapTest.java | 12 +++--- .../server/type/ScalarTypeMonthDayTest.java | 2 +- .../type/ScalarTypePostgresHstoreTest.java | 6 +-- .../server/util/ArrayStackTest.java | 18 ++++---- .../support/DocStoreBeanBaseAdapterTest.java | 2 +- .../api/support/DocStoreIndexEventTest.java | 4 +- .../tests/basic/TestDeleteByIdCollection.java | 4 +- .../com/avaje/tests/basic/TestM2MVanilla.java | 2 +- .../basic/TestUuidInsertMasterDetail.java | 2 +- .../batchinsert/TestBatchInsertSimple.java | 6 +-- .../batchload/TestBatchLazyWithCacheHits.java | 2 +- .../tests/cache/TestCacheCollectionIds.java | 2 +- .../compositekeys/TestCKeyIdInExpression.java | 2 +- .../tests/compositekeys/TestCKeyLazyLoad.java | 2 +- ...ascadeDeleteChildrenWithCompositeKeys.java | 4 +- .../tests/draftable/LinkQueryPublishTest.java | 2 +- .../TestConstructorManyAddAll.java | 2 +- .../idkeys/TestPropertyChangeSupport.java | 2 +- .../tests/insert/TestInsertCollection.java | 6 +-- .../tests/insert/TestInsertOnStringKey.java | 2 +- .../com/avaje/tests/iud/TestCarWheelIud.java | 2 +- .../com/avaje/tests/json/TestDbJson_List.java | 4 +- .../include/TestJsonExcludeEmptyList.java | 4 +- .../json/include/TestJsonExcludeEmptyMap.java | 4 +- .../json/include/TestJsonExcludeEmptySet.java | 4 +- .../TestJsonExcludeTransientEmptyList.java | 4 +- .../transientproperties/TestModelAJson.java | 2 +- .../TestM2MDeleteObjectWithCascadeToM2m.java | 2 +- .../tests/m2m/TestM2MDeleteWithCascade.java | 2 +- .../avaje/tests/m2m/TestM2mDeleteObject.java | 4 +- .../avaje/tests/model/array/EArrayBean.java | 6 +-- .../tests/model/array/TestDbArray_basic.java | 4 +- .../com/avaje/tests/model/basic/Article.java | 2 +- .../avaje/tests/model/basic/CKeyParent.java | 2 +- .../java/com/avaje/tests/model/basic/Car.java | 2 +- .../com/avaje/tests/model/basic/Customer.java | 2 +- .../tests/model/basic/EVanillaCollection.java | 2 +- .../com/avaje/tests/model/basic/MUser.java | 2 +- .../com/avaje/tests/model/basic/MnocUser.java | 2 +- .../model/basic/MyEBasicConfigStartup.java | 2 +- .../avaje/tests/model/basic/OCachedBean.java | 4 +- .../com/avaje/tests/model/basic/Order.java | 4 +- .../tests/model/basic/ResetBasicData.java | 6 +-- .../com/avaje/tests/model/basic/Section.java | 2 +- .../com/avaje/tests/model/basic/TSMaster.java | 2 +- .../avaje/tests/model/basic/TSMasterTwo.java | 2 +- .../com/avaje/tests/model/basic/UTMaster.java | 2 +- .../xtra/TestDeleteUnloadedChildren.java | 4 +- .../TestInsertBatchThenFlushThenUpdate.java | 2 +- .../basic/xtra/TestInsertBatchThenUpdate.java | 2 +- ...TestInsertBatchWithDifferentRootTypes.java | 4 +- .../avaje/tests/model/info/InfoCompany.java | 4 +- .../avaje/tests/model/info/InfoCustomer.java | 2 +- .../java/com/avaje/tests/model/ivo/Oid.java | 6 +-- .../model/ivo/converter/OidTypeConverter.java | 2 +- .../avaje/tests/model/json/EBasicHstore.java | 2 +- .../tests/model/json/EBasicJsonList.java | 6 +-- .../com/avaje/tests/model/map/MpUser.java | 2 +- .../tests/model/onetoone/album/Album.java | 2 +- .../tests/model/onetoone/album/Cover.java | 2 +- .../album/DeleteById_SoftDelete_Tests.java | 4 +- .../tests/model/selfref/ResourceFile.java | 2 +- .../com/avaje/tests/model/survey/Group.java | 2 +- .../tests/model/survey/TestOrderByFetch.java | 8 ++-- ...estPersistenceContextScopeUsingOrders.java | 4 +- .../com/avaje/tests/query/TestSubQuery.java | 2 +- .../query/other/TestManyLazyLoadingQuery.java | 2 +- .../softdelete/TestSoftDeletePagingList.java | 2 +- .../tests/rawsql/inherit/ParentQueryTest.java | 2 +- .../rawsql/inherit/ParentRawSqlTest.java | 10 ++--- .../avaje/tests/readaudit/TestReadAudit.java | 6 +-- .../tests/softdelete/TestSoftDeleteTop.java | 4 +- .../tests/sp/TestManyToManySaveTwice.java | 2 +- .../avaje/tests/text/json/TestJsonSimple.java | 2 +- .../transaction/TestInsertManyAndRef.java | 2 +- .../tests/unitinternal/TestOrderByParse.java | 26 ++++++------ .../tests/update/TestStatelessUpdate.java | 14 +++---- .../avaje/ebeantest/LoggedSqlCollector.java | 6 +-- .../avaje/test/model/rawsql/inherit/Data.java | 2 +- .../test/model/rawsql/inherit/Parent.java | 2 +- 291 files changed, 743 insertions(+), 743 deletions(-) diff --git a/src/main/java/com/avaje/ebean/DRawSqlColumnsParser.java b/src/main/java/com/avaje/ebean/DRawSqlColumnsParser.java index dab7d91ad..1c4e0e623 100644 --- a/src/main/java/com/avaje/ebean/DRawSqlColumnsParser.java +++ b/src/main/java/com/avaje/ebean/DRawSqlColumnsParser.java @@ -30,7 +30,7 @@ final class DRawSqlColumnsParser { private ColumnMapping parse() { - ArrayList columns = new ArrayList(); + ArrayList columns = new ArrayList<>(); while (pos <= end) { ColumnMapping.Column c = nextColumnInfo(); columns.add(c); @@ -47,7 +47,7 @@ final class DRawSqlColumnsParser { String[] split = colInfo.split("\\s(?=[^\\)]*(?:\\(|$))"); if (split.length > 1) { - ArrayList tmp = new ArrayList(split.length); + ArrayList tmp = new ArrayList<>(split.length); for (int i = 0; i < split.length; i++) { if (!split[i].trim().isEmpty()) { tmp.add(split[i].trim()); diff --git a/src/main/java/com/avaje/ebean/Ebean.java b/src/main/java/com/avaje/ebean/Ebean.java index ffd330b1a..33020f033 100644 --- a/src/main/java/com/avaje/ebean/Ebean.java +++ b/src/main/java/com/avaje/ebean/Ebean.java @@ -132,13 +132,13 @@ public final class Ebean { /** * Cache for fast concurrent read access. */ - private final ConcurrentHashMap concMap = new ConcurrentHashMap(); + private final ConcurrentHashMap concMap = new ConcurrentHashMap<>(); /** * Cache for synchronized read, creation and put. Protected by the monitor * object. */ - private final HashMap syncMap = new HashMap(); + private final HashMap syncMap = new HashMap<>(); private final Object monitor = new Object(); diff --git a/src/main/java/com/avaje/ebean/Model.java b/src/main/java/com/avaje/ebean/Model.java index f03e52706..d4553a528 100644 --- a/src/main/java/com/avaje/ebean/Model.java +++ b/src/main/java/com/avaje/ebean/Model.java @@ -512,7 +512,7 @@ public abstract class Model { * Create and return a new Finder for a different server. */ public Finder on(String server) { - return new Finder(server, type); + return new Finder<>(server, type); } /** diff --git a/src/main/java/com/avaje/ebean/OrderBy.java b/src/main/java/com/avaje/ebean/OrderBy.java index ff1b8cc1c..5ccd42bf8 100644 --- a/src/main/java/com/avaje/ebean/OrderBy.java +++ b/src/main/java/com/avaje/ebean/OrderBy.java @@ -28,7 +28,7 @@ public final class OrderBy implements Serializable { * Create an empty OrderBy with no associated query. */ public OrderBy() { - this.list = new ArrayList(3); + this.list = new ArrayList<>(3); } private OrderBy(List list) { @@ -52,7 +52,7 @@ public final class OrderBy implements Serializable { */ public OrderBy(Query query, String orderByClause) { this.query = query; - this.list = new ArrayList(3); + this.list = new ArrayList<>(3); parse(orderByClause); } @@ -100,11 +100,11 @@ public final class OrderBy implements Serializable { * Return a copy of this OrderBy with the path trimmed. */ public OrderBy copyWithTrim(String path) { - List newList = new ArrayList(list.size()); + List newList = new ArrayList<>(list.size()); for (int i = 0; i < list.size(); i++) { newList.add(list.get(i).copyWithTrim(path)); } - return new OrderBy(newList); + return new OrderBy<>(newList); } /** @@ -141,7 +141,7 @@ public final class OrderBy implements Serializable { */ public OrderBy copy() { - OrderBy copy = new OrderBy(); + OrderBy copy = new OrderBy<>(); for (int i = 0; i < list.size(); i++) { copy.add(list.get(i).copy()); } @@ -370,7 +370,7 @@ public final class OrderBy implements Serializable { return null; } - ArrayList wordList = new ArrayList(pairs.length); + ArrayList wordList = new ArrayList<>(pairs.length); for (int i = 0; i < pairs.length; i++) { if (!isEmptyString(pairs[i])) { wordList.add(pairs[i]); diff --git a/src/main/java/com/avaje/ebean/RawSql.java b/src/main/java/com/avaje/ebean/RawSql.java index a5488de72..54cf268f5 100644 --- a/src/main/java/com/avaje/ebean/RawSql.java +++ b/src/main/java/com/avaje/ebean/RawSql.java @@ -401,7 +401,7 @@ public final class RawSql implements Serializable { this.parsed = true; this.propertyMap = null; this.propertyColumnMap = null; - this.dbColumnMap = new LinkedHashMap(); + this.dbColumnMap = new LinkedHashMap<>(); for (int i = 0; i < columns.size(); i++) { Column c = columns.get(i); dbColumnMap.put(c.getDbColumnKey(), c); @@ -416,7 +416,7 @@ public final class RawSql implements Serializable { this.parsed = false; this.propertyMap = null; this.propertyColumnMap = null; - this.dbColumnMap = new LinkedHashMap(); + this.dbColumnMap = new LinkedHashMap<>(); } /** @@ -426,7 +426,7 @@ public final class RawSql implements Serializable { this.immutable = false; this.parsed = false; this.propertyMap = null; - this.dbColumnMap = new LinkedHashMap(); + this.dbColumnMap = new LinkedHashMap<>(); int pos = 0; for (String prop : propertyNames) { @@ -443,8 +443,8 @@ public final class RawSql implements Serializable { this.parsed = parsed; this.dbColumnMap = dbColumnMap; - HashMap pcMap = new HashMap(); - HashMap pMap = new HashMap(); + HashMap pcMap = new HashMap<>(); + HashMap pMap = new HashMap<>(); for (Column c : dbColumnMap.values()) { pMap.put(c.getPropertyName(), c.getDbColumn()); diff --git a/src/main/java/com/avaje/ebean/TxScope.java b/src/main/java/com/avaje/ebean/TxScope.java index 0811f63b5..36c6f0633 100644 --- a/src/main/java/com/avaje/ebean/TxScope.java +++ b/src/main/java/com/avaje/ebean/TxScope.java @@ -282,7 +282,7 @@ public final class TxScope { */ public TxScope setRollbackFor(Class rollbackThrowable) { if (rollbackFor == null) { - rollbackFor = new ArrayList>(2); + rollbackFor = new ArrayList<>(2); } rollbackFor.add(rollbackThrowable); return this; @@ -294,7 +294,7 @@ public final class TxScope { @SuppressWarnings("unchecked") public TxScope setRollbackFor(Class[] rollbackThrowables) { if (rollbackFor == null) { - rollbackFor = new ArrayList>(rollbackThrowables.length); + rollbackFor = new ArrayList<>(rollbackThrowables.length); } for (int i = 0; i < rollbackThrowables.length; i++) { rollbackFor.add((Class) rollbackThrowables[i]); @@ -316,7 +316,7 @@ public final class TxScope { */ public TxScope setNoRollbackFor(Class noRollback) { if (noRollbackFor == null) { - noRollbackFor = new ArrayList>(2); + noRollbackFor = new ArrayList<>(2); } this.noRollbackFor.add(noRollback); return this; @@ -328,7 +328,7 @@ public final class TxScope { @SuppressWarnings("unchecked") public TxScope setNoRollbackFor(Class[] noRollbacks) { if (noRollbackFor == null) { - noRollbackFor = new ArrayList>(noRollbacks.length); + noRollbackFor = new ArrayList<>(noRollbacks.length); } for (int i = 0; i < noRollbacks.length; i++) { noRollbackFor.add((Class) noRollbacks[i]); diff --git a/src/main/java/com/avaje/ebean/bean/EntityBeanIntercept.java b/src/main/java/com/avaje/ebean/bean/EntityBeanIntercept.java index 22d68e0e4..3cef1e723 100644 --- a/src/main/java/com/avaje/ebean/bean/EntityBeanIntercept.java +++ b/src/main/java/com/avaje/ebean/bean/EntityBeanIntercept.java @@ -587,7 +587,7 @@ public final class EntityBeanIntercept implements Serializable { if (fullyLoadedBean) { return null; } - Set props = new LinkedHashSet(); + Set props = new LinkedHashSet<>(); for (int i=0; i getDirtyPropertyNames() { - Set props = new LinkedHashSet(); + Set props = new LinkedHashSet<>(); addDirtyPropertyNames(props, null); return props; } @@ -666,7 +666,7 @@ public final class EntityBeanIntercept implements Serializable { * Return a map of dirty properties with their new and old values. */ public Map getDirtyValues() { - Map dirtyValues = new LinkedHashMap(); + Map dirtyValues = new LinkedHashMap<>(); addDirtyPropertyValues(dirtyValues, null); return dirtyValues; } diff --git a/src/main/java/com/avaje/ebean/bean/NodeUsageCollector.java b/src/main/java/com/avaje/ebean/bean/NodeUsageCollector.java index 405b36e9f..6eb6333ac 100644 --- a/src/main/java/com/avaje/ebean/bean/NodeUsageCollector.java +++ b/src/main/java/com/avaje/ebean/bean/NodeUsageCollector.java @@ -29,7 +29,7 @@ public final class NodeUsageCollector { /** * The properties used at this profile point. */ - private final Set used = new LinkedHashSet(); + private final Set used = new LinkedHashSet<>(); /** * set to true if the bean is modified (setter called) diff --git a/src/main/java/com/avaje/ebean/common/AbstractBeanCollection.java b/src/main/java/com/avaje/ebean/common/AbstractBeanCollection.java index d7270fcbf..acd15d700 100644 --- a/src/main/java/com/avaje/ebean/common/AbstractBeanCollection.java +++ b/src/main/java/com/avaje/ebean/common/AbstractBeanCollection.java @@ -159,7 +159,7 @@ public abstract class AbstractBeanCollection implements BeanCollection { protected ModifyHolder getModifyHolder() { if (modifyHolder == null) { - modifyHolder = new ModifyHolder(); + modifyHolder = new ModifyHolder<>(); } return modifyHolder; } diff --git a/src/main/java/com/avaje/ebean/common/BeanList.java b/src/main/java/com/avaje/ebean/common/BeanList.java index 2b01cd367..663154fd1 100644 --- a/src/main/java/com/avaje/ebean/common/BeanList.java +++ b/src/main/java/com/avaje/ebean/common/BeanList.java @@ -37,7 +37,7 @@ public final class BeanList extends AbstractBeanCollection implements List * Uses an ArrayList as the underlying List implementation. */ public BeanList() { - this(new ArrayList()); + this(new ArrayList<>()); } /** @@ -68,7 +68,7 @@ public final class BeanList extends AbstractBeanCollection implements List @SuppressWarnings("unchecked") public void loadFrom(BeanCollection other) { if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); } list.addAll((Collection) other.getActualDetails()); } @@ -76,7 +76,7 @@ public final class BeanList extends AbstractBeanCollection implements List @SuppressWarnings("unchecked") public void internalAdd(Object bean) { if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); } if (bean != null) { list.add((E) bean); @@ -92,7 +92,7 @@ public final class BeanList extends AbstractBeanCollection implements List public boolean checkEmptyLazyLoad() { if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); return true; } else { return false; @@ -105,7 +105,7 @@ public final class BeanList extends AbstractBeanCollection implements List if (!disableLazyLoad && modifyListening) { lazyLoadCollection(true); } else { - list = new ArrayList(); + list = new ArrayList<>(); } } } @@ -115,7 +115,7 @@ public final class BeanList extends AbstractBeanCollection implements List synchronized (this) { if (list == null) { if (disableLazyLoad) { - list = new ArrayList(); + list = new ArrayList<>(); } else { lazyLoadCollection(false); } @@ -296,11 +296,11 @@ public final class BeanList extends AbstractBeanCollection implements List public Iterator iterator() { init(); if (isReadOnly()) { - return new ReadOnlyListIterator(list.listIterator()); + return new ReadOnlyListIterator<>(list.listIterator()); } if (modifyListening) { Iterator it = list.iterator(); - return new ModifyIterator(this, it); + return new ModifyIterator<>(this, it); } return list.iterator(); } @@ -313,11 +313,11 @@ public final class BeanList extends AbstractBeanCollection implements List public ListIterator listIterator() { init(); if (isReadOnly()) { - return new ReadOnlyListIterator(list.listIterator()); + return new ReadOnlyListIterator<>(list.listIterator()); } if (modifyListening) { ListIterator it = list.listIterator(); - return new ModifyListIterator(this, it); + return new ModifyListIterator<>(this, it); } return list.listIterator(); } @@ -325,11 +325,11 @@ public final class BeanList extends AbstractBeanCollection implements List public ListIterator listIterator(int index) { init(); if (isReadOnly()) { - return new ReadOnlyListIterator(list.listIterator(index)); + return new ReadOnlyListIterator<>(list.listIterator(index)); } if (modifyListening) { ListIterator it = list.listIterator(index); - return new ModifyListIterator(this, it); + return new ModifyListIterator<>(this, it); } return list.listIterator(index); } @@ -425,7 +425,7 @@ public final class BeanList extends AbstractBeanCollection implements List return Collections.unmodifiableList(list.subList(fromIndex, toIndex)); } if (modifyListening) { - return new ModifyList(this, list.subList(fromIndex, toIndex)); + return new ModifyList<>(this, list.subList(fromIndex, toIndex)); } return list.subList(fromIndex, toIndex); } diff --git a/src/main/java/com/avaje/ebean/common/BeanMap.java b/src/main/java/com/avaje/ebean/common/BeanMap.java index 2ad9feadf..54d5cd4d2 100644 --- a/src/main/java/com/avaje/ebean/common/BeanMap.java +++ b/src/main/java/com/avaje/ebean/common/BeanMap.java @@ -33,7 +33,7 @@ public final class BeanMap extends AbstractBeanCollection implements Ma * Create using a underlying LinkedHashMap. */ public BeanMap() { - this(new LinkedHashMap()); + this(new LinkedHashMap<>()); } public BeanMap(BeanCollectionLoader ebeanServer, EntityBean ownerBean, String propertyName) { @@ -61,14 +61,14 @@ public final class BeanMap extends AbstractBeanCollection implements Ma public void internalPutNull() { if (map == null) { - map = new LinkedHashMap(); + map = new LinkedHashMap<>(); } } @SuppressWarnings("unchecked") public void internalPut(Object key, Object bean) { if (map == null) { - map = new LinkedHashMap(); + map = new LinkedHashMap<>(); } if (key != null) { map.put((K) key, (E) bean); @@ -108,7 +108,7 @@ public final class BeanMap extends AbstractBeanCollection implements Ma public boolean checkEmptyLazyLoad() { if (map == null) { - map = new LinkedHashMap(); + map = new LinkedHashMap<>(); return true; } else { return false; @@ -121,7 +121,7 @@ public final class BeanMap extends AbstractBeanCollection implements Ma if (modifyListening) { lazyLoadCollection(true); } else { - map = new LinkedHashMap(); + map = new LinkedHashMap<>(); } } } @@ -313,7 +313,7 @@ public final class BeanMap extends AbstractBeanCollection implements Ma } if (modifyListening) { Collection c = map.values(); - return new ModifyCollection(this, c); + return new ModifyCollection<>(this, c); } return map.values(); } diff --git a/src/main/java/com/avaje/ebean/common/BeanSet.java b/src/main/java/com/avaje/ebean/common/BeanSet.java index 67df7ddb2..f7b780681 100644 --- a/src/main/java/com/avaje/ebean/common/BeanSet.java +++ b/src/main/java/com/avaje/ebean/common/BeanSet.java @@ -34,7 +34,7 @@ public final class BeanSet extends AbstractBeanCollection implements Set()); + this(new LinkedHashSet<>()); } public BeanSet(BeanCollectionLoader loader, EntityBean ownerBean, String propertyName) { @@ -61,7 +61,7 @@ public final class BeanSet extends AbstractBeanCollection implements Set other) { if (set == null) { - set = new LinkedHashSet(); + set = new LinkedHashSet<>(); } set.addAll((Collection) other.getActualDetails()); } @@ -76,7 +76,7 @@ public final class BeanSet extends AbstractBeanCollection implements Set(); + set = new LinkedHashSet<>(); } if (bean != null) { set.add((E) bean); @@ -100,7 +100,7 @@ public final class BeanSet extends AbstractBeanCollection implements Set(); + set = new LinkedHashSet<>(); return true; } else { return false; @@ -113,7 +113,7 @@ public final class BeanSet extends AbstractBeanCollection implements Set(); + set = new LinkedHashSet<>(); } } } @@ -256,10 +256,10 @@ public final class BeanSet extends AbstractBeanCollection implements Set iterator() { init(); if (isReadOnly()) { - return new ReadOnlyIterator(set.iterator()); + return new ReadOnlyIterator<>(set.iterator()); } if (modifyListening) { - return new ModifyIterator(this, set.iterator()); + return new ModifyIterator<>(this, set.iterator()); } return set.iterator(); } diff --git a/src/main/java/com/avaje/ebean/common/ModifyCollection.java b/src/main/java/com/avaje/ebean/common/ModifyCollection.java index e2aa5eff4..cd71bc42c 100644 --- a/src/main/java/com/avaje/ebean/common/ModifyCollection.java +++ b/src/main/java/com/avaje/ebean/common/ModifyCollection.java @@ -72,7 +72,7 @@ class ModifyCollection implements Collection { @Override public Iterator iterator() { Iterator it = c.iterator(); - return new ModifyIterator(owner, it); + return new ModifyIterator<>(owner, it); } @Override diff --git a/src/main/java/com/avaje/ebean/common/ModifyHolder.java b/src/main/java/com/avaje/ebean/common/ModifyHolder.java index b11f0d39d..9a9180810 100644 --- a/src/main/java/com/avaje/ebean/common/ModifyHolder.java +++ b/src/main/java/com/avaje/ebean/common/ModifyHolder.java @@ -21,16 +21,16 @@ class ModifyHolder implements Serializable { /** * Deletions list for manyToMany persistence. */ - private Set modifyDeletions = new LinkedHashSet(); + private Set modifyDeletions = new LinkedHashSet<>(); /** * Additions list for manyToMany persistence. */ - private Set modifyAdditions = new LinkedHashSet(); + private Set modifyAdditions = new LinkedHashSet<>(); void reset() { - modifyDeletions = new LinkedHashSet(); - modifyAdditions = new LinkedHashSet(); + modifyDeletions = new LinkedHashSet<>(); + modifyAdditions = new LinkedHashSet<>(); } /** diff --git a/src/main/java/com/avaje/ebean/common/ModifyList.java b/src/main/java/com/avaje/ebean/common/ModifyList.java index bb2e3afa1..b0ee8e971 100644 --- a/src/main/java/com/avaje/ebean/common/ModifyList.java +++ b/src/main/java/com/avaje/ebean/common/ModifyList.java @@ -61,11 +61,11 @@ class ModifyList extends ModifyCollection implements List { } public ListIterator listIterator() { - return new ModifyListIterator(owner, list.listIterator()); + return new ModifyListIterator<>(owner, list.listIterator()); } public ListIterator listIterator(int index) { - return new ModifyListIterator(owner, list.listIterator(index)); + return new ModifyListIterator<>(owner, list.listIterator(index)); } public E remove(int index) { @@ -82,7 +82,7 @@ class ModifyList extends ModifyCollection implements List { } public List subList(int fromIndex, int toIndex) { - return new ModifyList(owner, list.subList(fromIndex, toIndex)); + return new ModifyList<>(owner, list.subList(fromIndex, toIndex)); } } diff --git a/src/main/java/com/avaje/ebean/config/PropertyMap.java b/src/main/java/com/avaje/ebean/config/PropertyMap.java index 8e2f8db70..3c9482953 100644 --- a/src/main/java/com/avaje/ebean/config/PropertyMap.java +++ b/src/main/java/com/avaje/ebean/config/PropertyMap.java @@ -16,7 +16,7 @@ public final class PropertyMap implements Serializable { private static final long serialVersionUID = 1L; - private final LinkedHashMap map = new LinkedHashMap(); + private final LinkedHashMap map = new LinkedHashMap<>(); /** * Return properties loaded from test-ebean.properties. diff --git a/src/main/java/com/avaje/ebean/config/ServerConfig.java b/src/main/java/com/avaje/ebean/config/ServerConfig.java index 5a16413b2..14e2e6085 100644 --- a/src/main/java/com/avaje/ebean/config/ServerConfig.java +++ b/src/main/java/com/avaje/ebean/config/ServerConfig.java @@ -81,11 +81,11 @@ public class ServerConfig { * Typically configuration type objects that are passed by this ServerConfig * to plugins. For example - IgniteConfiguration passed to Ignite plugin. */ - private Map serviceObject = new HashMap(); + private Map serviceObject = new HashMap<>(); private ContainerConfig containerConfig; - private List customDbTypeMappings = new ArrayList(); + private List customDbTypeMappings = new ArrayList<>(); /** * The underlying properties that were used during configuration. @@ -121,13 +121,13 @@ public class ServerConfig { * List of interesting classes such as entities, embedded, ScalarTypes, * Listeners, Finders, Controllers etc. */ - private List> classes = new ArrayList>(); + private List> classes = new ArrayList<>(); /** * The packages that are searched for interesting classes. Only used when * classes is empty/not explicitly specified. */ - private List packages = new ArrayList(); + private List packages = new ArrayList<>(); /** * Configuration for the ElasticSearch integration. @@ -331,15 +331,15 @@ public class ServerConfig { private DbUuid dbUuid = DbUuid.AUTO_VARCHAR; - private List idGenerators = new ArrayList(); - private List findControllers = new ArrayList(); - private List persistControllers = new ArrayList(); - private List postLoaders = new ArrayList(); - private List postConstructListeners = new ArrayList(); - private List persistListeners = new ArrayList(); - private List queryAdapters = new ArrayList(); - private List bulkTableEventListeners = new ArrayList(); - private List configStartupListeners = new ArrayList(); + private List idGenerators = new ArrayList<>(); + private List findControllers = new ArrayList<>(); + private List persistControllers = new ArrayList<>(); + private List postLoaders = new ArrayList<>(); + private List postConstructListeners = new ArrayList<>(); + private List persistListeners = new ArrayList<>(); + private List queryAdapters = new ArrayList<>(); + private List bulkTableEventListeners = new ArrayList<>(); + private List configStartupListeners = new ArrayList<>(); /** * By default inserts are included in the change log. @@ -1726,7 +1726,7 @@ public class ServerConfig { */ public void addClass(Class cls) { if (classes == null) { - classes = new ArrayList>(); + classes = new ArrayList<>(); } classes.add(cls); } @@ -1739,7 +1739,7 @@ public class ServerConfig { */ public void addPackage(String packageName) { if (packages == null) { - packages = new ArrayList(); + packages = new ArrayList<>(); } packages.add(packageName); } @@ -2488,7 +2488,7 @@ public class ServerConfig { return classes; } - List> classes = new ArrayList>(); + List> classes = new ArrayList<>(); String[] split = classNames.split("[ ,;]"); for (int i = 0; i < split.length; i++) { @@ -2507,7 +2507,7 @@ public class ServerConfig { private List getSearchJarsPackages(String searchPackages) { - List hitList = new ArrayList(); + List hitList = new ArrayList<>(); if (searchPackages != null) { diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbDefaultValue.java b/src/main/java/com/avaje/ebean/config/dbplatform/DbDefaultValue.java index 0a0776318..2a5aa82d2 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DbDefaultValue.java +++ b/src/main/java/com/avaje/ebean/config/dbplatform/DbDefaultValue.java @@ -23,7 +23,7 @@ public class DbDefaultValue { */ public static final String NOW = "now"; - protected Map map = new LinkedHashMap(); + protected Map map = new LinkedHashMap<>(); /** * Set the DB now function. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeLookup.java b/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeLookup.java index 57a0b1083..ca9c39341 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeLookup.java +++ b/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeLookup.java @@ -11,12 +11,12 @@ class DbPlatformTypeLookup { /** * A map to lookup the type by name. */ - private Map nameLookup = new HashMap(); + private Map nameLookup = new HashMap<>(); /** * A map to lookup the type by JDBC int value. */ - private Map idLookup = new HashMap(); + private Map idLookup = new HashMap<>(); DbPlatformTypeLookup() { addAll(); diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeMapping.java b/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeMapping.java index 94c3f3a8a..c2c2d791c 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeMapping.java +++ b/src/main/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeMapping.java @@ -25,7 +25,7 @@ public class DbPlatformTypeMapping { private static final DbPlatformType MULTILINESTRING = new DbPlatformType("multilinestring"); private static final DbPlatformType MULTIPOLYGON = new DbPlatformType("multipolygon"); - private final Map typeMap = new HashMap(); + private final Map typeMap = new HashMap<>(); /** * Return the DbTypeMap with standard (not platform specific) types. diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/SequenceIdGenerator.java b/src/main/java/com/avaje/ebean/config/dbplatform/SequenceIdGenerator.java index e0ce358ec..d996938fc 100644 --- a/src/main/java/com/avaje/ebean/config/dbplatform/SequenceIdGenerator.java +++ b/src/main/java/com/avaje/ebean/config/dbplatform/SequenceIdGenerator.java @@ -40,7 +40,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator { protected final BackgroundExecutor backgroundExecutor; - protected final ArrayList idList = new ArrayList(50); + protected final ArrayList idList = new ArrayList<>(50); protected final int batchSize; @@ -178,7 +178,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator { String sql = getSql(loadSize); - ArrayList newIds = new ArrayList(loadSize); + ArrayList newIds = new ArrayList<>(loadSize); boolean useTxnConnection = t != null; diff --git a/src/main/java/com/avaje/ebean/dbmigration/DbMigration.java b/src/main/java/com/avaje/ebean/dbmigration/DbMigration.java index 06692d82c..20d112b57 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/DbMigration.java +++ b/src/main/java/com/avaje/ebean/dbmigration/DbMigration.java @@ -79,7 +79,7 @@ public class DbMigration { protected DatabasePlatform databasePlatform; - protected List platforms = new ArrayList(); + protected List platforms = new ArrayList<>(); protected ServerConfig serverConfig; diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java index 94deb10d1..1cb4a9818 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java +++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java @@ -53,7 +53,7 @@ public class BaseTableDdl implements TableDdl { /** * Used when unique constraints specifically for OneToOne can't be created normally (MsSqlServer). */ - protected List externalUnique = new ArrayList(); + protected List externalUnique = new ArrayList<>(); // counters used when constraint names are truncated due to maximum length // and these counters are used to keep the constraint name unique @@ -66,7 +66,7 @@ public class BaseTableDdl implements TableDdl { * Base tables that have associated history tables that need their triggers/functions regenerated as * columns have been added, removed, included or excluded. */ - protected Map regenerateHistoryTriggers = new LinkedHashMap(); + protected Map regenerateHistoryTriggers = new LinkedHashMap<>(); /** * Construct with a naming convention and platform specific DDL. @@ -499,7 +499,7 @@ public class BaseTableDdl implements TableDdl { * Return the list of columns that make the primary key. */ protected List determinePrimaryKeyColumns(List columns) { - List pk = new ArrayList(3); + List pk = new ArrayList<>(3); for (Column column : columns) { if (isTrue(column.isPrimaryKey())) { pk.add(column); diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java index 8f743fc91..dc3505f4b 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java +++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java @@ -43,7 +43,7 @@ public class HistoryTableUpdate { private final String baseTable; - private final List columnChanges = new ArrayList(); + private final List columnChanges = new ArrayList<>(); /** * Construct with a given base table name. diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java index f0475f468..309a44ebe 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java +++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexColumns.java @@ -8,7 +8,7 @@ import java.util.List; */ public class IndexColumns { - List columns = new ArrayList(4); + List columns = new ArrayList<>(4); /** * Construct representing as a single column index. diff --git a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexSet.java b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexSet.java index d4421524e..3e8148542 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexSet.java +++ b/src/main/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/IndexSet.java @@ -11,7 +11,7 @@ import java.util.List; */ public class IndexSet { - private List indexes = new ArrayList(); + private List indexes = new ArrayList<>(); /** * Clear the indexes (for each table). diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/AddColumn.java b/src/main/java/com/avaje/ebean/dbmigration/migration/AddColumn.java index 58de889a3..16c01d2af 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/AddColumn.java +++ b/src/main/java/com/avaje/ebean/dbmigration/migration/AddColumn.java @@ -70,7 +70,7 @@ public class AddColumn { */ public List getColumn() { if (column == null) { - column = new ArrayList(); + column = new ArrayList<>(); } return this.column; } diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Applications.java b/src/main/java/com/avaje/ebean/dbmigration/migration/Applications.java index 3c6b52774..262bd6ecc 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/Applications.java +++ b/src/main/java/com/avaje/ebean/dbmigration/migration/Applications.java @@ -61,7 +61,7 @@ public class Applications { */ public List getApplication() { if (application == null) { - application = new ArrayList(); + application = new ArrayList<>(); } return this.application; } diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSet.java b/src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSet.java index 8341525c5..df76e2d0a 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSet.java +++ b/src/main/java/com/avaje/ebean/dbmigration/migration/ChangeSet.java @@ -113,7 +113,7 @@ public class ChangeSet { */ public List getChangeSetChildren() { if (changeSetChildren == null) { - changeSetChildren = new ArrayList(); + changeSetChildren = new ArrayList<>(); } return this.changeSetChildren; } diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/CreateTable.java b/src/main/java/com/avaje/ebean/dbmigration/migration/CreateTable.java index dac8198b0..f5a470a89 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/CreateTable.java +++ b/src/main/java/com/avaje/ebean/dbmigration/migration/CreateTable.java @@ -105,7 +105,7 @@ public class CreateTable { */ public List getColumn() { if (column == null) { - column = new ArrayList(); + column = new ArrayList<>(); } return this.column; } @@ -134,7 +134,7 @@ public class CreateTable { */ public List getUniqueConstraint() { if (uniqueConstraint == null) { - uniqueConstraint = new ArrayList(); + uniqueConstraint = new ArrayList<>(); } return this.uniqueConstraint; } @@ -163,7 +163,7 @@ public class CreateTable { */ public List getForeignKey() { if (foreignKey == null) { - foreignKey = new ArrayList(); + foreignKey = new ArrayList<>(); } return this.foreignKey; } diff --git a/src/main/java/com/avaje/ebean/dbmigration/migration/Migration.java b/src/main/java/com/avaje/ebean/dbmigration/migration/Migration.java index 54f97dcb7..611987e0d 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/migration/Migration.java +++ b/src/main/java/com/avaje/ebean/dbmigration/migration/Migration.java @@ -63,7 +63,7 @@ public class Migration { */ public List getChangeSet() { if (changeSet == null) { - changeSet = new ArrayList(); + changeSet = new ArrayList<>(); } return this.changeSet; } diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MCompoundForeignKey.java b/src/main/java/com/avaje/ebean/dbmigration/model/MCompoundForeignKey.java index 2d4803603..b528544cc 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/MCompoundForeignKey.java +++ b/src/main/java/com/avaje/ebean/dbmigration/model/MCompoundForeignKey.java @@ -16,8 +16,8 @@ public class MCompoundForeignKey { private String name; private final String referenceTable; - private final List columns = new ArrayList(); - private final List referenceColumns = new ArrayList(); + private final List columns = new ArrayList<>(); + private final List referenceColumns = new ArrayList<>(); private String indexName; public MCompoundForeignKey(String name, String referenceTable, String indexName) { diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MIndex.java b/src/main/java/com/avaje/ebean/dbmigration/model/MIndex.java index 5b3e4a112..0c2f9e1cf 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/MIndex.java +++ b/src/main/java/com/avaje/ebean/dbmigration/model/MIndex.java @@ -15,7 +15,7 @@ public class MIndex { private String indexName; - private List columns = new ArrayList(); + private List columns = new ArrayList<>(); /** * Create a single column non unique index. @@ -120,7 +120,7 @@ public class MIndex { private List split(String columns) { - List colList = new ArrayList(); + List colList = new ArrayList<>(); String[] cols = columns.split(","); for (int i = 0; i columns = new LinkedHashMap(); + private Map columns = new LinkedHashMap<>(); /** * Compound unique constraints. */ - private List uniqueConstraints = new ArrayList(); + private List uniqueConstraints = new ArrayList<>(); /** * Compound foreign keys. */ - private List compoundKeys = new ArrayList(); + private List compoundKeys = new ArrayList<>(); /** * Column name for the 'When created' column. This can be used for the initial effective start date when adding @@ -122,7 +122,7 @@ public class MTable { */ private AddColumn addColumn; - private List droppedColumns = new ArrayList(); + private List droppedColumns = new ArrayList<>(); /** * Create a copy of this table structure as a 'draft' table. @@ -369,7 +369,7 @@ public class MTable { public List allHistoryColumns(boolean includeDropped) { - List columnNames = new ArrayList(columns.size()); + List columnNames = new ArrayList<>(columns.size()); for (MColumn column : columns.values()) { if (column.isIncludeInHistory()) { columnNames.add(column.getName()); @@ -444,7 +444,7 @@ public class MTable { * Return the list of columns that make the primary key. */ public List primaryKeyColumns() { - List pk = new ArrayList(3); + List pk = new ArrayList<>(3); for (MColumn column : allColumns()) { if (column.isPrimaryKey()) { pk.add(column); @@ -590,7 +590,7 @@ public class MTable { * Return true if the foreign key names are not unique. */ private boolean hasDuplicateForeignKeys() { - Set fkNames = new HashSet(); + Set fkNames = new HashSet<>(); for (MCompoundForeignKey fk : compoundKeys) { if (!fkNames.add(fk.getName())) { return true; diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MigrationModel.java b/src/main/java/com/avaje/ebean/dbmigration/model/MigrationModel.java index b621bb6ce..3237ce697 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/MigrationModel.java +++ b/src/main/java/com/avaje/ebean/dbmigration/model/MigrationModel.java @@ -49,7 +49,7 @@ public class MigrationModel { } }); - List resources = new ArrayList(); + List resources = new ArrayList<>(); for (File xmlFile: xmlFiles) { resources.add(new MigrationResource(xmlFile, createVersion(xmlFile))); diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/ModelContainer.java b/src/main/java/com/avaje/ebean/dbmigration/model/ModelContainer.java index e3a41fdc2..1870ff332 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/ModelContainer.java +++ b/src/main/java/com/avaje/ebean/dbmigration/model/ModelContainer.java @@ -28,12 +28,12 @@ public class ModelContainer { /** * All the tables in the model. */ - private final Map tables = new LinkedHashMap(); + private final Map tables = new LinkedHashMap<>(); /** * All the non unique non foreign key indexes. */ - private final Map indexes = new LinkedHashMap(); + private final Map indexes = new LinkedHashMap<>(); private final PendingDrops pendingDrops = new PendingDrops(); diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/ModelDiff.java b/src/main/java/com/avaje/ebean/dbmigration/model/ModelDiff.java index da50becb7..b0c7ae749 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/ModelDiff.java +++ b/src/main/java/com/avaje/ebean/dbmigration/model/ModelDiff.java @@ -30,12 +30,12 @@ public class ModelDiff { /** * List of 'create' type changes. */ - private final List applyChanges = new ArrayList(); + private final List applyChanges = new ArrayList<>(); /** * List of 'drop' type changes. Expected to be placed into a separate DDL script. */ - private final List dropChanges = new ArrayList(); + private final List dropChanges = new ArrayList<>(); /** * Construct with a base model. diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/PendingDrops.java b/src/main/java/com/avaje/ebean/dbmigration/model/PendingDrops.java index cb4235f92..5a2875487 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/PendingDrops.java +++ b/src/main/java/com/avaje/ebean/dbmigration/model/PendingDrops.java @@ -16,7 +16,7 @@ import java.util.List; */ public class PendingDrops { - private final LinkedHashMap map = new LinkedHashMap(); + private final LinkedHashMap map = new LinkedHashMap<>(); /** * Add a 'pending drops' changeSet for the given version. @@ -36,7 +36,7 @@ public class PendingDrops { */ public List pendingDrops() { - List versions = new ArrayList(); + List versions = new ArrayList<>(); for (Entry value : map.values()) { if (value.hasPendingDrops()) { versions.add(value.version.asString()); @@ -143,7 +143,7 @@ public class PendingDrops { final MigrationVersion version; - final List list = new ArrayList(); + final List list = new ArrayList<>(); Entry(MigrationVersion version) { this.version = version; diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java b/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java index 2ad3925e2..7e66c16ed 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java +++ b/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildPropertyVisitor.java @@ -166,7 +166,7 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor { ImportedId importedId = p.getImportedId(); - List modelColumns = new ArrayList(columns.length); + List modelColumns = new ArrayList<>(columns.length); MCompoundForeignKey compoundKey = null; if (columns.length > 1) { diff --git a/src/main/java/com/avaje/ebean/event/changelog/ChangeSet.java b/src/main/java/com/avaje/ebean/event/changelog/ChangeSet.java index 5e229acf8..0285e83cf 100644 --- a/src/main/java/com/avaje/ebean/event/changelog/ChangeSet.java +++ b/src/main/java/com/avaje/ebean/event/changelog/ChangeSet.java @@ -49,7 +49,7 @@ public class ChangeSet { /** * The bean changes. */ - List changes = new ArrayList(); + List changes = new ArrayList<>(); /** * Construct with a txnId. @@ -182,7 +182,7 @@ public class ChangeSet { */ public Map getUserContext() { if (userContext == null) { - userContext = new LinkedHashMap(); + userContext = new LinkedHashMap<>(); } return userContext; } diff --git a/src/main/java/com/avaje/ebean/event/readaudit/ReadEvent.java b/src/main/java/com/avaje/ebean/event/readaudit/ReadEvent.java index 904742c95..5a95494af 100644 --- a/src/main/java/com/avaje/ebean/event/readaudit/ReadEvent.java +++ b/src/main/java/com/avaje/ebean/event/readaudit/ReadEvent.java @@ -159,7 +159,7 @@ public class ReadEvent { */ public Map getUserContext() { if (userContext == null) { - userContext = new LinkedHashMap(); + userContext = new LinkedHashMap<>(); } return userContext; } diff --git a/src/main/java/com/avaje/ebean/text/PathProperties.java b/src/main/java/com/avaje/ebean/text/PathProperties.java index 6eeb0b4dd..9944f2a8b 100644 --- a/src/main/java/com/avaje/ebean/text/PathProperties.java +++ b/src/main/java/com/avaje/ebean/text/PathProperties.java @@ -42,7 +42,7 @@ public class PathProperties implements FetchPath { */ public PathProperties() { this.rootProps = new Props(this, null, null); - this.pathMap = new LinkedHashMap(); + this.pathMap = new LinkedHashMap<>(); this.pathMap.put(null, rootProps); } @@ -172,7 +172,7 @@ public class PathProperties implements FetchPath { } private Props(PathProperties owner, String parentPath, String path) { - this(owner, parentPath, path, new LinkedHashSet()); + this(owner, parentPath, path, new LinkedHashSet<>()); } public String getPath() { diff --git a/src/main/java/com/avaje/ebean/text/json/EJsonReader.java b/src/main/java/com/avaje/ebean/text/json/EJsonReader.java index dba25227c..a6ee75616 100644 --- a/src/main/java/com/avaje/ebean/text/json/EJsonReader.java +++ b/src/main/java/com/avaje/ebean/text/json/EJsonReader.java @@ -286,11 +286,11 @@ class EJsonReader { private String key; ObjectContext() { - map = new LinkedHashMap(); + map = new LinkedHashMap<>(); } ObjectContext(ModifyAwareOwner owner) { - map = new ModifyAwareMap(owner, new LinkedHashMap()); + map = new ModifyAwareMap<>(owner, new LinkedHashMap<>()); } public void popContext(Context temp) { @@ -319,11 +319,11 @@ class EJsonReader { private final List values; ArrayContext() { - values = new ArrayList(); + values = new ArrayList<>(); } ArrayContext(ModifyAwareOwner owner) { - values = new ModifyAwareList(owner, new ArrayList()); + values = new ModifyAwareList<>(owner, new ArrayList<>()); } public void popContext(Context temp) { diff --git a/src/main/java/com/avaje/ebean/text/json/JsonReadOptions.java b/src/main/java/com/avaje/ebean/text/json/JsonReadOptions.java index a8569d078..d348a3875 100644 --- a/src/main/java/com/avaje/ebean/text/json/JsonReadOptions.java +++ b/src/main/java/com/avaje/ebean/text/json/JsonReadOptions.java @@ -29,7 +29,7 @@ public class JsonReadOptions { * Default constructor. */ public JsonReadOptions() { - this.visitorMap = new LinkedHashMap>(); + this.visitorMap = new LinkedHashMap<>(); } /** diff --git a/src/main/java/com/avaje/ebean/text/json/JsonWriteOptions.java b/src/main/java/com/avaje/ebean/text/json/JsonWriteOptions.java index c610d926e..5c80e0c43 100644 --- a/src/main/java/com/avaje/ebean/text/json/JsonWriteOptions.java +++ b/src/main/java/com/avaje/ebean/text/json/JsonWriteOptions.java @@ -85,7 +85,7 @@ public class JsonWriteOptions { */ public JsonWriteOptions setPathVisitor(String path, JsonWriteBeanVisitor visitor) { if (visitorMap == null) { - visitorMap = new HashMap>(); + visitorMap = new HashMap<>(); } visitorMap.put(path, visitor); return this; diff --git a/src/main/java/com/avaje/ebean/util/StringHelper.java b/src/main/java/com/avaje/ebean/util/StringHelper.java index 24fcabbfc..3eed6135c 100644 --- a/src/main/java/com/avaje/ebean/util/StringHelper.java +++ b/src/main/java/com/avaje/ebean/util/StringHelper.java @@ -37,7 +37,7 @@ public class StringHelper { throw new RuntimeException("missing quoted value at the end of " + tag); } - HashMap map = new HashMap(); + HashMap map = new HashMap<>(); // recursively parse out the name value pairs... return parseNameQuotedValue(map, tag, 0); } @@ -122,7 +122,7 @@ public class StringHelper { public static Map delimitedToMap(String allNameValuePairs, String listDelimiter, String nameValueSeparator) { - HashMap params = new HashMap(); + HashMap params = new HashMap<>(); if ((allNameValuePairs == null) || (allNameValuePairs.isEmpty())) { return params; } @@ -237,7 +237,7 @@ public class StringHelper { */ public static String[] delimitedToArray(String str, String delimiter, boolean keepEmpties) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); int startPos = 0; delimiter(str, delimiter, keepEmpties, startPos, list); String[] result = new String[list.size()]; diff --git a/src/main/java/com/avaje/ebeaninternal/api/BindParams.java b/src/main/java/com/avaje/ebeaninternal/api/BindParams.java index c0dc62556..8a049de7f 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/BindParams.java +++ b/src/main/java/com/avaje/ebeaninternal/api/BindParams.java @@ -20,9 +20,9 @@ public class BindParams implements Serializable { private static final long serialVersionUID = 4541081933302086285L; - private final List positionedParameters = new ArrayList(); + private final List positionedParameters = new ArrayList<>(); - private final Map namedParameters = new LinkedHashMap(); + private final Map namedParameters = new LinkedHashMap<>(); /** * This is the sql. For named parameters this is the sql after the named @@ -308,7 +308,7 @@ public class BindParams implements Serializable { private final StringBuilder preparedSql; public OrderedList() { - this(new ArrayList()); + this(new ArrayList<>()); } public OrderedList(List paramList) { diff --git a/src/main/java/com/avaje/ebeaninternal/api/LoadBeanRequest.java b/src/main/java/com/avaje/ebeaninternal/api/LoadBeanRequest.java index 2a66310de..48499ee40 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/LoadBeanRequest.java +++ b/src/main/java/com/avaje/ebeaninternal/api/LoadBeanRequest.java @@ -95,7 +95,7 @@ public class LoadBeanRequest extends LoadRequest { */ public List getIdList(int batchSize) { - List idList = new ArrayList(batchSize); + List idList = new ArrayList<>(batchSize); BeanDescriptor desc = loadBuffer.getBeanDescriptor(); for (int i = 0; i < batch.size(); i++) { @@ -150,7 +150,7 @@ public class LoadBeanRequest extends LoadRequest { */ public void postLoad(List list) { - Set loadedIds = new HashSet(); + Set loadedIds = new HashSet<>(); BeanDescriptor desc = loadBuffer.getBeanDescriptor(); // collect Ids and maybe load bean cache diff --git a/src/main/java/com/avaje/ebeaninternal/api/LoadManyRequest.java b/src/main/java/com/avaje/ebeaninternal/api/LoadManyRequest.java index 9c845714d..20de44756 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/LoadManyRequest.java +++ b/src/main/java/com/avaje/ebeaninternal/api/LoadManyRequest.java @@ -101,7 +101,7 @@ public class LoadManyRequest extends LoadRequest { private List getParentIdList(int batchSize) { - ArrayList idList = new ArrayList(batchSize); + ArrayList idList = new ArrayList<>(batchSize); BeanPropertyAssocMany many = getMany(); for (int i = 0; i < batch.size(); i++) { diff --git a/src/main/java/com/avaje/ebeaninternal/api/ManyWhereJoins.java b/src/main/java/com/avaje/ebeaninternal/api/ManyWhereJoins.java index 1a1519b4c..41b9f9540 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/ManyWhereJoins.java +++ b/src/main/java/com/avaje/ebeaninternal/api/ManyWhereJoins.java @@ -19,7 +19,7 @@ public class ManyWhereJoins implements Serializable { private static final long serialVersionUID = -6490181101871795417L; - private final TreeMap joins = new TreeMap(); + private final TreeMap joins = new TreeMap<>(); private StringBuilder formulaProperties = new StringBuilder(); @@ -113,7 +113,7 @@ public class ManyWhereJoins implements Serializable { */ public TreeSet getPropertyNames() { - TreeSet propertyNames = new TreeSet(); + TreeSet propertyNames = new TreeSet<>(); for (PropertyJoin join : joins.values()) { propertyNames.add(join.getProperty()); } diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiExpressionValidation.java b/src/main/java/com/avaje/ebeaninternal/api/SpiExpressionValidation.java index 3e0b4e0da..1b0cdb24e 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiExpressionValidation.java +++ b/src/main/java/com/avaje/ebeaninternal/api/SpiExpressionValidation.java @@ -12,7 +12,7 @@ public class SpiExpressionValidation { private final BeanType desc; - private final LinkedHashSet unknown = new LinkedHashSet(); + private final LinkedHashSet unknown = new LinkedHashSet<>(); public SpiExpressionValidation(BeanType desc) { this.desc = desc; diff --git a/src/main/java/com/avaje/ebeaninternal/api/TransactionEventBeans.java b/src/main/java/com/avaje/ebeaninternal/api/TransactionEventBeans.java index 4bfd565ae..1fd704b14 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/TransactionEventBeans.java +++ b/src/main/java/com/avaje/ebeaninternal/api/TransactionEventBeans.java @@ -15,7 +15,7 @@ import com.avaje.ebeaninternal.server.core.PersistRequestBean; */ public class TransactionEventBeans { - final ArrayList> requests = new ArrayList>(); + final ArrayList> requests = new ArrayList<>(); /** * Return the list of PersistRequests that BeanListeners are interested in. diff --git a/src/main/java/com/avaje/ebeaninternal/api/TransactionEventTable.java b/src/main/java/com/avaje/ebeaninternal/api/TransactionEventTable.java index 08d50ee82..1922b6bee 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/TransactionEventTable.java +++ b/src/main/java/com/avaje/ebeaninternal/api/TransactionEventTable.java @@ -16,7 +16,7 @@ public final class TransactionEventTable implements Serializable { private static final long serialVersionUID = 2236555729767483264L; - private final Map map = new HashMap(); + private final Map map = new HashMap<>(); public String toString() { return "TransactionEventTable " + map.values(); diff --git a/src/main/java/com/avaje/ebeaninternal/extraddl/model/ExtraDdl.java b/src/main/java/com/avaje/ebeaninternal/extraddl/model/ExtraDdl.java index 23a9c4b9f..79d532c70 100644 --- a/src/main/java/com/avaje/ebeaninternal/extraddl/model/ExtraDdl.java +++ b/src/main/java/com/avaje/ebeaninternal/extraddl/model/ExtraDdl.java @@ -63,7 +63,7 @@ public class ExtraDdl { */ public List getDdlScript() { if (ddlScript == null) { - ddlScript = new ArrayList(); + ddlScript = new ArrayList<>(); } return this.ddlScript; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneCollection.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneCollection.java index 0f90d116b..61658145f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneCollection.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/AutoTuneCollection.java @@ -11,7 +11,7 @@ import java.util.List; */ public class AutoTuneCollection { - List entries = new ArrayList(); + List entries = new ArrayList<>(); public Entry add(ObjectGraphOrigin origin, OrmQueryDetail detail, String sourceQuery) { Entry entry = new Entry(origin, detail, sourceQuery); @@ -46,7 +46,7 @@ public class AutoTuneCollection { /** * Summary execution statistics for queries related to this origin point. */ - private final List queries = new ArrayList(); + private final List queries = new ArrayList<>(); public Entry(ObjectGraphOrigin origin, OrmQueryDetail detail, String originalQuery) { this.origin = origin; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Autotune.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Autotune.java index 68bd3c7fd..6de29008b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Autotune.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/Autotune.java @@ -70,7 +70,7 @@ public class Autotune { */ public List getOrigin() { if (origin == null) { - origin = new ArrayList(); + origin = new ArrayList<>(); } return this.origin; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileDiff.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileDiff.java index 4bdf73c57..c8357a41e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileDiff.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileDiff.java @@ -61,7 +61,7 @@ public class ProfileDiff { */ public List getOrigin() { if (origin == null) { - origin = new ArrayList(); + origin = new ArrayList<>(); } return this.origin; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileEmpty.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileEmpty.java index 0b0dc7eb1..317d7d431 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileEmpty.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileEmpty.java @@ -61,7 +61,7 @@ public class ProfileEmpty { */ public List getOrigin() { if (origin == null) { - origin = new ArrayList(); + origin = new ArrayList<>(); } return this.origin; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileNew.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileNew.java index 80fdf48ae..416b3e8c4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileNew.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/model/ProfileNew.java @@ -61,7 +61,7 @@ public class ProfileNew { */ public List getOrigin() { if (origin == null) { - origin = new ArrayList(); + origin = new ArrayList<>(); } return this.origin; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/BaseQueryTuner.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/BaseQueryTuner.java index 03366ecbf..6d2dcf043 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/BaseQueryTuner.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/BaseQueryTuner.java @@ -30,7 +30,7 @@ public class BaseQueryTuner { /** * Map of the tuned query details per profile query point. */ - private final Map tunedQueryInfoMap = new ConcurrentHashMap(); + private final Map tunedQueryInfoMap = new ConcurrentHashMap<>(); private final SpiEbeanServer server; diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileManager.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileManager.java index ff4cca43a..fdf3d702f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileManager.java @@ -31,7 +31,7 @@ public class ProfileManager implements ProfilingListener { /** * Map of the usage and query statistics gathered. */ - private final Map profileMap = new ConcurrentHashMap(); + private final Map profileMap = new ConcurrentHashMap<>(); private final Object monitor = new Object(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOrigin.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOrigin.java index c89a9db87..7f9391abe 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOrigin.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOrigin.java @@ -26,9 +26,9 @@ public class ProfileOrigin { private final double profilingRate; - private final Map queryStatsMap = new ConcurrentHashMap(); + private final Map queryStatsMap = new ConcurrentHashMap<>(); - private final Map nodeUsageMap = new ConcurrentHashMap(); + private final Map nodeUsageMap = new ConcurrentHashMap<>(); private final Object monitor = new Object(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java index b61372bee..561e1ce46 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java +++ b/src/main/java/com/avaje/ebeaninternal/server/autotune/service/ProfileOriginNodeUsage.java @@ -30,7 +30,7 @@ public class ProfileOriginNodeUsage { private boolean modified; - private final Set aggregateUsed = new LinkedHashSet(); + private final Set aggregateUsed = new LinkedHashSet<>(); public ProfileOriginNodeUsage(String path) { // handle null paths as using ConcurrentHashMap diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeSet.java b/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeSet.java index 7b5a06946..3be305558 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeSet.java +++ b/src/main/java/com/avaje/ebeaninternal/server/cache/CacheChangeSet.java @@ -15,16 +15,16 @@ import java.util.Set; */ public class CacheChangeSet { - private final List entries = new ArrayList(); + private final List entries = new ArrayList<>(); private final Set> queryCaches = new HashSet<>(); - private final Map manyChangeMap = new HashMap(); + private final Map manyChangeMap = new HashMap<>(); /** * Set of "base tables" modified used to invalidate entities based on views. */ - private final Set viewInvalidation = new HashSet(); + private final Set viewInvalidation = new HashSet<>(); private final boolean viewEntityInvalidation; @@ -137,9 +137,9 @@ public class CacheChangeSet { final ManyKey key; - final List removes = new ArrayList(); + final List removes = new ArrayList<>(); - final Map puts = new LinkedHashMap(); + final Map puts = new LinkedHashMap<>(); boolean clear; diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanData.java b/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanData.java index 16f1d3d78..b82a4c361 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanData.java +++ b/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanData.java @@ -63,7 +63,7 @@ public class CachedBeanData implements Externalizable { if (in.readBoolean()) { discValue = in.readUTF(); } - data = new LinkedHashMap(); + data = new LinkedHashMap<>(); int count = in.readInt(); for (int i = 0; i < count; i++) { String key = in.readUTF(); @@ -82,7 +82,7 @@ public class CachedBeanData implements Externalizable { */ public CachedBeanData update(Map changes, long version) { - Map copy = new HashMap(); + Map copy = new HashMap<>(); copy.putAll(data); copy.putAll(changes); return new CachedBeanData(null, discValue, copy, version); diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBean.java b/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBean.java index 387552f37..46b19524b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBean.java +++ b/src/main/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBean.java @@ -15,7 +15,7 @@ public class CachedBeanDataFromBean { EntityBeanIntercept ebi = bean._ebean_getIntercept(); - Map data = new LinkedHashMap(); + Map data = new LinkedHashMap<>(); BeanProperty idProperty = desc.getIdProperty(); if (idProperty != null) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedManyIds.java b/src/main/java/com/avaje/ebeaninternal/server/cache/CachedManyIds.java index b84c91194..dcc5b2f96 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/CachedManyIds.java +++ b/src/main/java/com/avaje/ebeaninternal/server/cache/CachedManyIds.java @@ -38,7 +38,7 @@ public class CachedManyIds implements Externalizable { @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { int size = in.readInt(); - idList = new ArrayList(size); + idList = new ArrayList<>(size); for (int i = 0; i < size; i++) { idList.add(in.readObject()); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder.java b/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder.java index 5834986d2..82c58da0b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder.java @@ -15,9 +15,9 @@ import java.util.concurrent.ConcurrentHashMap; */ public class DefaultCacheHolder { - private final ConcurrentHashMap concMap = new ConcurrentHashMap(); + private final ConcurrentHashMap concMap = new ConcurrentHashMap<>(); - private final HashMap synchMap = new HashMap(); + private final HashMap synchMap = new HashMap<>(); private final Object monitor = new Object(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache.java b/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache.java index 8a5dc8a32..da247e70c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache.java +++ b/src/main/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache.java @@ -68,7 +68,7 @@ public class DefaultServerCache implements ServerCache { * Construct using a ConcurrentHashMap and cache options. */ public DefaultServerCache(String name, ServerCacheOptions options) { - this(name, new ConcurrentHashMap(), options); + this(name, new ConcurrentHashMap<>(), options); } /** @@ -277,7 +277,7 @@ public class DefaultServerCache implements ServerCache { long trimmedByTTL = 0; long trimmedByLRU = 0; - ArrayList activeList = new ArrayList(); + ArrayList activeList = new ArrayList<>(); long idleExpire = System.currentTimeMillis() - (maxIdleSecs * 1000); long ttlExpire = System.currentTimeMillis() - (maxSecsToLive * 1000); diff --git a/src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogRegister.java b/src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogRegister.java index f26cf8543..3a6c2068f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogRegister.java +++ b/src/main/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogRegister.java @@ -41,7 +41,7 @@ public class DefaultChangeLogRegister implements ChangeLogRegister { return insertModeInclude(changeLog.inserts()) ? INCLUDE_INSERTS : EXCLUDE_INSERTS; } - Set updateProps = new HashSet(); + Set updateProps = new HashSet<>(); for (int i = 0; i < updatesThatInclude.length; i++) { updateProps.add(updatesThatInclude[i]); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/BinaryMessageList.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/BinaryMessageList.java index 17d7e6b33..d46111512 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cluster/BinaryMessageList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/BinaryMessageList.java @@ -10,7 +10,7 @@ import java.util.List; */ public class BinaryMessageList { - final ArrayList list = new ArrayList(); + final ArrayList list = new ArrayList<>(); public void add(BinaryMessage msg) { list.add(msg); diff --git a/src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterManager.java b/src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterManager.java index 30af29e53..f339968da 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/cluster/ClusterManager.java @@ -19,7 +19,7 @@ public class ClusterManager { private static final Logger logger = LoggerFactory.getLogger(ClusterManager.class); - private final ConcurrentHashMap serverMap = new ConcurrentHashMap(); + private final ConcurrentHashMap serverMap = new ConcurrentHashMap<>(); private final Object monitor = new Object(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/ClassPathScanners.java b/src/main/java/com/avaje/ebeaninternal/server/core/ClassPathScanners.java index 6464fe709..e08b28eef 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/ClassPathScanners.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/ClassPathScanners.java @@ -18,7 +18,7 @@ public class ClassPathScanners { */ public static List find(ServerConfig serverConfig) { - List scanners = new ArrayList(); + List scanners = new ArrayList<>(); ServiceLoader scannerLoader = serverConfig.serviceLoad(ClassPathScannerFactory.class); for (ClassPathScannerFactory factory : scannerLoader) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultMetaInfoManager.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultMetaInfoManager.java index d0fd38992..1e4200c7e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultMetaInfoManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultMetaInfoManager.java @@ -27,13 +27,13 @@ public class DefaultMetaInfoManager implements MetaInfoManager { @Override public List getMetaBeanInfoList() { - return new ArrayList(server.getBeanDescriptors()); + return new ArrayList<>(server.getBeanDescriptors()); } @Override public List collectQueryPlanStatistics(boolean reset) { - List list = new ArrayList(); + List list = new ArrayList<>(); for (MetaBeanInfo metaBeanInfo : getMetaBeanInfoList()) { list.addAll(metaBeanInfo.collectQueryPlanStatistics(reset)); @@ -44,7 +44,7 @@ public class DefaultMetaInfoManager implements MetaInfoManager { public List collectNodeStatistics(boolean reset) { - List list = new ArrayList(); + List list = new ArrayList<>(); for (CObjectGraphNodeStatistics nodeStatistics : server.objectGraphStats.values()) { MetaObjectGraphNodeStats nodeStats = nodeStatistics.get(reset); diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java index 437aa4c88..fc963cc88 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java @@ -190,7 +190,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { public DefaultServer(InternalConfiguration config, ServerCacheManager cache) { this.serverConfig = config.getServerConfig(); - this.objectGraphStats = new ConcurrentHashMap(); + this.objectGraphStats = new ConcurrentHashMap<>(); this.metaInfoManager = new DefaultMetaInfoManager(this); this.serverCacheManager = cache; this.databasePlatform = config.getDatabasePlatform(); @@ -871,7 +871,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { String m = beanType.getName() + " is NOT an Entity Bean registered with this server?"; throw new PersistenceException(m); } - return new ElFilter(desc); + return new ElFilter<>(desc); } public CsvReader createCsvReader(Class beanType) { @@ -879,11 +879,11 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { if (descriptor == null) { throw new NullPointerException("BeanDescriptor for " + beanType.getName() + " not found"); } - return new TCsvReader(this, descriptor); + return new TCsvReader<>(this, descriptor); } public UpdateQuery update(Class beanType) { - return new DefaultUpdateQuery(createQuery(beanType)); + return new DefaultUpdateQuery<>(createQuery(beanType)); } public Query find(Class beanType) { @@ -921,7 +921,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { if (desc == null) { throw new PersistenceException(beanType.getName() + " is NOT an Entity Bean registered with this server?"); } - return new DefaultOrmQuery(desc, this, expressionFactory); + return new DefaultOrmQuery<>(desc, this, expressionFactory); } public Update createUpdate(Class beanType, String ormUpdate) { @@ -931,7 +931,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { throw new PersistenceException(m); } - return new DefaultOrmUpdate(beanType, this, desc.getBaseTable(), ormUpdate); + return new DefaultOrmUpdate<>(beanType, this, desc.getBaseTable(), ormUpdate); } public SqlQuery createSqlQuery(String sql) { @@ -989,7 +989,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { query.setOrigin(createCallStack()); } - OrmQueryRequest request = new OrmQueryRequest(this, queryEngine, query, (SpiTransaction) t); + OrmQueryRequest request = new OrmQueryRequest<>(this, queryEngine, query, (SpiTransaction) t); request.prepareQuery(); return request; @@ -1242,9 +1242,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { Transaction newTxn = createTransaction(); - CallableQueryRowCount call = new CallableQueryRowCount(this, copy, newTxn); + CallableQueryRowCount call = new CallableQueryRowCount<>(this, copy, newTxn); - QueryFutureRowCount queryFuture = new QueryFutureRowCount(call); + QueryFutureRowCount queryFuture = new QueryFutureRowCount<>(call); backgroundExecutor.execute(queryFuture.getFutureTask()); return queryFuture; @@ -1261,8 +1261,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { Transaction newTxn = createTransaction(); - CallableQueryIds call = new CallableQueryIds(this, copy, newTxn); - QueryFutureIds queryFuture = new QueryFutureIds(call); + CallableQueryIds call = new CallableQueryIds<>(this, copy, newTxn); + QueryFutureIds queryFuture = new QueryFutureIds<>(call); backgroundExecutor.execute(queryFuture.getFutureTask()); @@ -1284,8 +1284,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { // Create a new transaction solely to execute the findList() at some future time Transaction newTxn = createTransaction(); - CallableQueryList call = new CallableQueryList(this, spiQuery, newTxn); - QueryFutureList queryFuture = new QueryFutureList(call); + CallableQueryList call = new CallableQueryList<>(this, spiQuery, newTxn); + QueryFutureList queryFuture = new QueryFutureList<>(call); backgroundExecutor.execute(queryFuture.getFutureTask()); return queryFuture; } @@ -1303,7 +1303,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { return docStore().findPagedList(createQueryRequest(Type.LIST, query, transaction)); } - return new LimitOffsetPagedList(this, spiQuery); + return new LimitOffsetPagedList<>(this, spiQuery); } public QueryIterator findIterate(Query query, Transaction t) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DiffHelp.java b/src/main/java/com/avaje/ebeaninternal/server/core/DiffHelp.java index 0f6c5d0ea..6a237d323 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/DiffHelp.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/DiffHelp.java @@ -75,7 +75,7 @@ public class DiffHelp { if (!assoc.isEmbedded()) { // flatten for assoc one beans if (flattened == null) { - flattened = new LinkedHashMap(); + flattened = new LinkedHashMap<>(); } flattenToId(flattened, entry, beanProperty, assoc); iterator.remove(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/InternString.java b/src/main/java/com/avaje/ebeaninternal/server/core/InternString.java index a9ee3282e..f8d6b332a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/InternString.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/InternString.java @@ -11,7 +11,7 @@ import java.util.HashMap; */ public final class InternString { - private static final HashMap map = new HashMap(); + private static final HashMap map = new HashMap<>(); /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/com/avaje/ebeaninternal/server/core/InternalConfiguration.java index caf82e185..25665cfd4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/InternalConfiguration.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/InternalConfiguration.java @@ -108,7 +108,7 @@ public class InternalConfiguration { /** * List of plugins (that ultimately the DefaultServer configures late in construction). */ - private final List plugins = new ArrayList(); + private final List plugins = new ArrayList<>(); public InternalConfiguration(ClusterManager clusterManager, ServerCacheManager cacheManager, SpiBackgroundExecutor backgroundExecutor, diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryRequest.java index 5b1a74340..a0d98ec3e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryRequest.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/OrmQueryRequest.java @@ -449,7 +449,7 @@ public final class OrmQueryRequest extends BeanRequest implements BeanQueryRe if (cached != null && isAuditReads() && readAuditQueryType()) { // raw sql can't use L2 cache so normal queries only in here Collection actualDetails = cached.getActualDetails(); - List ids = new ArrayList(actualDetails.size()); + List ids = new ArrayList<>(actualDetails.size()); for (T bean : actualDetails) { ids.add(beanDescriptor.getIdForJson(bean)); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java index c4fd5a141..5fe67d8db 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java @@ -911,7 +911,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP */ public void addUpdatedManyProperty(BeanPropertyAssocMany updatedAssocMany) { if (updatedManys == null) { - updatedManys = new ArrayList>(5); + updatedManys = new ArrayList<>(5); } updatedManys.add(updatedAssocMany); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/RelationalQueryRequest.java b/src/main/java/com/avaje/ebeaninternal/server/core/RelationalQueryRequest.java index a43845e0a..901603485 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/RelationalQueryRequest.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/RelationalQueryRequest.java @@ -138,7 +138,7 @@ public final class RelationalQueryRequest { */ private String[] getPropertyNames() throws SQLException { - ArrayList propNames = new ArrayList(); + ArrayList propNames = new ArrayList<>(); ResultSetMetaData metaData = resultSet.getMetaData(); int columnsPlusOne = metaData.getColumnCount() + 1; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/bootup/BootupClasses.java b/src/main/java/com/avaje/ebeaninternal/server/core/bootup/BootupClasses.java index 3df277068..6fb8d9602 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/bootup/BootupClasses.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/bootup/BootupClasses.java @@ -38,45 +38,45 @@ public class BootupClasses implements ClassFilter { private static final Logger logger = LoggerFactory.getLogger(BootupClasses.class); - private final List> embeddableList = new ArrayList>(); + private final List> embeddableList = new ArrayList<>(); - private final List> entityList = new ArrayList>(); + private final List> entityList = new ArrayList<>(); - private final List>> scalarTypeList = new ArrayList>>(); + private final List>> scalarTypeList = new ArrayList<>(); - private final List>> scalarConverterList = new ArrayList>>(); + private final List>> scalarConverterList = new ArrayList<>(); - private final List>> compoundTypeList = new ArrayList>>(); + private final List>> compoundTypeList = new ArrayList<>(); // The following objects are instantiiated on first request // there is always a candidate list, that holds the class and an // instance list, that holds the instance. Once a class is instantiiated // (or added) it will get removed from the candidate list - private final List> idGeneratorCandidates = new ArrayList>(); + private final List> idGeneratorCandidates = new ArrayList<>(); - private final List> beanPersistControllerCandidates = new ArrayList>(); + private final List> beanPersistControllerCandidates = new ArrayList<>(); - private final List> beanPostLoadCandidates = new ArrayList>(); + private final List> beanPostLoadCandidates = new ArrayList<>(); - private final List> beanPostConstructListenerCandidates = new ArrayList>(); + private final List> beanPostConstructListenerCandidates = new ArrayList<>(); - private final List> beanFindControllerCandidates = new ArrayList>(); + private final List> beanFindControllerCandidates = new ArrayList<>(); - private final List> beanPersistListenerCandidates = new ArrayList>(); + private final List> beanPersistListenerCandidates = new ArrayList<>(); - private final List> beanQueryAdapterCandidates = new ArrayList>(); + private final List> beanQueryAdapterCandidates = new ArrayList<>(); - private final List> serverConfigStartupCandidates = new ArrayList>(); + private final List> serverConfigStartupCandidates = new ArrayList<>(); - private final List idGeneratorInstances = new ArrayList(); - private final List beanPersistControllerInstances = new ArrayList(); - private final List beanPostLoadInstances = new ArrayList(); - private final List beanPostConstructListenerInstances = new ArrayList(); - private final List beanFindControllerInstances = new ArrayList(); - private final List beanPersistListenerInstances = new ArrayList(); - private final List beanQueryAdapterInstances = new ArrayList(); - private final List serverConfigStartupInstances = new ArrayList(); + private final List idGeneratorInstances = new ArrayList<>(); + private final List beanPersistControllerInstances = new ArrayList<>(); + private final List beanPostLoadInstances = new ArrayList<>(); + private final List beanPostConstructListenerInstances = new ArrayList<>(); + private final List beanFindControllerInstances = new ArrayList<>(); + private final List beanPersistListenerInstances = new ArrayList<>(); + private final List beanQueryAdapterInstances = new ArrayList<>(); + private final List serverConfigStartupInstances = new ArrayList<>(); // single objects private Class changeLogPrepareClass; diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/bootup/DistillPackages.java b/src/main/java/com/avaje/ebeaninternal/server/core/bootup/DistillPackages.java index a1b978d21..1bb50c71d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/bootup/DistillPackages.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/bootup/DistillPackages.java @@ -17,11 +17,11 @@ class DistillPackages { static List distill(Collection packages, Collection mfPackages) { // sort into natural order - TreeSet treeSet = new TreeSet(); + TreeSet treeSet = new TreeSet<>(); treeSet.addAll(packages); treeSet.addAll(mfPackages); - List distilled = new ArrayList(); + List distilled = new ArrayList<>(); // build the distilled list for (String pack : treeSet) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/bootup/ManifestReader.java b/src/main/java/com/avaje/ebeaninternal/server/core/bootup/ManifestReader.java index 37b734bd9..7098786f7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/bootup/ManifestReader.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/bootup/ManifestReader.java @@ -19,7 +19,7 @@ class ManifestReader { private static final Logger logger = LoggerFactory.getLogger(ManifestReader.class); - private final Set packageSet = new HashSet(); + private final Set packageSet = new HashSet<>(); /** * Read the packages from ebean.mf manifest files found as resources. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java index 827be9818..fcf14366a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java @@ -21,11 +21,11 @@ public class BeanCollectionHelpFactory { ManyType manyType = manyProperty.getManyType(); switch (manyType) { case LIST: - return new BeanListHelp(manyProperty); + return new BeanListHelp<>(manyProperty); case SET: - return new BeanSetHelp(manyProperty); + return new BeanSetHelp<>(manyProperty); case MAP: - return new BeanMapHelp(manyProperty); + return new BeanMapHelp<>(manyProperty); default: throw new RuntimeException("Invalid type " + manyType); } @@ -46,7 +46,7 @@ public class BeanCollectionHelpFactory { } else { BeanDescriptor target = request.getBeanDescriptor(); String mapKey = request.getQuery().getMapKey(); - return new BeanMapHelp(target, mapKey); + return new BeanMapHelp<>(target, mapKey); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java index b04cd4218..6843bc098 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java @@ -101,15 +101,15 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { private static final Logger logger = LoggerFactory.getLogger(BeanDescriptor.class); - private final ConcurrentHashMap updatePlanCache = new ConcurrentHashMap(); + private final ConcurrentHashMap updatePlanCache = new ConcurrentHashMap<>(); - private final ConcurrentHashMap queryPlanCache = new ConcurrentHashMap(); + private final ConcurrentHashMap queryPlanCache = new ConcurrentHashMap<>(); - private final ConcurrentHashMap elCache = new ConcurrentHashMap(); + private final ConcurrentHashMap elCache = new ConcurrentHashMap<>(); - private final ConcurrentHashMap elDeployCache = new ConcurrentHashMap(); + private final ConcurrentHashMap elDeployCache = new ConcurrentHashMap<>(); - private final ConcurrentHashMap> comparatorCache = new ConcurrentHashMap>(); + private final ConcurrentHashMap> comparatorCache = new ConcurrentHashMap<>(); private final Map namedRawSql; @@ -492,9 +492,9 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { boolean noRelationships = propertiesOne.length + propertiesMany.length == 0; this.cacheSharableBeans = noRelationships && deploy.getCacheOptions().isReadOnly(); - this.cacheHelp = new BeanDescriptorCacheHelp(this, owner.getCacheManager(), deploy.getCacheOptions(), cacheSharableBeans, propertiesOneImported); - this.jsonHelp = new BeanDescriptorJsonHelp(this); - this.draftHelp = new BeanDescriptorDraftHelp(this); + this.cacheHelp = new BeanDescriptorCacheHelp<>(this, owner.getCacheManager(), deploy.getCacheOptions(), cacheSharableBeans, propertiesOneImported); + this.jsonHelp = new BeanDescriptorJsonHelp<>(this); + this.draftHelp = new BeanDescriptorDraftHelp<>(this); this.docStoreAdapter = owner.createDocStoreBeanAdapter(this, deploy); this.docStoreQueueId = docStoreAdapter.getQueueId(); @@ -1362,7 +1362,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { } public List collectQueryPlanStatisticsInternal(boolean reset, boolean collectAll) { - List list = new ArrayList(queryPlanCache.size()); + List list = new ArrayList<>(queryPlanCache.size()); for (CQueryPlan queryPlan : queryPlanCache.values()) { Snapshot snapshot = queryPlan.getSnapshot(reset); if (collectAll || snapshot.getExecutionCount() > 0) { @@ -2014,7 +2014,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { comparators[i] = createPropertyComparator(sortProperty); } - return new ElComparatorCompound(comparators); + return new ElComparatorCompound<>(comparators); } private ElComparator createPropertyComparator(SortByClause.Property sortProp) { @@ -2025,7 +2025,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { if (nullsHigh == null) { nullsHigh = Boolean.TRUE; } - return new ElComparatorProperty(elGetValue, sortProp.isAscending(), nullsHigh); + return new ElComparatorProperty<>(elGetValue, sortProp.isAscending(), nullsHigh); } @Override @@ -2719,7 +2719,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { */ public Map diffForInsert(EntityBean newBean) { - Map map = new LinkedHashMap(); + Map map = new LinkedHashMap<>(); diffForInsert(null, map, newBean); return map; } @@ -2743,7 +2743,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { * Return the diff comparing the bean values. */ public Map diff(EntityBean newBean, EntityBean oldBean) { - Map map = new LinkedHashMap(); + Map map = new LinkedHashMap<>(); diff(null, map, newBean, oldBean); return map; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java index 3b9e066ed..9cba445a0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java @@ -296,7 +296,7 @@ final class BeanDescriptorCacheHelp { BeanDescriptor targetDescriptor = many.getTargetDescriptor(); - List idList = new ArrayList(); + List idList = new ArrayList<>(); Collection actualDetails = BeanCollectionUtil.getActualEntries(details); if (actualDetails == null) { return null; @@ -642,7 +642,7 @@ final class BeanDescriptorCacheHelp { boolean updateNaturalKey = false; - Map changes = new LinkedHashMap(); + Map changes = new LinkedHashMap<>(); EntityBean bean = updateRequest.getEntityBean(); boolean[] dirtyProperties = updateRequest.getDirtyProperties(); for (int i = 0; i < dirtyProperties.length; i++) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java index a4589ec53..a3e26d057 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorDraftHelp.java @@ -30,7 +30,7 @@ public final class BeanDescriptorDraftHelp { */ private BeanProperty[] resetProperties() { - List list = new ArrayList(); + List list = new ArrayList<>(); BeanProperty[] props = desc.propertiesNonMany(); for (BeanProperty prop : props) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java index cf220a3c8..7046cee77 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java @@ -145,7 +145,7 @@ public class BeanDescriptorJsonHelp { } else { // read an unmapped property if (unmappedProperties == null) { - unmappedProperties = new LinkedHashMap(); + unmappedProperties = new LinkedHashMap<>(); } unmappedProperties.put(key, EJson.parse(parser)); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java index 4f7e79b1e..478dd2cc8 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -138,19 +138,19 @@ public class BeanDescriptorManager implements BeanDescriptorMap { private final String serverName; - private Map, DeployBeanInfo> deployInfoMap = new HashMap, DeployBeanInfo>(); + private Map, DeployBeanInfo> deployInfoMap = new HashMap<>(); - private final Map, BeanTable> beanTableMap = new HashMap, BeanTable>(); + private final Map, BeanTable> beanTableMap = new HashMap<>(); - private final Map> descMap = new HashMap>(); + private final Map> descMap = new HashMap<>(); - private final Map> descQueueMap = new HashMap>(); + private final Map> descQueueMap = new HashMap<>(); - private final Map> beanManagerMap = new HashMap>(); + private final Map> beanManagerMap = new HashMap<>(); - private final Map>> tableToDescMap = new HashMap>>(); + private final Map>> tableToDescMap = new HashMap<>(); - private final Map>> tableToViewDescMap = new HashMap>>(); + private final Map>> tableToViewDescMap = new HashMap<>(); private List> immutableDescriptorList; @@ -179,12 +179,12 @@ public class BeanDescriptorManager implements BeanDescriptorMap { /** * Map of base tables to 'with history views' used to support 'as of' queries. */ - private final Map asOfTableMap = new HashMap(); + private final Map asOfTableMap = new HashMap<>(); /** * Map of base tables to 'draft' tables. */ - private final Map draftTableMap = new HashMap(); + private final Map draftTableMap = new HashMap<>(); /** * Create for a given database dbConfig. @@ -324,7 +324,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { // creates the BeanDescriptors readEntityRelationships(); - List> list = new ArrayList>(descMap.values()); + List> list = new ArrayList<>(descMap.values()); Collections.sort(list, beanDescComparator); immutableDescriptorList = Collections.unmodifiableList(list); @@ -353,7 +353,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { Enumeration resources = classLoader.getResources("ebean.xml"); - List mappings = new ArrayList(); + List mappings = new ArrayList<>(); while (resources.hasMoreElements()) { URL url = resources.nextElement(); InputStream is = url.openStream(); @@ -479,7 +479,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { baseTable = baseTable.toLowerCase(); List> list = tableToDescMap.get(baseTable); if (list == null) { - list = new ArrayList>(1); + list = new ArrayList<>(1); tableToDescMap.put(baseTable, list); } list.add(desc); @@ -493,7 +493,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { depTable = depTable.toLowerCase(); List> list = tableToViewDescMap.get(depTable); if (list == null) { - list = new ArrayList>(1); + list = new ArrayList<>(1); tableToViewDescMap.put(depTable, list); } list.add(desc); @@ -639,7 +639,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { private BeanDescriptor createEmbedded(Class beanClass) { DeployBeanInfo info = getDeploy(beanClass); - return new BeanDescriptor(this, info.getDescriptor()); + return new BeanDescriptor<>(this, info.getDescriptor()); } /** @@ -859,7 +859,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { // this is the entity bean type - that owns this property Class owningType = prop.getOwningType(); - Set matchSet = new HashSet(); + Set matchSet = new HashSet<>(); // get the bean descriptor that holds the mappedBy property DeployBeanDescriptor targetDesc = getTargetDescriptor(prop); @@ -1166,7 +1166,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { */ private DeployBeanInfo createDeployBeanInfo(Class beanClass) { - DeployBeanDescriptor desc = new DeployBeanDescriptor(this, beanClass, serverConfig); + DeployBeanDescriptor desc = new DeployBeanDescriptor<>(this, beanClass, serverConfig); desc.setUpdateChangesOnly(updateChangesOnly); @@ -1179,7 +1179,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { createProperties.createProperties(desc); - DeployBeanInfo info = new DeployBeanInfo(deployUtil, desc); + DeployBeanInfo info = new DeployBeanInfo<>(deployUtil, desc); readAnnotations.readInitial(info, eagerFetchLobs); return info; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java index 19e782aab..89d19d3c5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java @@ -64,14 +64,14 @@ public class BeanLifecycleAdapterFactory { private static class MethodsHolder { private boolean hasPersistMethods; - private final List preInserts = new ArrayList(); - private final List postInserts = new ArrayList(); - private final List preUpdates = new ArrayList(); - private final List postUpdates = new ArrayList(); - private final List preDeletes = new ArrayList(); - private final List postDeletes = new ArrayList(); - private final List postLoads = new ArrayList(); - private final List postConstructs = new ArrayList(); + private final List preInserts = new ArrayList<>(); + private final List postInserts = new ArrayList<>(); + private final List preUpdates = new ArrayList<>(); + private final List postUpdates = new ArrayList<>(); + private final List preDeletes = new ArrayList<>(); + private final List postDeletes = new ArrayList<>(); + private final List postLoads = new ArrayList<>(); + private final List postConstructs = new ArrayList<>(); /** * Has one of the pre or post insert update delete annotated methods. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanListHelp.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanListHelp.java index c44ee4e56..6cd4cd0f0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanListHelp.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanListHelp.java @@ -61,7 +61,7 @@ public final class BeanListHelp implements BeanCollectionHelp { BeanList bl = (BeanList) bc; if (bl.getActualList() == null) { - bl.setActualList(new ArrayList()); + bl.setActualList(new ArrayList<>()); } return bl; @@ -72,12 +72,12 @@ public final class BeanListHelp implements BeanCollectionHelp { @Override public BeanCollection createEmptyNoParent() { - return new BeanList(); + return new BeanList<>(); } @Override public BeanCollection createEmpty(EntityBean parentBean) { - BeanList beanList = new BeanList(loader, parentBean, propertyName); + BeanList beanList = new BeanList<>(loader, parentBean, propertyName); if (many != null) { beanList.setModifyListening(many.getModifyListenMode()); } @@ -87,7 +87,7 @@ public final class BeanListHelp implements BeanCollectionHelp { @Override public BeanCollection createReference(EntityBean parentBean) { - BeanList beanList = new BeanList(loader, parentBean, propertyName); + BeanList beanList = new BeanList<>(loader, parentBean, propertyName); beanList.setModifyListening(many.getModifyListenMode()); return beanList; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanManagerFactory.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanManagerFactory.java index ff9bb39bb..70723d72d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanManagerFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanManagerFactory.java @@ -17,7 +17,7 @@ public class BeanManagerFactory { public BeanManager create(BeanDescriptor desc) { - return new BeanManager(desc, persisterFactory.create(desc)); + return new BeanManager<>(desc, persisterFactory.create(desc)); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanMapHelp.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanMapHelp.java index 6340c9fb0..8e7971647 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanMapHelp.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanMapHelp.java @@ -64,7 +64,7 @@ public final class BeanMapHelp implements BeanCollectionHelp { BeanMap bm = (BeanMap) bc; Map actualMap = bm.getActualMap(); if (actualMap == null) { - actualMap = new LinkedHashMap(); + actualMap = new LinkedHashMap<>(); bm.setActualMap(actualMap); } return new Adder(beanProp, actualMap); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java index b9bc0bd92..24cfb38eb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java @@ -360,7 +360,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty { private ImportedIdSimple[] createImportedList(BeanPropertyAssoc owner, TableJoinColumn[] cols, BeanProperty[] props, BeanProperty[] others) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for (int i = 0; i < cols.length; i++) { list.add(createImportedScalar(owner, cols[i], props, others)); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index 5c68c35b5..79a5eec7c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -305,7 +305,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc { private List findIdsByParentId(Object parentId, Transaction t, ArrayList excludeDetailIds) { String rawWhere = deriveWhereParentIdSql(false, ""); - List bindValues = new ArrayList(); + List bindValues = new ArrayList<>(); bindWhereParentId(bindValues, parentId); EbeanServer server = getBeanDescriptor().getEbeanServer(); @@ -375,7 +375,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc { String expr = rawWhere + inClause; - List bindValues = new ArrayList(); + List bindValues = new ArrayList<>(); for (int i = 0; i < parentIdList.size(); i++) { bindWhereParentId(bindValues, parentIdList.get(i)); } @@ -667,7 +667,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc { if (exportedProperties.length == 1) { return parentIds; } - List expandedList = new ArrayList(parentIds.size() * exportedProperties.length); + List expandedList = new ArrayList<>(parentIds.size() * exportedProperties.length); for (int i = 0; i < parentIds.size(); i++) { for (int y = 0; y < exportedProperties.length; y++) { Object compId = parentIds.get(i); @@ -771,7 +771,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc { BeanProperty idProp = descriptor.getIdProperty(); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); if (idProp != null && idProp.isEmbedded()) { @@ -1037,7 +1037,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc { liveVal.size(); Collection liveBeans = liveVal.getActualDetails(); - Map liveMap = new LinkedHashMap(); + Map liveMap = new LinkedHashMap<>(); for (Object liveBean : liveBeans) { Object id = targetDescriptor.getId((EntityBean) liveBean); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index 20b2f56b2..51f606895 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -78,7 +78,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc { // Overriding of the columns and use table alias of owning BeanDescriptor BeanEmbeddedMeta overrideMeta = BeanEmbeddedMetaFactory.create(owner, deploy); embeddedProps = overrideMeta.getProperties(); - embeddedPropsMap = new HashMap(); + embeddedPropsMap = new HashMap<>(); for (int i = 0; i < embeddedProps.length; i++) { embeddedPropsMap.put(embeddedProps[i].getName(), embeddedProps[i]); } @@ -238,7 +238,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc { String rawWhere = deriveWhereParentIdSql(false); - List bindValues = new ArrayList(); + List bindValues = new ArrayList<>(); bindWhereParentId(bindValues, parentId); EbeanServer server = getBeanDescriptor().getEbeanServer(); @@ -257,7 +257,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc { String expr = rawWhere + inClause; - List bindValues = new ArrayList(); + List bindValues = new ArrayList<>(); for (int i = 0; i < parentIdList.size(); i++) { bindWhereParentId(bindValues, parentIdList.get(i)); } @@ -506,7 +506,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc { BeanProperty idProp = descriptor.getIdProperty(); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); if (idProp != null && idProp.isEmbedded()) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompound.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompound.java index 1b0b384c0..8127ce025 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompound.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompound.java @@ -31,9 +31,9 @@ public class BeanPropertyCompound extends BeanProperty { private final BeanProperty[] scalarProperties; - private final LinkedHashMap propertyMap = new LinkedHashMap(); + private final LinkedHashMap propertyMap = new LinkedHashMap<>(); - private final LinkedHashMap nonScalarMap = new LinkedHashMap(); + private final LinkedHashMap nonScalarMap = new LinkedHashMap<>(); /** * Create the property. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompoundRoot.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompoundRoot.java index e4e692ce4..8e9f9969e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompoundRoot.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompoundRoot.java @@ -31,7 +31,7 @@ public class BeanPropertyCompoundRoot { this.fullBeanName = deploy.getFullBeanName(); this.name = deploy.getName(); this.setter = deploy.getSetter(); - this.propList = new ArrayList(); + this.propList = new ArrayList<>(); } public BeanProperty[] getScalarProperties() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanSetHelp.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanSetHelp.java index 1990c30ed..487d89f7e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanSetHelp.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanSetHelp.java @@ -52,7 +52,7 @@ public final class BeanSetHelp implements BeanCollectionHelp { if (bc instanceof BeanSet) { BeanSet beanSet = (BeanSet) bc; if (beanSet.getActualSet() == null) { - beanSet.setActualSet(new LinkedHashSet()); + beanSet.setActualSet(new LinkedHashSet<>()); } return beanSet; @@ -76,7 +76,7 @@ public final class BeanSetHelp implements BeanCollectionHelp { @Override public BeanCollection createEmpty(EntityBean ownerBean) { - BeanSet beanSet = new BeanSet(loader, ownerBean, propertyName); + BeanSet beanSet = new BeanSet<>(loader, ownerBean, propertyName); if (many != null) { beanSet.setModifyListening(many.getModifyListenMode()); } @@ -86,7 +86,7 @@ public final class BeanSetHelp implements BeanCollectionHelp { @Override public BeanCollection createReference(EntityBean parentBean) { - BeanSet beanSet = new BeanSet(loader, parentBean, propertyName); + BeanSet beanSet = new BeanSet<>(loader, parentBean, propertyName); beanSet.setModifyListening(many.getModifyListenMode()); return beanSet; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPersistController.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPersistController.java index 06f3218fa..cf565d1a5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPersistController.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPersistController.java @@ -32,7 +32,7 @@ public class ChainedBeanPersistController implements BeanPersistController { * Helper method used to create a list from 2 BeanPersistController's. */ private static List addList(BeanPersistController c1, BeanPersistController c2) { - ArrayList addList = new ArrayList(2); + ArrayList addList = new ArrayList<>(2); addList.add(c1); addList.add(c2); return addList; @@ -62,7 +62,7 @@ public class ChainedBeanPersistController implements BeanPersistController { if (list.contains(c)){ return this; } else { - ArrayList newList = new ArrayList(); + ArrayList newList = new ArrayList<>(); newList.addAll(list); newList.add(c); @@ -77,7 +77,7 @@ public class ChainedBeanPersistController implements BeanPersistController { if (!list.contains(c)){ return this; } else { - ArrayList newList = new ArrayList(); + ArrayList newList = new ArrayList<>(); newList.addAll(list); newList.remove(c); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPersistListener.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPersistListener.java index 813caf459..71a82892e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPersistListener.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPersistListener.java @@ -39,7 +39,7 @@ public class ChainedBeanPersistListener implements BeanPersistListener { * Helper method used to create a list from 2 BeanPersistListener. */ private static List addList(BeanPersistListener c1, BeanPersistListener c2) { - ArrayList addList = new ArrayList(2); + ArrayList addList = new ArrayList<>(2); addList.add(c1); addList.add(c2); return addList; @@ -60,7 +60,7 @@ public class ChainedBeanPersistListener implements BeanPersistListener { if (list.contains(c)){ return this; } else { - List newList = new ArrayList(); + List newList = new ArrayList<>(); newList.addAll(list); newList.add(c); @@ -75,7 +75,7 @@ public class ChainedBeanPersistListener implements BeanPersistListener { if (!list.contains(c)){ return this; } else { - ArrayList newList = new ArrayList(); + ArrayList newList = new ArrayList<>(); newList.addAll(list); newList.remove(c); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java index 4ec842e07..58bdb5f1f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPostConstructListener.java @@ -29,7 +29,7 @@ public class ChainedBeanPostConstructListener implements BeanPostConstructListen if (list.contains(c)) { return this; } else { - List newList = new ArrayList(); + List newList = new ArrayList<>(); newList.addAll(list); newList.add(c); @@ -44,7 +44,7 @@ public class ChainedBeanPostConstructListener implements BeanPostConstructListen if (!list.contains(c)) { return this; } else { - ArrayList newList = new ArrayList(); + ArrayList newList = new ArrayList<>(); newList.addAll(list); newList.remove(c); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPostLoad.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPostLoad.java index ab31a33a7..9558d86dc 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPostLoad.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanPostLoad.java @@ -29,7 +29,7 @@ public class ChainedBeanPostLoad implements BeanPostLoad { if (list.contains(c)){ return this; } else { - List newList = new ArrayList(); + List newList = new ArrayList<>(); newList.addAll(list); newList.add(c); @@ -44,7 +44,7 @@ public class ChainedBeanPostLoad implements BeanPostLoad { if (!list.contains(c)){ return this; } else { - ArrayList newList = new ArrayList(); + ArrayList newList = new ArrayList<>(); newList.addAll(list); newList.remove(c); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java index 4745e7f6b..3987ca537 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java @@ -36,7 +36,7 @@ public class ChainedBeanQueryAdapter implements BeanQueryAdapter { if (list.contains(c)){ return this; } else { - List newList = new ArrayList(); + List newList = new ArrayList<>(); newList.addAll(list); newList.add(c); @@ -51,7 +51,7 @@ public class ChainedBeanQueryAdapter implements BeanQueryAdapter { if (!list.contains(c)){ return this; } else { - ArrayList newList = new ArrayList(); + ArrayList newList = new ArrayList<>(); newList.addAll(list); newList.remove(c); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParser.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParser.java index 6b5b603d5..276ca89cb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParser.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParser.java @@ -17,7 +17,7 @@ public final class DeployPropertyParser extends DeployParser { private final BeanDescriptor beanDescriptor; - private final Set includes = new HashSet(); + private final Set includes = new HashSet<>(); public DeployPropertyParser(BeanDescriptor beanDescriptor) { this.beanDescriptor = beanDescriptor; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfo.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfo.java index 2ad49241b..3821f2ba0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfo.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/InheritInfo.java @@ -31,7 +31,7 @@ public class InheritInfo { private final Class type; - private final ArrayList children = new ArrayList(); + private final ArrayList children = new ArrayList<>(); /** * Map of discriminator values to InheritInfo. @@ -64,8 +64,8 @@ public class InheritInfo { if (r == null) { // this is a root node root = this; - discMap = new HashMap(); - typeMap = new HashMap(); + discMap = new HashMap<>(); + typeMap = new HashMap<>(); registerWithRoot(this); } else { diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/IntersectionRow.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/IntersectionRow.java index 3d0a48a65..367675c1b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/IntersectionRow.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/IntersectionRow.java @@ -18,7 +18,7 @@ public class IntersectionRow { private final BeanDescriptor targetDescriptor; - private final LinkedHashMap values = new LinkedHashMap(); + private final LinkedHashMap values = new LinkedHashMap<>(); private ArrayList excludeIds; private BeanDescriptor excludeDescriptor; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java index 890b6581f..a9e0bd32d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/GeneratedPropertyFactory.java @@ -25,7 +25,7 @@ public class GeneratedPropertyFactory { private final UpdateTimestampFactory updateFactory; - private final HashSet numberTypes = new HashSet(); + private final HashSet numberTypes = new HashSet<>(); private final GeneratedWhoModified generatedWhoModified; @@ -33,7 +33,7 @@ public class GeneratedPropertyFactory { private final ClassLoadConfig classLoadConfig; - private final Map idGeneratorMap = new HashMap(); + private final Map idGeneratorMap = new HashMap<>(); public GeneratedPropertyFactory(ServerConfig serverConfig, List idGenerators) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java index c07426bbe..b1a510507 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java @@ -19,7 +19,7 @@ public class InsertTimestampFactory { final GeneratedInsertLong longTime = new GeneratedInsertLong(); - final Map, GeneratedProperty> map = new HashMap, GeneratedProperty>(); + final Map, GeneratedProperty> map = new HashMap<>(); public InsertTimestampFactory(ClassLoadConfig classLoadConfig) { map.put(Timestamp.class, new GeneratedInsertTimestamp()); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java index dd7c1653a..1e9f005e6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java @@ -19,7 +19,7 @@ public class UpdateTimestampFactory { final GeneratedUpdateLong longTime = new GeneratedUpdateLong(); - final Map, GeneratedProperty> map = new HashMap, GeneratedProperty>(); + final Map, GeneratedProperty> map = new HashMap<>(); public UpdateTimestampFactory(ClassLoadConfig classLoadConfig) { map.put(Timestamp.class, new GeneratedUpdateTimestamp()); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmbedded.java index 43579af80..9c421b652 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmbedded.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/IdBinderEmbedded.java @@ -234,7 +234,7 @@ public final class IdBinderEmbedded implements IdBinder { public Object getIdForJson(EntityBean bean) { EntityBean ebValue = (EntityBean)embIdProperty.getValue(bean); - Map map = new LinkedHashMap(); + Map map = new LinkedHashMap<>(); for (int i = 0; i < props.length; i++) { map.put(props[i].getName(), props[i].getValue(ebValue)); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java index c382068c4..37041ab4b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java @@ -48,9 +48,9 @@ import java.util.Map; */ public class DeployBeanDescriptor { - private static final Map EMPTY_NAMED_QUERY = new HashMap(); + private static final Map EMPTY_NAMED_QUERY = new HashMap<>(); - private static final Map EMPTY_RAW_MAP = new HashMap(); + private static final Map EMPTY_RAW_MAP = new HashMap<>(); private static class PropOrder implements Comparator { @@ -73,7 +73,7 @@ public class DeployBeanDescriptor { /** * Map of BeanProperty Linked so as to preserve order. */ - private LinkedHashMap propMap = new LinkedHashMap(); + private LinkedHashMap propMap = new LinkedHashMap<>(); private Map namedRawSql; @@ -153,11 +153,11 @@ public class DeployBeanDescriptor { */ private final Class beanType; - private final List persistControllers = new ArrayList(); - private final List persistListeners = new ArrayList(); - private final List queryAdapters = new ArrayList(); - private final List postLoaders = new ArrayList(); - private final List postConstructListeners = new ArrayList(); + private final List persistControllers = new ArrayList<>(); + private final List persistListeners = new ArrayList<>(); + private final List queryAdapters = new ArrayList<>(); + private final List postLoaders = new ArrayList<>(); + private final List postConstructListeners = new ArrayList<>(); private CacheOptions cacheOptions = CacheOptions.NO_CACHING; @@ -169,7 +169,7 @@ public class DeployBeanDescriptor { /** * The table joins for this bean. Server side only. */ - private final ArrayList tableJoinList = new ArrayList(2); + private final ArrayList tableJoinList = new ArrayList<>(2); /** * Inheritance information. Server side only. @@ -454,7 +454,7 @@ public class DeployBeanDescriptor { */ public void addIndex(IndexDefinition c) { if (indexDefinitions == null) { - indexDefinitions = new ArrayList(); + indexDefinitions = new ArrayList<>(); } indexDefinitions.add(c); } @@ -629,12 +629,12 @@ public class DeployBeanDescriptor { public void sortProperties() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.addAll(propMap.values()); Collections.sort(list, PROP_ORDER); - propMap = new LinkedHashMap(list.size()); + propMap = new LinkedHashMap<>(list.size()); for (int i = 0; i < list.size(); i++) { addBeanProperty(list.get(i)); } @@ -917,7 +917,7 @@ public class DeployBeanDescriptor { public List propertiesId() { if (idProperties == null) { - idProperties = new ArrayList(2); + idProperties = new ArrayList<>(2); for (DeployBeanProperty prop : propMap.values()) { if (prop.isId()) { idProperties.add(prop); @@ -945,7 +945,7 @@ public class DeployBeanDescriptor { */ public List> propertiesAssocOne() { - ArrayList> list = new ArrayList>(); + ArrayList> list = new ArrayList<>(); for (DeployBeanProperty prop : propMap.values()) { if (prop instanceof DeployBeanPropertyAssocOne) { @@ -964,7 +964,7 @@ public class DeployBeanDescriptor { */ public List> propertiesAssocMany() { - ArrayList> list = new ArrayList>(); + ArrayList> list = new ArrayList<>(); for (DeployBeanProperty prop : propMap.values()) { if (prop instanceof DeployBeanPropertyAssocMany) { @@ -980,7 +980,7 @@ public class DeployBeanDescriptor { */ public List propertiesBase() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for (DeployBeanProperty prop : propMap.values()) { if (!(prop instanceof DeployBeanPropertyAssoc) && !prop.isId()) { @@ -1089,7 +1089,7 @@ public class DeployBeanDescriptor { */ public void addNamedQuery(String name, String query) { if (namedQuery == null) { - namedQuery = new LinkedHashMap(); + namedQuery = new LinkedHashMap<>(); } namedQuery.put(name, query); } @@ -1106,7 +1106,7 @@ public class DeployBeanDescriptor { */ public void addRawSql(String name, RawSql rawSql) { if (namedRawSql == null) { - namedRawSql = new HashMap(); + namedRawSql = new HashMap<>(); } namedRawSql.put(name, rawSql); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java index a85e63200..48f1db521 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java @@ -15,7 +15,7 @@ public class DeployBeanEmbedded { /** * A map of property names to dbColumns. */ - private final Map propMap = new HashMap(); + private final Map propMap = new HashMap<>(); /** * Set a Map of property names to dbColumns. diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java index b0666e501..9d707fdd9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java @@ -35,29 +35,29 @@ public class DeployBeanPropertyLists { private final LinkedHashMap propertyMap; - private final List ids = new ArrayList(); + private final List ids = new ArrayList<>(); - private final List local = new ArrayList(); + private final List local = new ArrayList<>(); - private final List mutable = new ArrayList(); + private final List mutable = new ArrayList<>(); - private final List> manys = new ArrayList>(); + private final List> manys = new ArrayList<>(); - private final List nonManys = new ArrayList(); + private final List nonManys = new ArrayList<>(); - private final List> ones = new ArrayList>(); + private final List> ones = new ArrayList<>(); - private final List> onesImported = new ArrayList>(); + private final List> onesImported = new ArrayList<>(); - private final List> embedded = new ArrayList>(); + private final List> embedded = new ArrayList<>(); - private final List baseScalar = new ArrayList(); + private final List baseScalar = new ArrayList<>(); - private final List baseCompound = new ArrayList(); + private final List baseCompound = new ArrayList<>(); - private final List transients = new ArrayList(); + private final List transients = new ArrayList<>(); - private final List nonTransients = new ArrayList(); + private final List nonTransients = new ArrayList<>(); private final TableJoin[] tableJoins; @@ -76,7 +76,7 @@ public class DeployBeanPropertyLists { unidirectional = new BeanPropertyAssocOne(owner, desc, deployUnidirectional); } - this.propertyMap = new LinkedHashMap(); + this.propertyMap = new LinkedHashMap<>(); // see if there is a discriminator property we should add String discriminatorColumn = null; @@ -346,7 +346,7 @@ public class DeployBeanPropertyLists { } private BeanPropertyAssocOne[] getOne(boolean imported, Mode mode) { - ArrayList> list = new ArrayList>(); + ArrayList> list = new ArrayList<>(); for (int i = 0; i < ones.size(); i++) { BeanPropertyAssocOne prop = ones.get(i); if (imported != prop.isOneToOneExported()) { @@ -371,7 +371,7 @@ public class DeployBeanPropertyLists { } private BeanPropertyAssocMany[] getMany2Many() { - ArrayList> list = new ArrayList>(); + ArrayList> list = new ArrayList<>(); for (int i = 0; i < manys.size(); i++) { BeanPropertyAssocMany prop = manys.get(i); if (prop.isManyToMany()) { @@ -383,7 +383,7 @@ public class DeployBeanPropertyLists { } private BeanPropertyAssocMany[] getMany(Mode mode) { - ArrayList> list = new ArrayList>(); + ArrayList> list = new ArrayList<>(); for (int i = 0; i < manys.size(); i++) { BeanPropertyAssocMany prop = manys.get(i); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java index fad7550a0..5296fff32 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java @@ -28,7 +28,7 @@ public class DeployTableJoin { /** * The list of join column pairs. Used to generate the on clause. */ - private ArrayList columns = new ArrayList(4); + private ArrayList columns = new ArrayList<>(4); private InheritInfo inheritInfo; @@ -53,7 +53,7 @@ public class DeployTableJoin { * Copy all the columns to this join potentially reversing the columns. */ public void setColumns(DeployTableJoinColumn[] cols, boolean reverse) { - columns = new ArrayList(); + columns = new ArrayList<>(); for (int i = 0; i < cols.length; i++) { addJoinColumn(cols[i].copy(reverse)); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationBase.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationBase.java index d6fc3b540..1b3d8acd5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationBase.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationBase.java @@ -101,7 +101,7 @@ public abstract class AnnotationBase { if (ann != null) { return ann; } else { - return findAnnotation(annotatedElement, annotationType, new HashSet()); + return findAnnotation(annotatedElement, annotationType, new HashSet<>()); } } @@ -121,7 +121,7 @@ public abstract class AnnotationBase { return ann; } else { while (clazz != null && clazz != Object.class) { - ann = findAnnotation(clazz, annotationType, new HashSet()); + ann = findAnnotation(clazz, annotationType, new HashSet<>()); if (ann != null) { return ann; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationParser.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationParser.java index 031681a5b..e2457ba77 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationParser.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationParser.java @@ -54,7 +54,7 @@ public abstract class AnnotationParser extends AnnotationBase { AttributeOverrides attrOverrides = get(prop, AttributeOverrides.class); if (attrOverrides != null) { - HashMap propMap = new HashMap(); + HashMap propMap = new HashMap<>(); AttributeOverride[] aoArray = attrOverrides.value(); for (int i = 0; i < aoArray.length; i++) { String propName = aoArray[i].name(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployBeanInfo.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployBeanInfo.java index 63ffc3801..ac7543d1b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployBeanInfo.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployBeanInfo.java @@ -16,7 +16,7 @@ public class DeployBeanInfo { /** * Holds TableJoins for secondary table properties. */ - private final HashMap tableJoinMap = new HashMap(); + private final HashMap tableJoinMap = new HashMap<>(); private final DeployUtil util; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInherit.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInherit.java index b110798f9..a1eec01bd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInherit.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInherit.java @@ -19,9 +19,9 @@ import java.util.Map; */ public class DeployInherit { - private final Map, DeployInheritInfo> deployMap = new LinkedHashMap, DeployInheritInfo>(); + private final Map, DeployInheritInfo> deployMap = new LinkedHashMap<>(); - private final Map, InheritInfo> finalMap = new LinkedHashMap, InheritInfo>(); + private final Map, InheritInfo> finalMap = new LinkedHashMap<>(); private final BootupClasses bootupClasses; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInheritInfo.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInheritInfo.java index 6c45bdd52..3964c5d23 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInheritInfo.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployInheritInfo.java @@ -32,7 +32,7 @@ public class DeployInheritInfo { private Class parent; - private final ArrayList children = new ArrayList(); + private final ArrayList children = new ArrayList<>(); /** * Create for a given type. @@ -202,7 +202,7 @@ public class DeployInheritInfo { public String getWhere() { - List discList = new ArrayList(); + List discList = new ArrayList<>(); appendDiscriminator(discList); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/SqlReservedWords.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/SqlReservedWords.java index 96beb0fdc..329307b5b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/SqlReservedWords.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/SqlReservedWords.java @@ -45,7 +45,7 @@ public class SqlReservedWords { +",WHERE,WITH"; - private static final HashSet keywords = new HashSet(); + private static final HashSet keywords = new HashSet<>(); static { String[] initialKeywords = baseKeyWords.split(","); diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElFilter.java b/src/main/java/com/avaje/ebeaninternal/server/el/ElFilter.java index 9ef9a520c..c8650d0d7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElFilter.java +++ b/src/main/java/com/avaje/ebeaninternal/server/el/ElFilter.java @@ -15,7 +15,7 @@ public final class ElFilter implements Filter { private final BeanDescriptor beanDescriptor; - private final ArrayList> matches = new ArrayList>(); + private final ArrayList> matches = new ArrayList<>(); private int maxRows; @@ -61,7 +61,7 @@ public final class ElFilter implements Filter { ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.InSet(matchingValues, elGetValue)); + matches.add(new ElMatchBuilder.InSet<>(matchingValues, elGetValue)); return this; } @@ -70,7 +70,7 @@ public final class ElFilter implements Filter { value = convertValue(propertyName, value); ElComparator comparator = getElComparator(propertyName); - matches.add(new ElMatchBuilder.Eq(value, comparator)); + matches.add(new ElMatchBuilder.Eq<>(value, comparator)); return this; } @@ -80,7 +80,7 @@ public final class ElFilter implements Filter { value = convertValue(propertyName, value); ElComparator comparator = getElComparator(propertyName); - matches.add(new ElMatchBuilder.Ne(value, comparator)); + matches.add(new ElMatchBuilder.Ne<>(value, comparator)); return this; } @@ -92,7 +92,7 @@ public final class ElFilter implements Filter { ElComparator elComparator = getElComparator(propertyName); - matches.add(new ElMatchBuilder.Between(min, max, elComparator)); + matches.add(new ElMatchBuilder.Between<>(min, max, elComparator)); return this; } @@ -102,7 +102,7 @@ public final class ElFilter implements Filter { value = convertValue(propertyName, value); ElComparator comparator = getElComparator(propertyName); - matches.add(new ElMatchBuilder.Gt(value, comparator)); + matches.add(new ElMatchBuilder.Gt<>(value, comparator)); return this; } @@ -111,7 +111,7 @@ public final class ElFilter implements Filter { value = convertValue(propertyName, value); ElComparator comparator = getElComparator(propertyName); - matches.add(new ElMatchBuilder.Ge(value, comparator)); + matches.add(new ElMatchBuilder.Ge<>(value, comparator)); return this; } @@ -119,7 +119,7 @@ public final class ElFilter implements Filter { ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.Ieq(elGetValue, value)); + matches.add(new ElMatchBuilder.Ieq<>(elGetValue, value)); return this; } @@ -128,7 +128,7 @@ public final class ElFilter implements Filter { ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.IsNotNull(elGetValue)); + matches.add(new ElMatchBuilder.IsNotNull<>(elGetValue)); return this; } @@ -137,7 +137,7 @@ public final class ElFilter implements Filter { ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.IsNull(elGetValue)); + matches.add(new ElMatchBuilder.IsNull<>(elGetValue)); return this; } @@ -147,7 +147,7 @@ public final class ElFilter implements Filter { value = convertValue(propertyName, value); ElComparator comparator = getElComparator(propertyName); - matches.add(new ElMatchBuilder.Le(value, comparator)); + matches.add(new ElMatchBuilder.Le<>(value, comparator)); return this; } @@ -157,7 +157,7 @@ public final class ElFilter implements Filter { value = convertValue(propertyName, value); ElComparator comparator = getElComparator(propertyName); - matches.add(new ElMatchBuilder.Lt(value, comparator)); + matches.add(new ElMatchBuilder.Lt<>(value, comparator)); return this; } @@ -169,7 +169,7 @@ public final class ElFilter implements Filter { ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.RegularExpr(elGetValue, regEx, options)); + matches.add(new ElMatchBuilder.RegularExpr<>(elGetValue, regEx, options)); return this; } @@ -178,7 +178,7 @@ public final class ElFilter implements Filter { String quote = ".*" + Pattern.quote(value) + ".*"; ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.RegularExpr(elGetValue, quote, 0)); + matches.add(new ElMatchBuilder.RegularExpr<>(elGetValue, quote, 0)); return this; } @@ -187,7 +187,7 @@ public final class ElFilter implements Filter { String quote = ".*" + Pattern.quote(value) + ".*"; ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.RegularExpr(elGetValue, quote, Pattern.CASE_INSENSITIVE)); + matches.add(new ElMatchBuilder.RegularExpr<>(elGetValue, quote, Pattern.CASE_INSENSITIVE)); return this; } @@ -195,28 +195,28 @@ public final class ElFilter implements Filter { public Filter endsWith(String propertyName, String value) { ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.EndsWith(elGetValue, value)); + matches.add(new ElMatchBuilder.EndsWith<>(elGetValue, value)); return this; } public Filter startsWith(String propertyName, String value) { ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.StartsWith(elGetValue, value)); + matches.add(new ElMatchBuilder.StartsWith<>(elGetValue, value)); return this; } public Filter iendsWith(String propertyName, String value) { ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.IEndsWith(elGetValue, value)); + matches.add(new ElMatchBuilder.IEndsWith<>(elGetValue, value)); return this; } public Filter istartsWith(String propertyName, String value) { ElPropertyValue elGetValue = getElGetValue(propertyName); - matches.add(new ElMatchBuilder.IStartsWith(elGetValue, value)); + matches.add(new ElMatchBuilder.IStartsWith<>(elGetValue, value)); return this; } @@ -229,11 +229,11 @@ public final class ElFilter implements Filter { if (sortByClause != null) { // create shallow copy and sort - list = new ArrayList(list); + list = new ArrayList<>(list); beanDescriptor.sort(list, sortByClause); } - ArrayList filterList = new ArrayList(); + ArrayList filterList = new ArrayList<>(); for (int i = 0; i < list.size(); i++) { T t = list.get(i); diff --git a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChainBuilder.java b/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChainBuilder.java index 946e8d1fc..d8b681858 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChainBuilder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/el/ElPropertyChainBuilder.java @@ -17,7 +17,7 @@ public class ElPropertyChainBuilder { private final String expression; - private final List chain = new ArrayList(); + private final List chain = new ArrayList<>(); private final boolean embedded; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java index a979879a2..63ce7c23c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpression.java @@ -82,7 +82,7 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio DefaultExampleExpression(ArrayList source) { this.entity = null; - this.list = new ArrayList(source.size()); + this.list = new ArrayList<>(source.size()); for (SpiExpression expression : source) { list.add(expression.copyForPlanKey()); } @@ -273,7 +273,7 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio */ private ArrayList buildExpressions(BeanDescriptor beanDescriptor) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); addExpressions(list, beanDescriptor, entity, null); return list; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactory.java b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactory.java index 5115a8ae3..2e0a7c1f9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionFactory.java @@ -492,35 +492,35 @@ public class DefaultExpressionFactory implements SpiExpressionFactory { * Return a list of expressions that will be joined by AND's. */ public Junction conjunction(Query query) { - return new JunctionExpression(Junction.Type.AND, query, query.where()); + return new JunctionExpression<>(Junction.Type.AND, query, query.where()); } /** * Return a list of expressions that will be joined by OR's. */ public Junction disjunction(Query query) { - return new JunctionExpression(Junction.Type.OR, query, query.where()); + return new JunctionExpression<>(Junction.Type.OR, query, query.where()); } /** * Return a list of expressions that will be joined by AND's. */ public Junction conjunction(Query query, ExpressionList parent) { - return new JunctionExpression(Junction.Type.AND, query, parent); + return new JunctionExpression<>(Junction.Type.AND, query, parent); } /** * Return a list of expressions that will be joined by OR's. */ public Junction disjunction(Query query, ExpressionList parent) { - return new JunctionExpression(Junction.Type.OR, query, parent); + return new JunctionExpression<>(Junction.Type.OR, query, parent); } /** * Return a list of expressions that are wrapped by NOT. */ public Junction junction(Junction.Type type, Query query) { - return new JunctionExpression(type, query, query.where()); + return new JunctionExpression<>(type, query, query.where()); } /** @@ -528,6 +528,6 @@ public class DefaultExpressionFactory implements SpiExpressionFactory { */ @Override public Junction junction(Junction.Type type, Query query, ExpressionList parent) { - return new JunctionExpression(type, query, parent); + return new JunctionExpression<>(type, query, parent); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java index 497317fcf..e1e289523 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java @@ -50,7 +50,7 @@ public class DefaultExpressionList implements SpiExpressionList { * Construct for Text root expression list - this handles implicit Bool Should, Must etc. */ public DefaultExpressionList(Query query) { - this(query, query.getExpressionFactory(), null, new ArrayList(), true); + this(query, query.getExpressionFactory(), null, new ArrayList<>(), true); } public DefaultExpressionList(Query query, ExpressionList parentExprList) { @@ -58,7 +58,7 @@ public class DefaultExpressionList implements SpiExpressionList { } DefaultExpressionList(Query query, ExpressionFactory expr, ExpressionList parentExprList) { - this(query, expr, parentExprList, new ArrayList()); + this(query, expr, parentExprList, new ArrayList<>()); } DefaultExpressionList(Query query, ExpressionFactory expr, ExpressionList parentExprList, List list) { @@ -74,7 +74,7 @@ public class DefaultExpressionList implements SpiExpressionList { } private DefaultExpressionList() { - this(null, null, null, new ArrayList()); + this(null, null, null, new ArrayList<>()); } /** @@ -87,11 +87,11 @@ public class DefaultExpressionList implements SpiExpressionList { */ SpiExpression wrap(List list, String nestedPath, Junction.Type type) { - DefaultExpressionList wrapper = new DefaultExpressionList(query, expr, null, list, false); + DefaultExpressionList wrapper = new DefaultExpressionList<>(query, expr, null, list, false); wrapper.setAllDocNested(nestedPath); if (type != null) { - return new JunctionExpression(type, wrapper); + return new JunctionExpression<>(type, wrapper); } else { return wrapper; } @@ -201,13 +201,13 @@ public class DefaultExpressionList implements SpiExpressionList { *

*/ public DefaultExpressionList copy(Query query) { - DefaultExpressionList copy = new DefaultExpressionList(query, expr, null); + DefaultExpressionList copy = new DefaultExpressionList<>(query, expr, null); copy.list.addAll(list); return copy; } public DefaultExpressionList copyForPlanKey() { - DefaultExpressionList copy = new DefaultExpressionList(); + DefaultExpressionList copy = new DefaultExpressionList<>(); for (int i = 0; i < list.size(); i++) { copy.list.add(list.get(i).copyForPlanKey()); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionRequest.java b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionRequest.java index 76f157b43..3c983bc6d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionRequest.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionRequest.java @@ -21,7 +21,7 @@ public class DefaultExpressionRequest implements SpiExpressionRequest { private final StringBuilder sql = new StringBuilder(); - private final List bindValues = new ArrayList(); + private final List bindValues = new ArrayList<>(); private final DeployParser deployParser; diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/FilterExpressionList.java b/src/main/java/com/avaje/ebeaninternal/server/expression/FilterExpressionList.java index dc3852ef6..a852d3593 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/FilterExpressionList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/FilterExpressionList.java @@ -30,7 +30,7 @@ public class FilterExpressionList extends DefaultExpressionList { @Override public SpiExpressionList trimPath(int prefixTrim) { - return new FilterExpressionList(pathPrefix.trimPath(prefixTrim), this); + return new FilterExpressionList<>(pathPrefix.trimPath(prefixTrim), this); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/InExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/InExpression.java index 89ad86c40..3352850da 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/InExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/InExpression.java @@ -34,7 +34,7 @@ class InExpression extends AbstractExpression { } private Object[] values() { - List vals = new ArrayList(); + List vals = new ArrayList<>(); for (Object sourceValue : sourceValues) { NamedParamHelp.valueAdd(vals, sourceValue); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java index 6a3351d66..2b852a1dc 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java @@ -46,7 +46,7 @@ class JunctionExpression implements SpiJunction, SpiExpression, Expression JunctionExpression(Junction.Type type, Query query, ExpressionList parent) { this.type = type; - this.exprList = new DefaultExpressionList(query, parent); + this.exprList = new DefaultExpressionList<>(query, parent); } /** @@ -84,7 +84,7 @@ class JunctionExpression implements SpiJunction, SpiExpression, Expression } public SpiExpression copyForPlanKey() { - return new JunctionExpression(type, exprList.copyForPlanKey()); + return new JunctionExpression<>(type, exprList.copyForPlanKey()); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/PrepareDocNested.java b/src/main/java/com/avaje/ebeaninternal/server/expression/PrepareDocNested.java index ee917f830..2c05609b1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/PrepareDocNested.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/PrepareDocNested.java @@ -73,7 +73,7 @@ class PrepareDocNested { */ private List group() { - Map groups = new LinkedHashMap(); + Map groups = new LinkedHashMap<>(); // organise expressions by nestedPath for (int i = 0; i < origSize; i++) { @@ -87,7 +87,7 @@ class PrepareDocNested { group.list.add(expr); } - List newList = new ArrayList(); + List newList = new ArrayList<>(); Collection values = groups.values(); for (Group group : values) { group.addTo(newList); @@ -145,7 +145,7 @@ class PrepareDocNested { final String nestedPath; - final List list = new ArrayList(); + final List list = new ArrayList<>(); Group(String nestedPath) { this.nestedPath = nestedPath; diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapter.java b/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapter.java index 1eceaf120..762ec25b5 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapter.java +++ b/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapter.java @@ -57,7 +57,7 @@ class EqlAdapter extends EQLBaseListener { } if (whereStack == null) { - whereStack = new ArrayStack>(); + whereStack = new ArrayStack<>(); whereStack.push(query.where()); } // return the current expression list @@ -66,7 +66,7 @@ class EqlAdapter extends EQLBaseListener { private ExpressionList _peekText() { if (textStack == null) { - textStack = new ArrayStack>(); + textStack = new ArrayStack<>(); // empty so push on the queries base expression list textStack.push(query.text()); } @@ -216,7 +216,7 @@ class EqlAdapter extends EQLBaseListener { @Override public void enterIn_expression(EQLParser.In_expressionContext ctx) { - this.inValues = new ArrayList(); + this.inValues = new ArrayList<>(); this.inPropertyName = getLeftHandSidePath(ctx); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlParser.java b/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlParser.java index 12b5e7a41..44e06bff3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlParser.java +++ b/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlParser.java @@ -28,7 +28,7 @@ public class EqlParser { parser.addErrorListener(errorListener); EQLParser.Select_statementContext context = parser.select_statement(); - EqlAdapter adapter = new EqlAdapter(query); + EqlAdapter adapter = new EqlAdapter<>(query); ParseTreeWalker walker = new ParseTreeWalker(); walker.walk(adapter, context); diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/OperatorMapping.java b/src/main/java/com/avaje/ebeaninternal/server/grammer/OperatorMapping.java index 2e19dd512..94d300e66 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/grammer/OperatorMapping.java +++ b/src/main/java/com/avaje/ebeaninternal/server/grammer/OperatorMapping.java @@ -5,7 +5,7 @@ import java.util.Map; class OperatorMapping { - Map map = new HashMap(); + Map map = new HashMap<>(); public OperatorMapping() { map.put("eq", EqlOperator.EQ); diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/ShutdownManager.java b/src/main/java/com/avaje/ebeaninternal/server/lib/ShutdownManager.java index 8100e6816..33f298554 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/ShutdownManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/lib/ShutdownManager.java @@ -23,7 +23,7 @@ public final class ShutdownManager { private static final Logger logger = LoggerFactory.getLogger(ShutdownManager.class); - static final List servers = new ArrayList(); + static final List servers = new ArrayList<>(); static final ShutdownHook shutdownHook = new ShutdownHook(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringHelper.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringHelper.java index b3bb630e2..4e5b7667c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringHelper.java +++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringHelper.java @@ -23,7 +23,7 @@ public class StringHelper { public static Map delimitedToMap(String allNameValuePairs, String listDelimiter, String nameValueSeparator) { - HashMap params = new HashMap(); + HashMap params = new HashMap<>(); if ((allNameValuePairs == null) || (allNameValuePairs.isEmpty())) { return params; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java index 3a73be4e3..c1f374bb1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java +++ b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadBeanContext.java @@ -27,7 +27,7 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex public DLoadBeanContext(DLoadContext parent, BeanDescriptor desc, String path, int defaultBatchSize, OrmQueryProperties queryProps) { super(parent, desc, path, defaultBatchSize, queryProps); // bufferList only required when using query joins (queryFetch) - this.bufferList = (!queryFetch) ? null : new ArrayList(); + this.bufferList = (!queryFetch) ? null : new ArrayList<>(); this.currentBuffer = createBuffer(firstBatchSize); } @@ -109,7 +109,7 @@ public class DLoadBeanContext extends DLoadBaseContext implements LoadBeanContex public LoadBuffer(DLoadBeanContext context, int batchSize) { this.context = context; this.batchSize = batchSize; - this.list = new ArrayList(batchSize); + this.list = new ArrayList<>(batchSize); } public int getBatchSize() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContext.java b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContext.java index 2088e5b05..eb5e6707b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContext.java +++ b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContext.java @@ -33,8 +33,8 @@ public class DLoadContext implements LoadContext { private final BeanDescriptor rootDescriptor; - private final Map beanMap = new HashMap(); - private final Map manyMap = new HashMap(); + private final Map beanMap = new HashMap<>(); + private final Map manyMap = new HashMap<>(); private final DLoadBeanContext rootBeanContext; @@ -55,7 +55,7 @@ public class DLoadContext implements LoadContext { private final ObjectGraphOrigin origin; private final boolean useProfiling; - private final Map nodePathMap = new HashMap(); + private final Map nodePathMap = new HashMap<>(); private PersistenceContext persistenceContext; diff --git a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadManyContext.java b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadManyContext.java index 979244593..b55b1efe4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadManyContext.java +++ b/src/main/java/com/avaje/ebeaninternal/server/loadcontext/DLoadManyContext.java @@ -35,7 +35,7 @@ public class DLoadManyContext extends DLoadBaseContext implements LoadManyContex this.property = property; this.docStoreMapped = property.getTargetDescriptor().isDocStoreMapped(); // bufferList only required when using query joins (queryFetch) - this.bufferList = (!queryFetch) ? null : new ArrayList(); + this.bufferList = (!queryFetch) ? null : new ArrayList<>(); this.currentBuffer = createBuffer(firstBatchSize); } @@ -133,7 +133,7 @@ public class DLoadManyContext extends DLoadBaseContext implements LoadManyContex // case it changes as part of a findIterate etc this.persistenceContext = context.getPersistenceContext(); this.batchSize = batchSize; - this.list = new ArrayList>(batchSize); + this.list = new ArrayList<>(batchSize); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchControl.java b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchControl.java index 846ed3dd2..e4efe2cb7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchControl.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchControl.java @@ -42,7 +42,7 @@ public final class BatchControl { * Map of the BatchedBeanHolder objects. They each have a depth and are later * sorted by their depth to get the execution order. */ - private final HashMap beanHoldMap = new HashMap(); + private final HashMap beanHoldMap = new HashMap<>(); private final SpiTransaction transaction; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolder.java b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolder.java index df18d3a93..e842c52eb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedBeanHolder.java @@ -54,7 +54,7 @@ public class BatchedBeanHolder { * Set of beans in this batch. This is used to ensure that a single bean instance is not included * in the batch twice (two separate insert requests etc). */ - private final IdentityHashMap persistedBeans = new IdentityHashMap(); + private final IdentityHashMap persistedBeans = new IdentityHashMap<>(); /** * Create a new entry with a given type and depth. @@ -132,7 +132,7 @@ public class BatchedBeanHolder { switch (request.getType()) { case INSERT: if (inserts == null) { - inserts = new ArrayList(); + inserts = new ArrayList<>(); } inserts.add(request); return inserts.size(); @@ -140,14 +140,14 @@ public class BatchedBeanHolder { case UPDATE: case SOFT_DELETE: if (updates == null) { - updates = new ArrayList(); + updates = new ArrayList<>(); } updates.add(request); return updates.size(); case DELETE: if (deletes == null) { - deletes = new ArrayList(); + deletes = new ArrayList<>(); } deletes.add(request); return deletes.size(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmt.java b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmt.java index c2c808ea7..ed5be8019 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmt.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmt.java @@ -27,7 +27,7 @@ public class BatchedPstmt { /** * The list of BatchPostExecute used to perform post processing. */ - private final ArrayList list = new ArrayList(); + private final ArrayList list = new ArrayList<>(); private final String sql; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java index 2f682e215..c726b7a8f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java @@ -25,7 +25,7 @@ public class BatchedPstmtHolder { * A Map of the statements using a String key. This is used so that the same * Statement,Prepared,Callable is reused. */ - private final LinkedHashMap stmtMap = new LinkedHashMap(); + private final LinkedHashMap stmtMap = new LinkedHashMap<>(); /** * The Max size across all the BatchedPstmt. diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BindValues.java b/src/main/java/com/avaje/ebeaninternal/server/persist/BindValues.java index bb41fd74b..8bf946244 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BindValues.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/BindValues.java @@ -7,7 +7,7 @@ import java.util.ArrayList; */ public class BindValues { - final ArrayList list = new ArrayList(); + final ArrayList list = new ArrayList<>(); /** * Create with a Binder. diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java index 7883d169e..4c035aa9c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java @@ -136,7 +136,7 @@ public final class DefaultPersister implements Persister { Class beanType = query.getBeanType(); BeanDescriptor desc = server.getBeanDescriptor(beanType); - DraftHandler draftHandler = new DraftHandler(desc, transaction); + DraftHandler draftHandler = new DraftHandler<>(desc, transaction); List liveBeans = draftHandler.fetchSourceBeans(query, false); PUB.debug("draftRestore [{}] count[{}]", desc.getName(), liveBeans.size()); @@ -165,7 +165,7 @@ public final class DefaultPersister implements Persister { * Helper method to return the list of Id values for the list of beans. */ private List getBeanIds(BeanDescriptor desc, List beans) { - List idList = new ArrayList(); + List idList = new ArrayList<>(); for (T liveBean: beans) { idList.add(desc.getBeanId(liveBean)); } @@ -181,7 +181,7 @@ public final class DefaultPersister implements Persister { Class beanType = query.getBeanType(); BeanDescriptor desc = server.getBeanDescriptor(beanType); - DraftHandler draftHandler = new DraftHandler(desc, transaction); + DraftHandler draftHandler = new DraftHandler<>(desc, transaction); List draftBeans = draftHandler.fetchSourceBeans(query, true); PUB.debug("publish [{}] count[{}]", desc.getName(), draftBeans.size()); @@ -193,7 +193,7 @@ public final class DefaultPersister implements Persister { BeanManager mgr = beanDescriptorManager.getBeanManager(beanType); - List livePublish = new ArrayList(draftBeans.size()); + List livePublish = new ArrayList<>(draftBeans.size()); for (T draftBean: draftBeans) { T liveBean = draftHandler.publishToDestinationBean(draftBean); livePublish.add(liveBean); @@ -226,7 +226,7 @@ public final class DefaultPersister implements Persister { final BeanDescriptor desc; final Transaction transaction; final BeanProperty draftDirty; - final List draftUpdates = new ArrayList(); + final List draftUpdates = new ArrayList<>(); /** * Id value of the last published bean. @@ -573,7 +573,7 @@ public final class DefaultPersister implements Persister { BeanDescriptor descriptor = beanDescriptorManager.getBeanDescriptor(beanType); - ArrayList idList = new ArrayList(ids.size()); + ArrayList idList = new ArrayList<>(ids.size()); for (Object id : ids) { // convert to appropriate type if required idList.add(descriptor.convertId(id)); @@ -985,7 +985,7 @@ public final class DefaultPersister implements Persister { ArrayList detailIds = null; if (deleteMissingChildren) { // collect the Id's (to exclude from deleteManyDetails) - detailIds = new ArrayList(); + detailIds = new ArrayList<>(); } // increase depth for batching order @@ -1292,7 +1292,7 @@ public final class DefaultPersister implements Persister { if (targetDesc.propertiesManyToMany().length > 0) { // convert into a list of reference objects and perform delete by object - List refList = new ArrayList(childIds.size()); + List refList = new ArrayList<>(childIds.size()); for (Object id : childIds) { refList.add(targetDesc.createReference(null, false, id, null)); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java b/src/main/java/com/avaje/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java index 9a8488231..175695a21 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java @@ -23,7 +23,7 @@ import java.util.List; */ class DeleteUnloadedForeignKeys { - private final List> propList = new ArrayList>(4); + private final List> propList = new ArrayList<>(4); private final SpiEbeanServer server; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/MetaFactory.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/MetaFactory.java index 1ad53e203..374500421 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/MetaFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/MetaFactory.java @@ -56,7 +56,7 @@ public class MetaFactory { */ public UpdateMeta createUpdate(BeanDescriptor desc) { - List setList = new ArrayList(); + List setList = new ArrayList<>(); baseFact.create(setList, desc, DmlMode.UPDATE, includeLobs); embeddedFact.create(setList, desc, DmlMode.UPDATE, includeLobs); @@ -90,7 +90,7 @@ public class MetaFactory { BindableId id = idFact.createId(desc); - List allList = new ArrayList(); + List allList = new ArrayList<>(); baseFact.create(allList, desc, DmlMode.INSERT, includeLobs); embeddedFact.create(allList, desc, DmlMode.INSERT, includeLobs); diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateMeta.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateMeta.java index 073e23d71..32bc1f022 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateMeta.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateMeta.java @@ -116,7 +116,7 @@ public final class UpdateMeta { // build a new UpdatePlan and cache it // build a bindableList that only contains the changed properties - List list = new ArrayList(); + List list = new ArrayList<>(); set.addToUpdate(persistRequest, list); BindableList bindableList = new BindableList(list); diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableList.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableList.java index cf46cd141..f8f231b29 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableList.java @@ -23,7 +23,7 @@ public class BindableList implements Bindable { * Return a bindable list that excludes @DraftOnly properties. */ public BindableList excludeDraftOnly() { - List copy = new ArrayList(items.length); + List copy = new ArrayList<>(items.length); for (Bindable b : items) { if (!b.isDraftOnly()) { copy.add(b); diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java index 9ce0717fb..e1378423b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java @@ -34,7 +34,7 @@ public class FactoryBaseProperties { for (int i = 0; i < compoundProps.length; i++) { BeanProperty[] props = compoundProps[i].getScalarProperties(); - List newList = new ArrayList(props.length); + List newList = new ArrayList<>(props.length); addCompound(props, newList, mode, withLobs); BindableCompound compoundBindable = new BindableCompound(compoundProps[i], newList); diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java index 7cedbbaa2..45d1e165e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java @@ -30,7 +30,7 @@ public class FactoryEmbedded { BeanProperty[] props = embedded[j].getProperties(); - List bindList = new ArrayList(props.length); + List bindList = new ArrayList<>(props.length); for (int i = 0; i < props.length; i++) { Bindable item = factoryProperty.create(props[i], mode, withLobs); diff --git a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertiesReader.java b/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertiesReader.java index 39c78781d..d466fb7cb 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertiesReader.java +++ b/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertiesReader.java @@ -10,7 +10,7 @@ import java.util.Map; */ public class BeanPropertiesReader { - private final Map propertyIndexMap = new HashMap(); + private final Map propertyIndexMap = new HashMap<>(); private final String[] props; diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/CQuery.java b/src/main/java/com/avaje/ebeaninternal/server/query/CQuery.java index 0dee1d36a..8a6663b36 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/CQuery.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/CQuery.java @@ -737,7 +737,7 @@ public class CQuery implements DbReadContext, CancelableQuery { if (!collection.isEmpty()) { // get the id values of the underlying collection - List ids = new ArrayList(collection.size()); + List ids = new ArrayList<>(collection.size()); Collection underlyingBeans = collection.getActualDetails(); for (T underlyingBean : underlyingBeans) { ids.add(desc.getIdForJson(underlyingBean)); diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java index 519b6d88c..e53bfc904 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeBuilder.java @@ -666,7 +666,7 @@ public class SqlTreeBuilder { */ private String[] findExtras() { - List extras = new ArrayList(); + List extras = new ArrayList<>(); for (String predProp : predicateIncludes) { if (!selectIncludes.contains(predProp)) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 240cf50c7..7a5ee3e1a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -1418,7 +1418,7 @@ public class DefaultOrmQuery implements SpiQuery { @Override public ExpressionList having() { if (havingExpressions == null) { - havingExpressions = new DefaultExpressionList(this, null); + havingExpressions = new DefaultExpressionList<>(this, null); } return havingExpressions; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/csv/CsvUtilReader.java b/src/main/java/com/avaje/ebeaninternal/server/text/csv/CsvUtilReader.java index 650c94f5e..4a7fc27e1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/text/csv/CsvUtilReader.java +++ b/src/main/java/com/avaje/ebeaninternal/server/text/csv/CsvUtilReader.java @@ -128,7 +128,7 @@ public class CsvUtilReader { */ public List readAll() throws IOException { - List allElements = new ArrayList(); + List allElements = new ArrayList<>(); while (hasNext) { String[] nextLineAsTokens = readNext(); if (nextLineAsTokens != null) @@ -188,7 +188,7 @@ public class CsvUtilReader { return null; } - List tokensOnThisLine = new ArrayList(); + List tokensOnThisLine = new ArrayList<>(); StringBuilder sb = new StringBuilder(); boolean inQuotes = false; diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/csv/TCsvReader.java b/src/main/java/com/avaje/ebeaninternal/server/text/csv/TCsvReader.java index e185d3fe4..3fe34fe90 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/text/csv/TCsvReader.java +++ b/src/main/java/com/avaje/ebeaninternal/server/text/csv/TCsvReader.java @@ -35,7 +35,7 @@ public class TCsvReader implements CsvReader { private final BeanDescriptor descriptor; - private final List columnList = new ArrayList(); + private final List columnList = new ArrayList<>(); private final CsvColumn ignoreColumn = new CsvColumn(); @@ -155,7 +155,7 @@ public class TCsvReader implements CsvReader { } public void process(Reader reader) throws Exception { - DefaultCsvCallback callback = new DefaultCsvCallback(persistBatchSize, logInfoFrequency); + DefaultCsvCallback callback = new DefaultCsvCallback<>(persistBatchSize, logInfoFrequency); process(reader, callback); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonContext.java b/src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonContext.java index 21d6ffd6f..92a4603ae 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonContext.java +++ b/src/main/java/com/avaje/ebeaninternal/server/text/json/DJsonContext.java @@ -123,7 +123,7 @@ public class DJsonContext implements JsonContext { BeanDescriptor desc = getDescriptor(cls); ReadJson readJson = new ReadJson(desc, parser, options, determineObjectMapper(options)); - return new DJsonBeanReader(desc, readJson); + return new DJsonBeanReader<>(desc, readJson); } @Override @@ -131,7 +131,7 @@ public class DJsonContext implements JsonContext { BeanDescriptor desc = (BeanDescriptor)beanType; ReadJson readJson = new ReadJson(desc, parser, options, determineObjectMapper(options)); - return new DJsonBeanReader(desc, readJson); + return new DJsonBeanReader<>(desc, readJson); } public List toList(Class cls, String json) throws JsonIOException { @@ -161,7 +161,7 @@ public class DJsonContext implements JsonContext { ReadJson readJson = new ReadJson(desc, src, options, determineObjectMapper(options)); try { - List list = new ArrayList(); + List list = new ArrayList<>(); JsonToken currentToken = src.getCurrentToken(); if (currentToken != JsonToken.START_ARRAY) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/json/WriteJson.java b/src/main/java/com/avaje/ebeaninternal/server/text/json/WriteJson.java index 11af1a92f..aa01245af 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/text/json/WriteJson.java +++ b/src/main/java/com/avaje/ebeaninternal/server/text/json/WriteJson.java @@ -50,7 +50,7 @@ public class WriteJson implements JsonWriter { this.visitors = visitors; this.objectMapper = objectMapper; this.include = include; - this.parentBeans = new ArrayStack(); + this.parentBeans = new ArrayStack<>(); this.pathStack = new PathStack(); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPersistIdMap.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPersistIdMap.java index adc4180d2..dbe4c0f68 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPersistIdMap.java +++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPersistIdMap.java @@ -13,7 +13,7 @@ import java.util.Map; */ public final class BeanPersistIdMap { - private final Map beanMap = new LinkedHashMap(); + private final Map beanMap = new LinkedHashMap<>(); public String toString() { return beanMap.toString(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPersistIds.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPersistIds.java index 9c888394b..03c6c344b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPersistIds.java +++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/BeanPersistIds.java @@ -98,7 +98,7 @@ public class BeanPersistIds { if (count < 1) { return null; } - List idList = new ArrayList(count); + List idList = new ArrayList<>(count); for (int i = 0; i < count; i++) { idList.add(idBinder.readData(dataInput)); } @@ -186,21 +186,21 @@ public class BeanPersistIds { private void addInsertId(Serializable id) { if (insertIds == null) { - insertIds = new ArrayList(); + insertIds = new ArrayList<>(); } insertIds.add(id); } private void addUpdateId(Serializable id) { if (updateIds == null) { - updateIds = new ArrayList(); + updateIds = new ArrayList<>(); } updateIds.add(id); } private void addDeleteId(Serializable id) { if (deleteIds == null) { - deleteIds = new ArrayList(); + deleteIds = new ArrayList<>(); } deleteIds.add(id); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/BulkEventListenerMap.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/BulkEventListenerMap.java index c82d8aac6..ed56e9946 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/BulkEventListenerMap.java +++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/BulkEventListenerMap.java @@ -10,7 +10,7 @@ import java.util.Set; public class BulkEventListenerMap { - private final HashMap map = new HashMap(); + private final HashMap map = new HashMap<>(); public BulkEventListenerMap(List listeners) { @@ -48,7 +48,7 @@ public class BulkEventListenerMap { private static class Entry { - final List listeners = new ArrayList(); + final List listeners = new ArrayList<>(); private void add(BulkTableEventListener l) { listeners.add(l); diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultPersistenceContext.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultPersistenceContext.java index fa7970edf..41a4dc6ad 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultPersistenceContext.java +++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/DefaultPersistenceContext.java @@ -30,7 +30,7 @@ public final class DefaultPersistenceContext implements PersistenceContext { /** * Map used hold caches. One cache per bean type. */ - private final HashMap, ClassContext> typeCache = new HashMap, ClassContext>(); + private final HashMap, ClassContext> typeCache = new HashMap<>(); private final Monitor monitor = new Monitor(); @@ -134,7 +134,7 @@ public final class DefaultPersistenceContext implements PersistenceContext { private static class ClassContext { - private final Map map = new HashMap(); + private final Map map = new HashMap<>(); private Set deleteSet; @@ -187,7 +187,7 @@ public final class DefaultPersistenceContext implements PersistenceContext { private void deleted(Object id) { if (deleteSet == null) { - deleteSet = new HashSet(); + deleteSet = new HashSet<>(); } deleteSet.add(id); map.remove(id); diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/DeleteByIdMap.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/DeleteByIdMap.java index 55b47ff76..3f00a02f0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/DeleteByIdMap.java +++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/DeleteByIdMap.java @@ -19,7 +19,7 @@ import com.avaje.ebeanservice.docstore.api.DocStoreUpdates; */ public final class DeleteByIdMap { - private final Map beanMap = new LinkedHashMap(); + private final Map beanMap = new LinkedHashMap<>(); public String toString() { return beanMap.toString(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java index 4478d10a2..759fccc9b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java @@ -255,7 +255,7 @@ public class JdbcTransaction implements SpiTransaction { @Override public void register(TransactionCallback callback) { if (callbackList == null) { - callbackList = new ArrayList(4); + callbackList = new ArrayList<>(4); } callbackList.add(callback); } @@ -336,7 +336,7 @@ public class JdbcTransaction implements SpiTransaction { @Override public void registerDeferred(PersistDeferredRelationship derived) { if (deferredList == null) { - deferredList = new ArrayList(); + deferredList = new ArrayList<>(); } deferredList.add(derived); } @@ -350,7 +350,7 @@ public class JdbcTransaction implements SpiTransaction { @Override public void registerDeleteBean(Integer persistingBean) { if (deletingBeansHash == null) { - deletingBeansHash = new HashSet(); + deletingBeansHash = new HashSet<>(); } deletingBeansHash.add(persistingBean); } @@ -388,7 +388,7 @@ public class JdbcTransaction implements SpiTransaction { @Override public boolean isRegisteredBean(Object bean) { if (persistingBeans == null) { - persistingBeans = new IdentityHashMap(); + persistingBeans = new IdentityHashMap<>(); } return (persistingBeans.put(bean, PLACEHOLDER) != null); } @@ -401,7 +401,7 @@ public class JdbcTransaction implements SpiTransaction { public boolean isSaveAssocManyIntersection(String intersectionTable, String beanName) { if (m2mIntersectionSave == null) { // first attempt so yes allow this m2m intersection direction - m2mIntersectionSave = new HashMap(); + m2mIntersectionSave = new HashMap<>(); m2mIntersectionSave.put(intersectionTable, beanName); return true; } @@ -1064,7 +1064,7 @@ public class JdbcTransaction implements SpiTransaction { @Override public void putUserObject(String name, Object value) { if (userObjects == null) { - userObjects = new HashMap(); + userObjects = new HashMap<>(); } userObjects.put(name, value); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/RemoteTransactionEvent.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/RemoteTransactionEvent.java index 42b79bd3f..77e72c59b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/RemoteTransactionEvent.java +++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/RemoteTransactionEvent.java @@ -10,7 +10,7 @@ import java.util.List; public class RemoteTransactionEvent implements Runnable { - private final List beanPersistList = new ArrayList(); + private final List beanPersistList = new ArrayList<>(); private List tableList; @@ -77,7 +77,7 @@ public class RemoteTransactionEvent implements Runnable { public void addTableIUD(TableIUD tableIud) { if (tableList == null) { - tableList = new ArrayList(4); + tableList = new ArrayList<>(4); } tableList.add(tableIud); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionMap.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionMap.java index d02a84915..e4f43fcde 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionMap.java +++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/TransactionMap.java @@ -14,7 +14,7 @@ public class TransactionMap { /** * Map of State by serverName. */ - private final HashMap map = new HashMap(); + private final HashMap map = new HashMap<>(); public String toString() { return map.toString(); diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/CtCompoundTypeScalarList.java b/src/main/java/com/avaje/ebeaninternal/server/type/CtCompoundTypeScalarList.java index 79fe9f2e4..fdfea3f00 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/CtCompoundTypeScalarList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/CtCompoundTypeScalarList.java @@ -14,16 +14,16 @@ import java.util.Set; */ public final class CtCompoundTypeScalarList { - private final LinkedHashMap> scalarProps = new LinkedHashMap>(); + private final LinkedHashMap> scalarProps = new LinkedHashMap<>(); - private final LinkedHashMap compoundProperties = new LinkedHashMap(); + private final LinkedHashMap compoundProperties = new LinkedHashMap<>(); /** * Return the list of non-scalar properties. These occur when compound types are nested. */ public List getNonScalarProperties() { - List nonScalarProps = new ArrayList(); + List nonScalarProps = new ArrayList<>(); for (String propKey : compoundProperties.keySet()) { if (!scalarProps.containsKey(propKey)) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbValueMap.java b/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbValueMap.java index 742aa864a..53c56172e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbValueMap.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/EnumToDbValueMap.java @@ -46,9 +46,9 @@ public abstract class EnumToDbValueMap { public EnumToDbValueMap(boolean allowNulls, boolean isIntegerType) { this.allowNulls = allowNulls; this.isIntegerType = isIntegerType; - this.keyMap = new LinkedHashMap(); - this.valueMap = new LinkedHashMap(); - this.nameMap = new HashMap(); + this.keyMap = new LinkedHashMap<>(); + this.valueMap = new LinkedHashMap<>(); + this.nameMap = new HashMap<>(); } /** diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ImmutableCompoundTypeBuilder.java b/src/main/java/com/avaje/ebeaninternal/server/type/ImmutableCompoundTypeBuilder.java index e00afac15..26b4e726a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ImmutableCompoundTypeBuilder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ImmutableCompoundTypeBuilder.java @@ -19,7 +19,7 @@ public final class ImmutableCompoundTypeBuilder { } }; - private final Map, Entry> entryMap = new HashMap, Entry>(); + private final Map, Entry> entryMap = new HashMap<>(); /** * Clear the cache of partial compound objects. @@ -80,7 +80,7 @@ public final class ImmutableCompoundTypeBuilder { private Entry(CtCompoundType ct) { this.ct = ct; - this.valueMap = new HashMap(); + this.valueMap = new HashMap<>(); } private Object set(String propName, Object value) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareCollection.java b/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareCollection.java index 1455815bf..308e6118b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareCollection.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareCollection.java @@ -66,7 +66,7 @@ public class ModifyAwareCollection implements Collection { } public Iterator iterator() { - return new ModifyAwareIterator(owner, c.iterator()); + return new ModifyAwareIterator<>(owner, c.iterator()); } public boolean remove(Object o) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareList.java b/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareList.java index 2e17c0c66..7dd01366f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareList.java @@ -61,7 +61,7 @@ public class ModifyAwareList implements List, ModifyAwareOwner { @Override public Iterator iterator() { - return new ModifyAwareIterator(owner, list.iterator()); + return new ModifyAwareIterator<>(owner, list.iterator()); } @Override @@ -157,17 +157,17 @@ public class ModifyAwareList implements List, ModifyAwareOwner { @Override public ListIterator listIterator() { - return new ModifyAwareListIterator(owner, list.listIterator()); + return new ModifyAwareListIterator<>(owner, list.listIterator()); } @Override public ListIterator listIterator(int index) { - return new ModifyAwareListIterator(owner, list.listIterator(index)); + return new ModifyAwareListIterator<>(owner, list.listIterator(index)); } @Override public List subList(int fromIndex, int toIndex) { - return new ModifyAwareList(owner, list.subList(fromIndex, toIndex)); + return new ModifyAwareList<>(owner, list.subList(fromIndex, toIndex)); } /** @@ -175,8 +175,8 @@ public class ModifyAwareList implements List, ModifyAwareOwner { */ public ModifyAwareSet asSet() { - LinkedHashSet set = new LinkedHashSet(); + LinkedHashSet set = new LinkedHashSet<>(); set.addAll(list); - return new ModifyAwareSet(owner, set); + return new ModifyAwareSet<>(owner, set); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareMap.java b/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareMap.java index 724dde7e7..36693628a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareMap.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareMap.java @@ -102,17 +102,17 @@ public class ModifyAwareMap implements Map, ModifyAwareOwner { @Override public Set keySet() { - return new ModifyAwareSet(this, map.keySet()); + return new ModifyAwareSet<>(this, map.keySet()); } @Override public Collection values() { - return new ModifyAwareCollection(this, map.values()); + return new ModifyAwareCollection<>(this, map.values()); } @Override public Set> entrySet() { - return new ModifyAwareSet>(this, map.entrySet()); + return new ModifyAwareSet<>(this, map.entrySet()); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java index ca232e718..1712c6dfe 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeEnumStandard.java @@ -46,7 +46,7 @@ public class ScalarTypeEnumStandard { @Override public Set getDbCheckConstraintValues() { - LinkedHashSet values = new LinkedHashSet(); + LinkedHashSet values = new LinkedHashSet<>(); Object[] ea = enumType.getEnumConstants(); for (int i = 0; i < ea.length; i++) { @@ -129,7 +129,7 @@ public class ScalarTypeEnumStandard { @Override public Set getDbCheckConstraintValues() { - LinkedHashSet values = new LinkedHashSet(); + LinkedHashSet values = new LinkedHashSet<>(); for (int i = 0; i < enumArray.length; i++) { Enum e = (Enum) enumArray[i]; values.add(Integer.toString(e.ordinal())); diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/reflect/ImmutableMetaFactory.java b/src/main/java/com/avaje/ebeaninternal/server/type/reflect/ImmutableMetaFactory.java index 096e5341f..738a8dd19 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/reflect/ImmutableMetaFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/reflect/ImmutableMetaFactory.java @@ -20,7 +20,7 @@ public class ImmutableMetaFactory { ScoreConstructor[] scoreConstructors = scoreConstructors(cls); - ArrayList errors = new ArrayList(); + ArrayList errors = new ArrayList<>(); // search the constructors in score order ... // ... we need to find a set of readers for each @@ -111,7 +111,7 @@ public class ImmutableMetaFactory { } // filter out any constructors with less parameters than the max - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for (int i = 0; i < score.length; i++) { if (score[i].getParamCount() == maxParamCount) { list.add(score[i]); @@ -207,7 +207,7 @@ public class ImmutableMetaFactory { if (parameterTypes.length < 2) { return false; } - HashSet> set = new HashSet>(); + HashSet> set = new HashSet<>(); for (int i = 0; i < parameterTypes.length; i++) { if (!set.add(parameterTypes[i])) { return true; diff --git a/src/main/java/com/avaje/ebeaninternal/server/util/ArrayStack.java b/src/main/java/com/avaje/ebeaninternal/server/util/ArrayStack.java index 42761dabf..0be14e20d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/util/ArrayStack.java +++ b/src/main/java/com/avaje/ebeaninternal/server/util/ArrayStack.java @@ -16,14 +16,14 @@ public class ArrayStack { * Creates an empty Stack with an initial size. */ public ArrayStack(int size) { - this.list = new ArrayList(size); + this.list = new ArrayList<>(size); } /** * Creates an empty Stack. */ public ArrayStack() { - this.list = new ArrayList(); + this.list = new ArrayList<>(); } public String toString() { diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEbean.java b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEbean.java index b0fb313b2..6ec91de9a 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEbean.java +++ b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEbean.java @@ -63,7 +63,7 @@ public class XmEbean { */ public List getEntity() { if (entity == null) { - entity = new ArrayList(); + entity = new ArrayList<>(); } return this.entity; } diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEntity.java b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEntity.java index 6d2a26f54..5092f3cc4 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEntity.java +++ b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEntity.java @@ -71,7 +71,7 @@ public class XmEntity { */ public List getNamedQuery() { if (namedQuery == null) { - namedQuery = new ArrayList(); + namedQuery = new ArrayList<>(); } return this.namedQuery; } @@ -100,7 +100,7 @@ public class XmEntity { */ public List getRawSql() { if (rawSql == null) { - rawSql = new ArrayList(); + rawSql = new ArrayList<>(); } return this.rawSql; } diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmRawSql.java b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmRawSql.java index ec79bdb66..e042d0965 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmRawSql.java +++ b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmRawSql.java @@ -75,7 +75,7 @@ public class XmRawSql { */ public List getAliasMapping() { if (aliasMapping == null) { - aliasMapping = new ArrayList(); + aliasMapping = new ArrayList<>(); } return this.aliasMapping; } @@ -104,7 +104,7 @@ public class XmRawSql { */ public List getColumnMapping() { if (columnMapping == null) { - columnMapping = new ArrayList(); + columnMapping = new ArrayList<>(); } return this.columnMapping; } diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdates.java b/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdates.java index cf64d524e..9c5668ce6 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdates.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/api/DocStoreUpdates.java @@ -15,22 +15,22 @@ public class DocStoreUpdates { /** * Persist inserts and updates. */ - private final List persistEvents = new ArrayList(); + private final List persistEvents = new ArrayList<>(); /** * Delete by Id. */ - private final List deleteEvents = new ArrayList(); + private final List deleteEvents = new ArrayList<>(); /** * Nested updates. */ - private final List nestedEvents = new ArrayList(); + private final List nestedEvents = new ArrayList<>(); /** * Entries sent to the queue for later processing. */ - private final List queueEntries = new ArrayList(); + private final List queueEntries = new ArrayList<>(); public DocStoreUpdates() { } diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java index 0407befec..3b17dc39b 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java @@ -83,7 +83,7 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< * List of embedded paths from other documents that include this document type. * As such an update to this doc type means that those embedded documents need to be updated. */ - protected final List embeddedInvalidation = new ArrayList(); + protected final List embeddedInvalidation = new ArrayList<>(); protected final PathProperties pathProps; @@ -216,7 +216,7 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< * Return the property names as property index positions. */ protected int[] getPropertyPositions(Set properties) { - List posList = new ArrayList(); + List posList = new ArrayList<>(); for (String property : properties) { BeanProperty prop = desc.getBeanProperty(property); if (prop != null) { diff --git a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStructure.java b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStructure.java index eb4866bb9..4903c50a4 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStructure.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/api/support/DocStructure.java @@ -22,9 +22,9 @@ public class DocStructure { /** * The embedded document structures by path. */ - private final Map embedded = new HashMap(); + private final Map embedded = new HashMap<>(); - private final Map manyRoot = new HashMap(); + private final Map manyRoot = new HashMap<>(); /** * Create given an initial deployment doc mapping. diff --git a/src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreFactory.java b/src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreFactory.java index 41547ff11..963ef0642 100644 --- a/src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreFactory.java +++ b/src/main/java/com/avaje/ebeanservice/docstore/none/NoneDocStoreFactory.java @@ -21,7 +21,7 @@ public class NoneDocStoreFactory implements DocStoreFactory { @Override public DocStoreBeanAdapter createAdapter(BeanDescriptor desc, DeployBeanDescriptor deploy) { - return new NoneDocStoreBeanAdapter(desc, deploy); + return new NoneDocStoreBeanAdapter<>(desc, deploy); } static class NoneIntegration implements DocStoreIntegration { diff --git a/src/test/java/com/avaje/ebean/EbeanServer_deleteAllByIdTest.java b/src/test/java/com/avaje/ebean/EbeanServer_deleteAllByIdTest.java index 0e3f48ebd..ef83795cc 100644 --- a/src/test/java/com/avaje/ebean/EbeanServer_deleteAllByIdTest.java +++ b/src/test/java/com/avaje/ebean/EbeanServer_deleteAllByIdTest.java @@ -18,7 +18,7 @@ public class EbeanServer_deleteAllByIdTest { List someBeans = beans(3); Ebean.saveAll(someBeans); - List ids = new ArrayList(); + List ids = new ArrayList<>(); for (EBasicVer someBean : someBeans) { ids.add(someBean.getId()); } @@ -38,7 +38,7 @@ public class EbeanServer_deleteAllByIdTest { List someBeans = beans(3); Ebean.saveAll(someBeans); - List ids = new ArrayList(); + List ids = new ArrayList<>(); for (EBasicVer someBean : someBeans) { ids.add(someBean.getId()); } @@ -64,7 +64,7 @@ public class EbeanServer_deleteAllByIdTest { List someBeans = beans(3); Ebean.saveAll(someBeans); - List ids = new ArrayList(); + List ids = new ArrayList<>(); for (EBasicVer someBean : someBeans) { ids.add(someBean.getId()); } @@ -85,7 +85,7 @@ public class EbeanServer_deleteAllByIdTest { List someBeans = beans(3); Ebean.saveAll(someBeans); - List ids = new ArrayList(); + List ids = new ArrayList<>(); for (EBasicVer someBean : someBeans) { ids.add(someBean.getId()); } @@ -106,7 +106,7 @@ public class EbeanServer_deleteAllByIdTest { } private List beans(int count) { - List beans = new ArrayList(); + List beans = new ArrayList<>(); for (int i = 0; i < count; i++) { beans.add(bean("foo" + i)); } diff --git a/src/test/java/com/avaje/ebean/EbeanServer_refresh.java b/src/test/java/com/avaje/ebean/EbeanServer_refresh.java index 35f9deb1d..19306f73d 100644 --- a/src/test/java/com/avaje/ebean/EbeanServer_refresh.java +++ b/src/test/java/com/avaje/ebean/EbeanServer_refresh.java @@ -52,7 +52,7 @@ public class EbeanServer_refresh { Order order = Ebean.find(Order.class, 1); order.getCustomer().getName(); - order.setDetails(new ArrayList()); + order.setDetails(new ArrayList<>()); Ebean.refresh(order); } diff --git a/src/test/java/com/avaje/ebean/EbeanServer_saveAllTest.java b/src/test/java/com/avaje/ebean/EbeanServer_saveAllTest.java index 4cdedd009..4bf49df0a 100644 --- a/src/test/java/com/avaje/ebean/EbeanServer_saveAllTest.java +++ b/src/test/java/com/avaje/ebean/EbeanServer_saveAllTest.java @@ -115,7 +115,7 @@ public class EbeanServer_saveAllTest extends BaseTestCase { private List beans(int count) { - List beans = new ArrayList(); + List beans = new ArrayList<>(); for (int i = 0; i events = new ArrayList(); + List events = new ArrayList<>(); @Override public void propertyChange(PropertyChangeEvent evt) { diff --git a/src/test/java/com/avaje/ebean/bean/EntityBeanInterceptTest.java b/src/test/java/com/avaje/ebean/bean/EntityBeanInterceptTest.java index 9a813451c..c4db21e0b 100644 --- a/src/test/java/com/avaje/ebean/bean/EntityBeanInterceptTest.java +++ b/src/test/java/com/avaje/ebean/bean/EntityBeanInterceptTest.java @@ -26,7 +26,7 @@ public class EntityBeanInterceptTest extends BaseTestCase { List list = Ebean.find(Customer.class).findList(); - Set propertyNames = new HashSet(); + Set propertyNames = new HashSet<>(); propertyNames.add("name"); propertyNames.add("status"); diff --git a/src/test/java/com/avaje/ebean/common/BeanListTest.java b/src/test/java/com/avaje/ebean/common/BeanListTest.java index a9c036322..712c5b7ad 100644 --- a/src/test/java/com/avaje/ebean/common/BeanListTest.java +++ b/src/test/java/com/avaje/ebean/common/BeanListTest.java @@ -18,7 +18,7 @@ public class BeanListTest { @NotNull private List all() { - List all = new ArrayList(); + List all = new ArrayList<>(); all.add(object1); all.add(object2); all.add(object3); @@ -27,7 +27,7 @@ public class BeanListTest { @NotNull private List some() { - List some = new ArrayList(); + List some = new ArrayList<>(); some.add(object2); some.add(object3); return some; @@ -36,7 +36,7 @@ public class BeanListTest { @Test public void testAdd() throws Exception { - BeanList list = new BeanList(); + BeanList list = new BeanList<>(); list.setModifyListening(BeanCollection.ModifyListenMode.ALL); list.add(object1); @@ -57,7 +57,7 @@ public class BeanListTest { @Test public void testAddAll_given_emptyStart() throws Exception { - BeanList list = new BeanList(); + BeanList list = new BeanList<>(); list.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -70,7 +70,7 @@ public class BeanListTest { @Test public void testAdd_given_someAlreadyIn() throws Exception { - BeanList list = new BeanList(some()); + BeanList list = new BeanList<>(some()); list.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -86,7 +86,7 @@ public class BeanListTest { @Test public void testAddSome_given_someAlreadyIn() throws Exception { - BeanList list = new BeanList(some()); + BeanList list = new BeanList<>(some()); list.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -99,7 +99,7 @@ public class BeanListTest { @Test public void testRemove_given_beansInAdditions() throws Exception { - BeanList list = new BeanList(); + BeanList list = new BeanList<>(); list.setModifyListening(BeanCollection.ModifyListenMode.ALL); list.addAll(all()); assertThat(list.getModifyAdditions()).containsExactly(object1, object2, object3); @@ -115,7 +115,7 @@ public class BeanListTest { @Test public void testRemoveAll_given_beansInAdditions() throws Exception { - BeanList list = new BeanList(); + BeanList list = new BeanList<>(); list.setModifyListening(BeanCollection.ModifyListenMode.ALL); list.addAll(all()); assertThat(list.getModifyAdditions()).containsExactly(object1, object2, object3); @@ -130,7 +130,7 @@ public class BeanListTest { @Test public void testRemove_given_beansNotInAdditions() throws Exception { - BeanList list = new BeanList(all()); + BeanList list = new BeanList<>(all()); list.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -145,7 +145,7 @@ public class BeanListTest { @Test public void testRemoveAll_given_beansNotInAdditions() throws Exception { - BeanList list = new BeanList(all()); + BeanList list = new BeanList<>(all()); list.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -159,7 +159,7 @@ public class BeanListTest { @Test public void testClear() throws Exception { - BeanList list = new BeanList(all()); + BeanList list = new BeanList<>(all()); list.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -173,7 +173,7 @@ public class BeanListTest { @Test public void testClear_given_someBeansInAdditions() throws Exception { - BeanList list = new BeanList(); + BeanList list = new BeanList<>(); list.add(object1); list.setModifyListening(BeanCollection.ModifyListenMode.ALL); list.add(object2); @@ -190,7 +190,7 @@ public class BeanListTest { @Test public void testRetainAll_given_beansInAdditions() throws Exception { - BeanList list = new BeanList(); + BeanList list = new BeanList<>(); list.setModifyListening(BeanCollection.ModifyListenMode.ALL); list.addAll(all()); assertThat(list.getModifyAdditions()).containsExactly(object1, object2, object3); @@ -205,7 +205,7 @@ public class BeanListTest { @Test public void testRetainAll_given_someBeansInAdditions() throws Exception { - BeanList list = new BeanList(); + BeanList list = new BeanList<>(); list.add(object1); list.add(object2); list.setModifyListening(BeanCollection.ModifyListenMode.ALL); @@ -221,7 +221,7 @@ public class BeanListTest { @Test public void testRetainAll_given_noBeansInAdditions() throws Exception { - BeanList list = new BeanList(all()); + BeanList list = new BeanList<>(all()); list.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act diff --git a/src/test/java/com/avaje/ebean/common/BeanMapTest.java b/src/test/java/com/avaje/ebean/common/BeanMapTest.java index b611887e7..a5683bab8 100644 --- a/src/test/java/com/avaje/ebean/common/BeanMapTest.java +++ b/src/test/java/com/avaje/ebean/common/BeanMapTest.java @@ -18,7 +18,7 @@ public class BeanMapTest { @NotNull private Map all() { - Map all = new LinkedHashMap(); + Map all = new LinkedHashMap<>(); all.put("1", object1); all.put("2", object2); all.put("3", object3); @@ -27,7 +27,7 @@ public class BeanMapTest { @NotNull private Map some() { - Map all = new LinkedHashMap(); + Map all = new LinkedHashMap<>(); all.put("2", object2); all.put("3", object3); return all; @@ -36,7 +36,7 @@ public class BeanMapTest { @Test public void testAdd() throws Exception { - BeanMap map = new BeanMap(); + BeanMap map = new BeanMap<>(); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); map.put("1", object1); map.put("4", null); @@ -59,7 +59,7 @@ public class BeanMapTest { @Test public void testAddAll_given_emptyStart() throws Exception { - BeanMap set = new BeanMap(); + BeanMap set = new BeanMap<>(); set.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -72,7 +72,7 @@ public class BeanMapTest { @Test public void testAdd_given_someAlreadyIn() throws Exception { - BeanMap map = new BeanMap(some()); + BeanMap map = new BeanMap<>(some()); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -88,7 +88,7 @@ public class BeanMapTest { @Test public void testAddSome_given_someAlreadyIn() throws Exception { - BeanMap map = new BeanMap(some()); + BeanMap map = new BeanMap<>(some()); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -101,7 +101,7 @@ public class BeanMapTest { @Test public void testRemove_given_beansInAdditions() throws Exception { - BeanMap map = new BeanMap(); + BeanMap map = new BeanMap<>(); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); map.putAll(all()); assertThat(map.getModifyAdditions()).containsExactly(object1, object2, object3); @@ -117,7 +117,7 @@ public class BeanMapTest { @Test public void testRemoveAll_given_beansInAdditions() throws Exception { - BeanMap map = new BeanMap(); + BeanMap map = new BeanMap<>(); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); map.putAll(all()); assertThat(map.getModifyAdditions()).containsExactly(object1, object2, object3); @@ -133,7 +133,7 @@ public class BeanMapTest { @Test public void testRemove_given_beansNotInAdditions() throws Exception { - BeanMap map = new BeanMap(all()); + BeanMap map = new BeanMap<>(all()); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -148,7 +148,7 @@ public class BeanMapTest { @Test public void testRemoveAll_given_beansNotInAdditions() throws Exception { - BeanMap map = new BeanMap(all()); + BeanMap map = new BeanMap<>(all()); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -163,7 +163,7 @@ public class BeanMapTest { @Test public void testClear() throws Exception { - BeanMap map = new BeanMap(all()); + BeanMap map = new BeanMap<>(all()); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -177,7 +177,7 @@ public class BeanMapTest { @Test public void testClear_given_someBeansInAdditions() throws Exception { - BeanMap map = new BeanMap(); + BeanMap map = new BeanMap<>(); map.put("1",object1); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); map.put("2", object2); diff --git a/src/test/java/com/avaje/ebean/common/BeanSetTest.java b/src/test/java/com/avaje/ebean/common/BeanSetTest.java index 9eddbde9a..3f6432c8a 100644 --- a/src/test/java/com/avaje/ebean/common/BeanSetTest.java +++ b/src/test/java/com/avaje/ebean/common/BeanSetTest.java @@ -18,7 +18,7 @@ public class BeanSetTest { @NotNull private Set all() { - Set all = new LinkedHashSet(); + Set all = new LinkedHashSet<>(); all.add(object1); all.add(object2); all.add(object3); @@ -27,7 +27,7 @@ public class BeanSetTest { @NotNull private Set some() { - Set some = new LinkedHashSet(); + Set some = new LinkedHashSet<>(); some.add(object2); some.add(object3); return some; @@ -36,7 +36,7 @@ public class BeanSetTest { @Test public void testAdd() throws Exception { - BeanSet set = new BeanSet(); + BeanSet set = new BeanSet<>(); set.setModifyListening(BeanCollection.ModifyListenMode.ALL); set.add(object1); @@ -57,7 +57,7 @@ public class BeanSetTest { @Test public void testAddAll_given_emptyStart() throws Exception { - BeanSet set = new BeanSet(); + BeanSet set = new BeanSet<>(); set.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -70,7 +70,7 @@ public class BeanSetTest { @Test public void testAdd_given_someAlreadyIn() throws Exception { - BeanSet set = new BeanSet(some()); + BeanSet set = new BeanSet<>(some()); set.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -86,7 +86,7 @@ public class BeanSetTest { @Test public void testAddSome_given_someAlreadyIn() throws Exception { - BeanSet set = new BeanSet(some()); + BeanSet set = new BeanSet<>(some()); set.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -99,7 +99,7 @@ public class BeanSetTest { @Test public void testRemove_given_beansInAdditions() throws Exception { - BeanSet set = new BeanSet(); + BeanSet set = new BeanSet<>(); set.setModifyListening(BeanCollection.ModifyListenMode.ALL); set.addAll(all()); assertThat(set.getModifyAdditions()).containsExactly(object1, object2, object3); @@ -115,7 +115,7 @@ public class BeanSetTest { @Test public void testRemoveAll_given_beansInAdditions() throws Exception { - BeanSet set = new BeanSet(); + BeanSet set = new BeanSet<>(); set.setModifyListening(BeanCollection.ModifyListenMode.ALL); set.addAll(all()); assertThat(set.getModifyAdditions()).containsExactly(object1, object2, object3); @@ -130,7 +130,7 @@ public class BeanSetTest { @Test public void testRemove_given_beansNotInAdditions() throws Exception { - BeanSet set = new BeanSet(all()); + BeanSet set = new BeanSet<>(all()); set.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -145,7 +145,7 @@ public class BeanSetTest { @Test public void testRemoveAll_given_beansNotInAdditions() throws Exception { - BeanSet set = new BeanSet(all()); + BeanSet set = new BeanSet<>(all()); set.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -159,7 +159,7 @@ public class BeanSetTest { @Test public void testClear() throws Exception { - BeanSet set = new BeanSet(all()); + BeanSet set = new BeanSet<>(all()); set.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -173,7 +173,7 @@ public class BeanSetTest { @Test public void testClear_given_someBeansInAdditions() throws Exception { - BeanSet set = new BeanSet(); + BeanSet set = new BeanSet<>(); set.add(object1); set.setModifyListening(BeanCollection.ModifyListenMode.ALL); set.add(object2); @@ -190,7 +190,7 @@ public class BeanSetTest { @Test public void testRetainAll_given_beansInAdditions() throws Exception { - BeanSet set = new BeanSet(); + BeanSet set = new BeanSet<>(); set.setModifyListening(BeanCollection.ModifyListenMode.ALL); set.addAll(all()); assertThat(set.getModifyAdditions()).containsExactly(object1, object2, object3); @@ -205,7 +205,7 @@ public class BeanSetTest { @Test public void testRetainAll_given_someBeansInAdditions() throws Exception { - BeanSet set = new BeanSet(); + BeanSet set = new BeanSet<>(); set.add(object1); set.add(object2); set.setModifyListening(BeanCollection.ModifyListenMode.ALL); @@ -221,7 +221,7 @@ public class BeanSetTest { @Test public void testRetainAll_given_noBeansInAdditions() throws Exception { - BeanSet set = new BeanSet(all()); + BeanSet set = new BeanSet<>(all()); set.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/MigrationVersionTest.java b/src/test/java/com/avaje/ebean/dbmigration/model/MigrationVersionTest.java index 6d02dfe57..1ce65cd6e 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/MigrationVersionTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/model/MigrationVersionTest.java @@ -14,7 +14,7 @@ public class MigrationVersionTest { @Test public void sort() { - List list= new ArrayList(); + List list= new ArrayList<>(); list.add(MigrationVersion.parse("1.1__point")); list.add(MigrationVersion.parse("3.0__three")); list.add(MigrationVersion.parse("1.0__init")); diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/PendingDropsTest.java b/src/test/java/com/avaje/ebean/dbmigration/model/PendingDropsTest.java index 3411fcc86..f0762a9fe 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/PendingDropsTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/model/PendingDropsTest.java @@ -211,7 +211,7 @@ public class PendingDropsTest { class TDModelContainer extends ModelContainer { - List drops = new ArrayList(); + List drops = new ArrayList<>(); @Override public void registerPendingHistoryDropColumns(ChangeSet changeSet) { diff --git a/src/test/java/com/avaje/ebean/event/BeanFindControllerTest.java b/src/test/java/com/avaje/ebean/event/BeanFindControllerTest.java index 7476b7c22..2128c8b2a 100644 --- a/src/test/java/com/avaje/ebean/event/BeanFindControllerTest.java +++ b/src/test/java/com/avaje/ebean/event/BeanFindControllerTest.java @@ -106,7 +106,7 @@ public class BeanFindControllerTest extends BaseTestCase { @Override public BeanCollection findMany(BeanQueryRequest request) { - BeanList list = new BeanList(); + BeanList list = new BeanList<>(); list.add((T)createBean()); return list; } diff --git a/src/test/java/com/avaje/ebean/event/BeanPersistControllerTest.java b/src/test/java/com/avaje/ebean/event/BeanPersistControllerTest.java index 5aba15b8a..761634eb5 100644 --- a/src/test/java/com/avaje/ebean/event/BeanPersistControllerTest.java +++ b/src/test/java/com/avaje/ebean/event/BeanPersistControllerTest.java @@ -90,7 +90,7 @@ public class BeanPersistControllerTest { boolean continueDefaultPersisting; - List methodsCalled = new ArrayList(); + List methodsCalled = new ArrayList<>(); /** * No default constructor so only registered manually. diff --git a/src/test/java/com/avaje/ebean/event/BeanPostLoadTest.java b/src/test/java/com/avaje/ebean/event/BeanPostLoadTest.java index 1e782cc67..1dabfa7d1 100644 --- a/src/test/java/com/avaje/ebean/event/BeanPostLoadTest.java +++ b/src/test/java/com/avaje/ebean/event/BeanPostLoadTest.java @@ -69,7 +69,7 @@ public class BeanPostLoadTest extends BaseTestCase { boolean dummy; - List methodsCalled = new ArrayList(); + List methodsCalled = new ArrayList<>(); Object bean; diff --git a/src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java b/src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java index dc7eec116..8d48f7f84 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java @@ -29,7 +29,7 @@ public class CachedBeanDataSerializeTest extends BaseTestCase { @Test public void write() throws IOException, ClassNotFoundException { - Map map = new LinkedHashMap(); + Map map = new LinkedHashMap<>(); map.put("name", "rob"); map.put("some", "thing"); map.put("whenCreated", ""+System.currentTimeMillis()); diff --git a/src/test/java/com/avaje/ebeaninternal/server/changelog/Helper.java b/src/test/java/com/avaje/ebeaninternal/server/changelog/Helper.java index 25d7196c1..bad5f5920 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/changelog/Helper.java +++ b/src/test/java/com/avaje/ebeaninternal/server/changelog/Helper.java @@ -37,7 +37,7 @@ public class Helper { @NotNull private BeanChange createInsert(long startId) { - Map values = new LinkedHashMap(); + Map values = new LinkedHashMap<>(); values.put("name", new ValuePair("rob", null)); values.put("modified", new ValuePair(new Timestamp(System.currentTimeMillis()), null)); @@ -48,7 +48,7 @@ public class Helper { @NotNull private BeanChange createUpdate(long startId) { - Map values = new LinkedHashMap(); + Map values = new LinkedHashMap<>(); values.put("name", new ValuePair("jim", "steve")); values.put("nowHasVal", new ValuePair("wasNull", null)); values.put("nowNull", new ValuePair(null, "hadVal")); @@ -62,7 +62,7 @@ public class Helper { @NotNull private BeanChange createDelete(long startId) { - return new BeanChange("mytable", startId+3, ChangeType.DELETE, new HashMap()); + return new BeanChange("mytable", startId+3, ChangeType.DELETE, new HashMap<>()); } } diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java index 3846b23e9..faf9f50ac 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java @@ -29,7 +29,7 @@ public class BeanPropertyAssocManyTest extends BaseTestCase { public void createReferenceIfNull_when_notBeanCollection_expect_null() { Customer customer = new Customer(); - customer.setContacts(new ArrayList()); + customer.setContacts(new ArrayList<>()); BeanCollection ref = contacts().createReferenceIfNull((EntityBean) customer); assertNull(ref); @@ -52,7 +52,7 @@ public class BeanPropertyAssocManyTest extends BaseTestCase { ResetBasicData.reset(); - List customerIds = new ArrayList(); + List customerIds = new ArrayList<>(); customerIds.add(1L); customerIds.add(2L); diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java b/src/test/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java index 6539d0aae..c2a2dfa7a 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java +++ b/src/test/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java @@ -12,7 +12,7 @@ public class DeployPropertyParserMapTests { public void test_like_escape() { - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("customer.name", "t1.name"); map.put("id", "t0.id"); diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpressionTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpressionTest.java index 619519225..9321e9811 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpressionTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpressionTest.java @@ -95,21 +95,21 @@ public class AllEqualsExpressionTest { } AllEqualsExpression exp(String key0, Object val1) { - LinkedHashMap map = new LinkedHashMap(); + LinkedHashMap map = new LinkedHashMap<>(); map.put(key0, val1); return exp(map); } AllEqualsExpression exp(String key0, Object val1, String key2, Object val2) { - LinkedHashMap map = new LinkedHashMap(); + LinkedHashMap map = new LinkedHashMap<>(); map.put(key0, val1); map.put(key2, val2); return exp(map); } AllEqualsExpression exp(String key0, Object val1, String key2, Object val2, String key3, Object val3) { - LinkedHashMap map = new LinkedHashMap(); + LinkedHashMap map = new LinkedHashMap<>(); map.put(key0, val1); map.put(key2, val2); map.put(key3, val3); diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpressionTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpressionTest.java index a0f637028..934dfb00a 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpressionTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpressionTest.java @@ -94,7 +94,7 @@ public class DefaultExampleExpressionTest extends BaseTestCase { } private OrmQueryRequest create(SpiQuery query) { - return new OrmQueryRequest(null, null, query, null); + return new OrmQueryRequest<>(null, null, query, null); } @Test diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionListTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionListTest.java index 14e095c6c..eb848e91f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionListTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionListTest.java @@ -10,7 +10,7 @@ public class DefaultExpressionListTest { DefaultExpressionList exp() { - return new DefaultExpressionList(null, new DefaultExpressionFactory(true, true), null); + return new DefaultExpressionList<>(null, new DefaultExpressionFactory(true, true), null); } DefaultExpressionList spi(ExpressionList list) { diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/JunctionExpressionTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/JunctionExpressionTest.java index fcd789555..d9d2052ea 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/JunctionExpressionTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/JunctionExpressionTest.java @@ -16,7 +16,7 @@ public class JunctionExpressionTest { DefaultExpressionList exp(Expression... expressions) { - DefaultExpressionList list = new DefaultExpressionList(null, new DefaultExpressionFactory(true, false), null); + DefaultExpressionList list = new DefaultExpressionList<>(null, new DefaultExpressionFactory(true, false), null); for (Expression ex : expressions) { list.add(ex); } @@ -24,11 +24,11 @@ public class JunctionExpressionTest { } JunctionExpression and(DefaultExpressionList list) { - return new JunctionExpression(Junction.Type.AND, list); + return new JunctionExpression<>(Junction.Type.AND, list); } JunctionExpression or(DefaultExpressionList list) { - return new JunctionExpression(Junction.Type.OR, list); + return new JunctionExpression<>(Junction.Type.OR, list); } @Test diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/TDSpiExpressionRequest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/TDSpiExpressionRequest.java index 33f1f207d..52aa9c185 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/TDSpiExpressionRequest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/TDSpiExpressionRequest.java @@ -13,7 +13,7 @@ import java.util.List; */ public class TDSpiExpressionRequest implements SpiExpressionRequest { - List bindValues = new ArrayList(); + List bindValues = new ArrayList<>(); final BeanDescriptor descriptor; diff --git a/src/test/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedListTest.java b/src/test/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedListTest.java index 47ebf44b7..23165829e 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedListTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedListTest.java @@ -88,7 +88,7 @@ public class LimitOffsetPagedListTest { } private LimitOffsetPagedList limitQuery(SpiQuery query) { - return new LimitOffsetPagedList(server, query); + return new LimitOffsetPagedList<>(server, query); } private SpiQuery queryWith(int first, int max) { diff --git a/src/test/java/com/avaje/ebeaninternal/server/query/OrderVersionDescTest.java b/src/test/java/com/avaje/ebeaninternal/server/query/OrderVersionDescTest.java index b13e255b9..6eeae26ba 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/query/OrderVersionDescTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/query/OrderVersionDescTest.java @@ -23,7 +23,7 @@ public class OrderVersionDescTest { Version at200 = at(200); Version at300 = at(300); - List> versions = new ArrayList>(); + List> versions = new ArrayList<>(); versions.add(at200); versions.add(atNull); versions.add(at300); diff --git a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java b/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java index 7af9dfd88..9f8676f3a 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java @@ -118,7 +118,7 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest { @Test public void equals_when_diffOrderByNull() { - OrderBy o1 = new OrderBy("id"); + OrderBy o1 = new OrderBy<>("id"); OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, SpiQuery.Type.BEAN, null, 0, 0, false, o1, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, false, null, null, null); OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, SpiQuery.Type.BEAN, null, 0, 0, false, null, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, false, null, null, null); @@ -128,8 +128,8 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest { @Test public void equals_when_orderBySame() { - OrderBy o1 = new OrderBy("id, name"); - OrderBy o2 = new OrderBy("id, name"); + OrderBy o1 = new OrderBy<>("id, name"); + OrderBy o2 = new OrderBy<>("id, name"); OrmQueryPlanKey key1 = new OrmQueryPlanKey(null, SpiQuery.Type.BEAN, null, 0, 0, false, o1, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, false, null, null, null); OrmQueryPlanKey key2 = new OrmQueryPlanKey(null, SpiQuery.Type.BEAN, null, 0, 0, false, o2, false, false, null, null, null, null, null, SpiQuery.TemporalMode.CURRENT, false, null, null, null); diff --git a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java b/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java index 8e50cc033..d1233fe6f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java @@ -22,7 +22,7 @@ public class OrmQueryPropertiesTest { @Test public void construct_with_propertySet_when_empty() { - OrmQueryProperties p1 = new OrmQueryProperties(null, new LinkedHashSet()); + OrmQueryProperties p1 = new OrmQueryProperties(null, new LinkedHashSet<>()); assertThat(p1.getProperties()).isEqualTo(""); assertThat(p1.allProperties()).isFalse(); } @@ -30,7 +30,7 @@ public class OrmQueryPropertiesTest { @Test public void construct_with_propertySet_when_one() { - LinkedHashSet set = new LinkedHashSet(); + LinkedHashSet set = new LinkedHashSet<>(); set.add("name"); OrmQueryProperties p1 = new OrmQueryProperties(null, set); @@ -41,7 +41,7 @@ public class OrmQueryPropertiesTest { @Test public void construct_with_propertySet_when_some() { - LinkedHashSet set = new LinkedHashSet(); + LinkedHashSet set = new LinkedHashSet<>(); set.add("id"); set.add("name"); set.add("startDate"); diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareListTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareListTest.java index 6dd619067..dea108068 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareListTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareListTest.java @@ -12,10 +12,10 @@ public class ModifyAwareListTest { private ModifyAwareList createList() { ArrayList list = new ArrayList(); list.addAll(Arrays.asList("A","B","C","D","E")); - return new ModifyAwareList(list); + return new ModifyAwareList<>(list); } private ModifyAwareList createEmptyList() { - return new ModifyAwareList(new ArrayList()); + return new ModifyAwareList<>(new ArrayList<>()); } @Test diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareMapTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareMapTest.java index 1f9a09b12..a50997680 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareMapTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareMapTest.java @@ -9,18 +9,18 @@ import static org.junit.Assert.*; public class ModifyAwareMapTest { private ModifyAwareMap createMap() { - LinkedHashMap map = new LinkedHashMap(); + LinkedHashMap map = new LinkedHashMap<>(); map.put("A", "one"); map.put("B", "two"); map.put("C", "three"); map.put("D", "four"); map.put("E", "five"); - return new ModifyAwareMap(map); + return new ModifyAwareMap<>(map); } private ModifyAwareMap createEmptyMap() { - LinkedHashMap map = new LinkedHashMap(); - return new ModifyAwareMap(map); + LinkedHashMap map = new LinkedHashMap<>(); + return new ModifyAwareMap<>(map); } @Test @@ -115,7 +115,7 @@ public class ModifyAwareMapTest { ModifyAwareMap map = createMap(); assertFalse(map.isMarkedDirty()); - Map other = new HashMap(); + Map other = new HashMap<>(); map.putAll(other); assertTrue(map.isMarkedDirty()); } @@ -126,7 +126,7 @@ public class ModifyAwareMapTest { ModifyAwareMap map = createMap(); assertFalse(map.isMarkedDirty()); - Map other = new HashMap(); + Map other = new HashMap<>(); other.put("A", "one"); map.putAll(other); assertTrue(map.isMarkedDirty()); diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDayTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDayTest.java index 8f69584e3..1b3c05fc8 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDayTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDayTest.java @@ -64,7 +64,7 @@ public class ScalarTypeMonthDayTest { public void testJson() throws Exception { MonthDay value = MonthDay.of(4, 29); - JsonTester jsonTester = new JsonTester(type); + JsonTester jsonTester = new JsonTester<>(type); jsonTester.test(value); } diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java index 1cc7fdefc..9a52898aa 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java @@ -34,10 +34,10 @@ public class ScalarTypePostgresHstoreTest { @Test public void testIsDirty() throws Exception { - Map emptyMap = new HashMap(); + Map emptyMap = new HashMap<>(); assertTrue(hstore.isDirty(emptyMap)); - ModifyAwareMap modAware = new ModifyAwareMap(emptyMap); + ModifyAwareMap modAware = new ModifyAwareMap<>(emptyMap); assertFalse(hstore.isDirty(modAware)); modAware.put("foo", "Rob"); assertTrue(hstore.isDirty(emptyMap)); @@ -62,7 +62,7 @@ public class ScalarTypePostgresHstoreTest { @Test public void testJsonWrite() throws Exception { - Map map = new LinkedHashMap(); + Map map = new LinkedHashMap<>(); assertEquals("{\"key\":{}}", generateJson(map)); diff --git a/src/test/java/com/avaje/ebeaninternal/server/util/ArrayStackTest.java b/src/test/java/com/avaje/ebeaninternal/server/util/ArrayStackTest.java index e794b72b2..9ca1e943a 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/util/ArrayStackTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/util/ArrayStackTest.java @@ -12,7 +12,7 @@ public class ArrayStackTest { @Test public void testPushPop() throws Exception { - ArrayStack stack = new ArrayStack(); + ArrayStack stack = new ArrayStack<>(); stack.push("1"); stack.push("2"); stack.push("3"); @@ -25,7 +25,7 @@ public class ArrayStackTest { @Test public void testPushPop_given_stackInitialSizeExceeded() throws Exception { - ArrayStack stack = new ArrayStack(2); + ArrayStack stack = new ArrayStack<>(2); stack.push("1"); stack.push("2"); stack.push("3"); @@ -38,14 +38,14 @@ public class ArrayStackTest { @Test(expected = EmptyStackException.class) public void testPop_given_emptyStack_throws() throws Exception { - ArrayStack stack = new ArrayStack(); + ArrayStack stack = new ArrayStack<>(); stack.pop(); } @Test(expected = EmptyStackException.class) public void testPeek_given_empty_throws() throws Exception { - ArrayStack stack = new ArrayStack(); + ArrayStack stack = new ArrayStack<>(); assertThat(stack.peek()); } @@ -53,7 +53,7 @@ public class ArrayStackTest { @Test public void testPeek_given_notEmpty() throws Exception { - ArrayStack stack = new ArrayStack(); + ArrayStack stack = new ArrayStack<>(); stack.push("1"); assertThat(stack.peek()).isEqualTo("1"); } @@ -61,7 +61,7 @@ public class ArrayStackTest { @Test public void testPeekWithNull() throws Exception { - ArrayStack stack = new ArrayStack(); + ArrayStack stack = new ArrayStack<>(); assertThat(stack.peekWithNull()).isNull(); @@ -72,7 +72,7 @@ public class ArrayStackTest { @Test public void testIsEmpty() throws Exception { - ArrayStack stack = new ArrayStack(); + ArrayStack stack = new ArrayStack<>(); assertThat(stack.isEmpty()).isTrue(); stack.push("1"); @@ -82,7 +82,7 @@ public class ArrayStackTest { @Test public void testSize() throws Exception { - ArrayStack stack = new ArrayStack(); + ArrayStack stack = new ArrayStack<>(); assertThat(stack.size()).isEqualTo(0); stack.push("1"); @@ -94,7 +94,7 @@ public class ArrayStackTest { @Test public void testContains() throws Exception { - ArrayStack stack = new ArrayStack(); + ArrayStack stack = new ArrayStack<>(); stack.push("1"); assertThat(stack.contains("1")).isTrue(); diff --git a/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java b/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java index 6c7a61d99..090e9b932 100644 --- a/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java +++ b/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java @@ -28,7 +28,7 @@ public class DocStoreBeanBaseAdapterTest extends BaseTestCase { DeployBeanDescriptor deployDesc = (DeployBeanDescriptor)mock(DeployBeanDescriptor.class); - TDAdapter adapter = new TDAdapter(orderDesc, deployDesc); + TDAdapter adapter = new TDAdapter<>(orderDesc, deployDesc); assertThat(adapter.getIndexName()).isEqualTo("order"); assertThat(adapter.getIndexType()).isEqualTo("order"); diff --git a/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java b/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java index 915556868..67128499a 100644 --- a/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java +++ b/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java @@ -38,7 +38,7 @@ public class DocStoreIndexEventTest { when(mock.docStore()).thenReturn(mockDocType); Order bean = new Order(); - DocStoreIndexEvent event = new DocStoreIndexEvent(mock, 42, bean); + DocStoreIndexEvent event = new DocStoreIndexEvent<>(mock, 42, bean); event.docStoreUpdate(null); @@ -51,7 +51,7 @@ public class DocStoreIndexEventTest { Order bean = new Order(); - DocStoreIndexEvent event = new DocStoreIndexEvent(orderType(), 42, bean); + DocStoreIndexEvent event = new DocStoreIndexEvent<>(orderType(), 42, bean); DocStoreUpdates updates = new DocStoreUpdates(); event.addToQueue(updates); diff --git a/src/test/java/com/avaje/tests/basic/TestDeleteByIdCollection.java b/src/test/java/com/avaje/tests/basic/TestDeleteByIdCollection.java index a2e46d313..f2e22e346 100644 --- a/src/test/java/com/avaje/tests/basic/TestDeleteByIdCollection.java +++ b/src/test/java/com/avaje/tests/basic/TestDeleteByIdCollection.java @@ -31,7 +31,7 @@ public class TestDeleteByIdCollection extends BaseTestCase { Assert.assertNotNull(c0Back); Assert.assertNotNull(c1Back); - List ids = new ArrayList(); + List ids = new ArrayList<>(); // also test id type conversion ids.add("" + c0.getId()); ids.add("" + c1.getId()); @@ -62,7 +62,7 @@ public class TestDeleteByIdCollection extends BaseTestCase { Assert.assertNotNull(o1Back); - List ids = new ArrayList(); + List ids = new ArrayList<>(); // also test id type conversion ids.add(order0.getId()); ids.add(order1.getId()); diff --git a/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java b/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java index ac56a3e6d..c82aa67ef 100644 --- a/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java +++ b/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java @@ -45,7 +45,7 @@ public class TestM2MVanilla extends BaseTestCase { MUser user = Ebean.find(MUser.class, u0.getUserid()); - List roleList = new ArrayList(); + List roleList = new ArrayList<>(); roleList.add(r1); roleList.add(r2); diff --git a/src/test/java/com/avaje/tests/basic/TestUuidInsertMasterDetail.java b/src/test/java/com/avaje/tests/basic/TestUuidInsertMasterDetail.java index 99069115b..1d11001be 100644 --- a/src/test/java/com/avaje/tests/basic/TestUuidInsertMasterDetail.java +++ b/src/test/java/com/avaje/tests/basic/TestUuidInsertMasterDetail.java @@ -17,7 +17,7 @@ public class TestUuidInsertMasterDetail extends BaseTestCase { UUTwo two = new UUTwo(); two.setName("something"); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(two); UUOne one = new UUOne(); diff --git a/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertSimple.java b/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertSimple.java index 20aec87a8..784958b30 100644 --- a/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertSimple.java +++ b/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertSimple.java @@ -128,7 +128,7 @@ public class TestBatchInsertSimple extends BaseTestCase { int numOfMasters = 3; - List masters = new ArrayList(); + List masters = new ArrayList<>(); for (int i = 0; i < numOfMasters; i++) { masters.add(createMasterAndDetails(i, 7)); } @@ -154,7 +154,7 @@ public class TestBatchInsertSimple extends BaseTestCase { int numOfMasters = 3; - List masters = new ArrayList(); + List masters = new ArrayList<>(); for (int i = 0; i < numOfMasters; i++) { masters.add(createMasterAndDetails(i, 5)); } @@ -177,7 +177,7 @@ public class TestBatchInsertSimple extends BaseTestCase { private UTMaster createMasterAndDetails(int masterPos, int size) { UTMaster master = createMaster(masterPos); - List details = new ArrayList(); + List details = new ArrayList<>(); int count = 2 + random.nextInt(size); diff --git a/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java b/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java index c7cf264d3..5ccb67a97 100644 --- a/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java @@ -28,7 +28,7 @@ public class TestBatchLazyWithCacheHits extends BaseTestCase { @Test public void testOnCacheHit() { - ArrayList inserted = new ArrayList(); + ArrayList inserted = new ArrayList<>(); String[] names = "A,B,C,D,E,F,G,H,I,J".split(","); for (int i = 0; i < names.length; i++) { inserted.add(insert(names[i])); diff --git a/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java b/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java index 6836cdfb4..f02b97796 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java +++ b/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java @@ -257,7 +257,7 @@ public class TestCacheCollectionIds extends BaseTestCase { cachedBean = Ebean.find(OCachedBean.class, cachedBean.getId()); cachedBean.setName("mod"); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(Ebean.find(Country.class, "NZ")); cachedBean.setCountries(list); Ebean.save(cachedBean); diff --git a/src/test/java/com/avaje/tests/compositekeys/TestCKeyIdInExpression.java b/src/test/java/com/avaje/tests/compositekeys/TestCKeyIdInExpression.java index d4f032370..0032314cd 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestCKeyIdInExpression.java +++ b/src/test/java/com/avaje/tests/compositekeys/TestCKeyIdInExpression.java @@ -51,7 +51,7 @@ public class TestCKeyIdInExpression extends BaseTestCase { ROrderPK k2 = new ROrderPK("b", 105); ROrderPK k3 = new ROrderPK("c", 106); - List keys = new ArrayList(); + List keys = new ArrayList<>(); keys.add(k0); keys.add(k1); keys.add(k2); diff --git a/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java b/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java index d07567931..818f9372c 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java +++ b/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java @@ -71,7 +71,7 @@ public class TestCKeyLazyLoad extends BaseTestCase { int size = details.size(); Assert.assertTrue(size > 0); - List idList = new ArrayList(); + List idList = new ArrayList<>(); idList.add(id); idList.add(id2); diff --git a/src/test/java/com/avaje/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/src/test/java/com/avaje/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java index b3d7c718f..5c6b6868d 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/src/test/java/com/avaje/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -67,7 +67,7 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { if (isMsSqlServer()) return; assertEquals(2, Ebean.find(User.class).findList().size()); - List ids = new ArrayList(); + List ids = new ArrayList<>(); ids.add(1L); ids.add(2L); @@ -89,7 +89,7 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { BeanPropertyAssocMany beanProperty = (BeanPropertyAssocMany)beanDescriptor.getBeanProperty("userRoles"); - List ids = new ArrayList(); + List ids = new ArrayList<>(); ids.add(1L); ids.add(2L); diff --git a/src/test/java/com/avaje/tests/draftable/LinkQueryPublishTest.java b/src/test/java/com/avaje/tests/draftable/LinkQueryPublishTest.java index 762068b91..65574a832 100644 --- a/src/test/java/com/avaje/tests/draftable/LinkQueryPublishTest.java +++ b/src/test/java/com/avaje/tests/draftable/LinkQueryPublishTest.java @@ -28,7 +28,7 @@ public class LinkQueryPublishTest { EbeanServer server = Ebean.getDefaultServer(); - List ids = new ArrayList(); + List ids = new ArrayList<>(); ids.add(link1.getId()); ids.add(link2.getId()); ids.add(link3.getId()); diff --git a/src/test/java/com/avaje/tests/enhancement/TestConstructorManyAddAll.java b/src/test/java/com/avaje/tests/enhancement/TestConstructorManyAddAll.java index 8eeea9139..d3288bf67 100644 --- a/src/test/java/com/avaje/tests/enhancement/TestConstructorManyAddAll.java +++ b/src/test/java/com/avaje/tests/enhancement/TestConstructorManyAddAll.java @@ -13,7 +13,7 @@ public class TestConstructorManyAddAll extends BaseTestCase { @Test public void test() { - List startRoles = new ArrayList(); + List startRoles = new ArrayList<>(); MUser mUser = new MUser(startRoles); mUser.getRoles(); } diff --git a/src/test/java/com/avaje/tests/idkeys/TestPropertyChangeSupport.java b/src/test/java/com/avaje/tests/idkeys/TestPropertyChangeSupport.java index 9b5b7911e..eb41bc679 100644 --- a/src/test/java/com/avaje/tests/idkeys/TestPropertyChangeSupport.java +++ b/src/test/java/com/avaje/tests/idkeys/TestPropertyChangeSupport.java @@ -19,7 +19,7 @@ import java.util.List; */ public class TestPropertyChangeSupport extends EbeanTestCase implements PropertyChangeListener { private int nuofEvents = 0; - private List pces = new ArrayList(); + private List pces = new ArrayList<>(); private PropertyChangeEvent lastPce; public void propertyChange(PropertyChangeEvent evt) { diff --git a/src/test/java/com/avaje/tests/insert/TestInsertCollection.java b/src/test/java/com/avaje/tests/insert/TestInsertCollection.java index 40b2fcc61..6ff223931 100644 --- a/src/test/java/com/avaje/tests/insert/TestInsertCollection.java +++ b/src/test/java/com/avaje/tests/insert/TestInsertCollection.java @@ -21,7 +21,7 @@ public class TestInsertCollection extends BaseTestCase { Customer cust2 = new Customer(); cust2.setName("bob"); - List customers = new ArrayList(); + List customers = new ArrayList<>(); customers.add(cust1); customers.add(cust2); @@ -51,7 +51,7 @@ public class TestInsertCollection extends BaseTestCase { Customer cust3 = new Customer(); cust3.setName("mac"); - List saveList = new ArrayList(); + List saveList = new ArrayList<>(); saveList.add(cust1Check2); saveList.add(cust3); @@ -64,7 +64,7 @@ public class TestInsertCollection extends BaseTestCase { Customer cust3Check = Ebean.find(Customer.class, cust3.getId()); Assert.assertEquals("mac", cust3Check.getName()); - List deleteList = new ArrayList(); + List deleteList = new ArrayList<>(); deleteList.add(cust1Check3); deleteList.add(cust3); deleteList.add(cust2Check2); diff --git a/src/test/java/com/avaje/tests/insert/TestInsertOnStringKey.java b/src/test/java/com/avaje/tests/insert/TestInsertOnStringKey.java index 4de60d3dc..16f83ee1b 100644 --- a/src/test/java/com/avaje/tests/insert/TestInsertOnStringKey.java +++ b/src/test/java/com/avaje/tests/insert/TestInsertOnStringKey.java @@ -33,7 +33,7 @@ public class TestInsertOnStringKey extends BaseTestCase { } private List toList(OrderItemEntity orderItemEntity) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(orderItemEntity); return list; } diff --git a/src/test/java/com/avaje/tests/iud/TestCarWheelIud.java b/src/test/java/com/avaje/tests/iud/TestCarWheelIud.java index 392a411a6..69bb66d88 100644 --- a/src/test/java/com/avaje/tests/iud/TestCarWheelIud.java +++ b/src/test/java/com/avaje/tests/iud/TestCarWheelIud.java @@ -37,7 +37,7 @@ public class TestCarWheelIud extends BaseTestCase { w4.setCar(car); w4.setTire(t4); - List wheels = new ArrayList(); + List wheels = new ArrayList<>(); wheels.add(w1); wheels.add(w2); wheels.add(w3); diff --git a/src/test/java/com/avaje/tests/json/TestDbJson_List.java b/src/test/java/com/avaje/tests/json/TestDbJson_List.java index fc96b7f3f..c1496d339 100644 --- a/src/test/java/com/avaje/tests/json/TestDbJson_List.java +++ b/src/test/java/com/avaje/tests/json/TestDbJson_List.java @@ -38,13 +38,13 @@ public class TestDbJson_List extends BaseTestCase { bean.setPlainBean(new PlainBean("plain", 52)); - List beanList = new ArrayList(); + List beanList = new ArrayList<>(); beanList.add(new PlainBean("one", 1)); beanList.add(new PlainBean("two", 2)); bean.setBeanList(beanList); - Set beanSet = new LinkedHashSet(); + Set beanSet = new LinkedHashSet<>(); beanSet.add(new PlainBean("A", 1)); beanSet.add(new PlainBean("B", 2)); bean.setBeanSet(beanSet); diff --git a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyList.java b/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyList.java index 7ea433058..2e6901c58 100644 --- a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyList.java +++ b/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyList.java @@ -20,7 +20,7 @@ public class TestJsonExcludeEmptyList { bean.setId(99); bean.setStatus(null); bean.setOrderDate(null); - bean.setDetails(new ArrayList()); + bean.setDetails(new ArrayList<>()); JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_NULL); @@ -39,7 +39,7 @@ public class TestJsonExcludeEmptyList { bean.setId(99); bean.setStatus(null); bean.setOrderDate(null); - bean.setDetails(new ArrayList()); + bean.setDetails(new ArrayList<>()); JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_EMPTY); diff --git a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyMap.java b/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyMap.java index 1332ffa7a..105d493c8 100644 --- a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyMap.java +++ b/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyMap.java @@ -17,7 +17,7 @@ public class TestJsonExcludeEmptyMap { EBasicJsonMap bean = new EBasicJsonMap(); bean.setId(99L); - bean.setContent(new LinkedHashMap()); + bean.setContent(new LinkedHashMap<>()); JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_NULL); @@ -34,7 +34,7 @@ public class TestJsonExcludeEmptyMap { EBasicJsonMap bean = new EBasicJsonMap(); bean.setId(99L); - bean.setContent(new LinkedHashMap()); + bean.setContent(new LinkedHashMap<>()); JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_EMPTY); diff --git a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptySet.java b/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptySet.java index 2b065a516..bdf677d1f 100644 --- a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptySet.java +++ b/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptySet.java @@ -18,7 +18,7 @@ public class TestJsonExcludeEmptySet { AttributeHolder bean = new AttributeHolder(); bean.setId(99); - bean.setAttributes(new LinkedHashSet()); + bean.setAttributes(new LinkedHashSet<>()); JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_NULL); @@ -35,7 +35,7 @@ public class TestJsonExcludeEmptySet { AttributeHolder bean = new AttributeHolder(); bean.setId(99); - bean.setAttributes(new LinkedHashSet()); + bean.setAttributes(new LinkedHashSet<>()); JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_EMPTY); diff --git a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeTransientEmptyList.java b/src/test/java/com/avaje/tests/json/include/TestJsonExcludeTransientEmptyList.java index 13a8fdc2c..dd3d4713e 100644 --- a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeTransientEmptyList.java +++ b/src/test/java/com/avaje/tests/json/include/TestJsonExcludeTransientEmptyList.java @@ -20,7 +20,7 @@ public class TestJsonExcludeTransientEmptyList { EJsonTransientList bean = new EJsonTransientList(); bean.setId(99L); - bean.setFileNames(new ArrayList()); + bean.setFileNames(new ArrayList<>()); JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_NULL); @@ -37,7 +37,7 @@ public class TestJsonExcludeTransientEmptyList { EJsonTransientList bean = new EJsonTransientList(); bean.setId(99L); - bean.setFileNames(new ArrayList()); + bean.setFileNames(new ArrayList<>()); JsonWriteOptions options = new JsonWriteOptions(); options.setInclude(JsonConfig.Include.NON_EMPTY); diff --git a/src/test/java/com/avaje/tests/json/transientproperties/TestModelAJson.java b/src/test/java/com/avaje/tests/json/transientproperties/TestModelAJson.java index c6dc250af..decf2fba6 100644 --- a/src/test/java/com/avaje/tests/json/transientproperties/TestModelAJson.java +++ b/src/test/java/com/avaje/tests/json/transientproperties/TestModelAJson.java @@ -21,7 +21,7 @@ public class TestModelAJson { b.setOneField(1); b.setTwoField(1); - a.setList(new ArrayList()); + a.setList(new ArrayList<>()); a.getList().add(b); PathProperties pathProperties = PathProperties.parse("(a,list(oneField))"); diff --git a/src/test/java/com/avaje/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java b/src/test/java/com/avaje/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java index 6a74b17ab..ed08702fa 100644 --- a/src/test/java/com/avaje/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java +++ b/src/test/java/com/avaje/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java @@ -32,7 +32,7 @@ public class TestM2MDeleteObjectWithCascadeToM2m extends BaseTestCase { Role role1 = new Role("RoleOne"); role1.setTenant(tenant1); - Set permissions = new HashSet(); + Set permissions = new HashSet<>(); List permsList = Ebean.find(Permission.class).findList(); permissions.addAll(permsList); diff --git a/src/test/java/com/avaje/tests/m2m/TestM2MDeleteWithCascade.java b/src/test/java/com/avaje/tests/m2m/TestM2MDeleteWithCascade.java index 6525886ba..0a5043617 100644 --- a/src/test/java/com/avaje/tests/m2m/TestM2MDeleteWithCascade.java +++ b/src/test/java/com/avaje/tests/m2m/TestM2MDeleteWithCascade.java @@ -36,7 +36,7 @@ public class TestM2MDeleteWithCascade extends BaseTestCase { MUser notThere = Ebean.find(MUser.class, u0.getUserid()); Assert.assertNull("been deleted", notThere); - List roleIds = new ArrayList(); + List roleIds = new ArrayList<>(); Collections.addAll(roleIds, r0.getRoleid(), r1.getRoleid()); int rc = Ebean.find(MRole.class).where().idIn(roleIds).findCount(); diff --git a/src/test/java/com/avaje/tests/m2m/TestM2mDeleteObject.java b/src/test/java/com/avaje/tests/m2m/TestM2mDeleteObject.java index a8cc9179b..eda5da6db 100644 --- a/src/test/java/com/avaje/tests/m2m/TestM2mDeleteObject.java +++ b/src/test/java/com/avaje/tests/m2m/TestM2mDeleteObject.java @@ -34,7 +34,7 @@ public class TestM2mDeleteObject extends BaseTestCase { Role role1 = new Role("role"); role1.setTenant(t); - Set permissions = new HashSet(); + Set permissions = new HashSet<>(); List permsList = Ebean.find(Permission.class).findList(); permissions.addAll(permsList); @@ -72,7 +72,7 @@ public class TestM2mDeleteObject extends BaseTestCase { Role role1 = new Role("role"); - Set permissions = new HashSet(); + Set permissions = new HashSet<>(); permissions.add(p2); role1.setPermissions(permissions); Ebean.save(role1); diff --git a/src/test/java/com/avaje/tests/model/array/EArrayBean.java b/src/test/java/com/avaje/tests/model/array/EArrayBean.java index c16960592..678354139 100644 --- a/src/test/java/com/avaje/tests/model/array/EArrayBean.java +++ b/src/test/java/com/avaje/tests/model/array/EArrayBean.java @@ -19,13 +19,13 @@ public class EArrayBean { String name; @DbArray(length = 300) - List phoneNumbers = new ArrayList(); + List phoneNumbers = new ArrayList<>(); @DbArray - List uids = new ArrayList(); + List uids = new ArrayList<>(); @DbArray - List otherIds = new ArrayList(); + List otherIds = new ArrayList<>(); @DbArray List doubs; diff --git a/src/test/java/com/avaje/tests/model/array/TestDbArray_basic.java b/src/test/java/com/avaje/tests/model/array/TestDbArray_basic.java index 405cbdfa7..d93bd9e1b 100644 --- a/src/test/java/com/avaje/tests/model/array/TestDbArray_basic.java +++ b/src/test/java/com/avaje/tests/model/array/TestDbArray_basic.java @@ -29,7 +29,7 @@ public class TestDbArray_basic extends BaseTestCase { phNumbers.add("9823"); - List doubles = new ArrayList(); + List doubles = new ArrayList<>(); doubles.add(1.3); doubles.add(2.4); @@ -140,7 +140,7 @@ public class TestDbArray_basic extends BaseTestCase { bean.setOtherIds(null); bean.setUids(null); - List all = new ArrayList(); + List all = new ArrayList<>(); all.add(bean); Ebean.saveAll(all); diff --git a/src/test/java/com/avaje/tests/model/basic/Article.java b/src/test/java/com/avaje/tests/model/basic/Article.java index fb70b9e86..4427c6aea 100644 --- a/src/test/java/com/avaje/tests/model/basic/Article.java +++ b/src/test/java/com/avaje/tests/model/basic/Article.java @@ -56,7 +56,7 @@ public class Article extends BasicDomain { public void addSection(Section s) { if (sections == null) { - sections = new ArrayList
(); + sections = new ArrayList<>(); } sections.add(s); } diff --git a/src/test/java/com/avaje/tests/model/basic/CKeyParent.java b/src/test/java/com/avaje/tests/model/basic/CKeyParent.java index dc58b6ba6..1b75efc86 100644 --- a/src/test/java/com/avaje/tests/model/basic/CKeyParent.java +++ b/src/test/java/com/avaje/tests/model/basic/CKeyParent.java @@ -68,7 +68,7 @@ public class CKeyParent { public void add(CKeyDetail detail) { if (details == null) { - details = new ArrayList(); + details = new ArrayList<>(); } details.add(detail); } diff --git a/src/test/java/com/avaje/tests/model/basic/Car.java b/src/test/java/com/avaje/tests/model/basic/Car.java index d389618a6..55a28ff99 100644 --- a/src/test/java/com/avaje/tests/model/basic/Car.java +++ b/src/test/java/com/avaje/tests/model/basic/Car.java @@ -42,7 +42,7 @@ public class Car extends Vehicle { @OneToMany(mappedBy = "car") @OrderBy("fuse.locationCode") - private Set accessories = new HashSet(); + private Set accessories = new HashSet<>(); private String notes; diff --git a/src/test/java/com/avaje/tests/model/basic/Customer.java b/src/test/java/com/avaje/tests/model/basic/Customer.java index 5a4732498..2163bb330 100644 --- a/src/test/java/com/avaje/tests/model/basic/Customer.java +++ b/src/test/java/com/avaje/tests/model/basic/Customer.java @@ -219,7 +219,7 @@ public class Customer extends BasicDomain { public void addContact(Contact contact) { if (contacts == null) { - contacts = new ArrayList(); + contacts = new ArrayList<>(); } contacts.add(contact); } diff --git a/src/test/java/com/avaje/tests/model/basic/EVanillaCollection.java b/src/test/java/com/avaje/tests/model/basic/EVanillaCollection.java index 97ecea714..614a2bd1c 100644 --- a/src/test/java/com/avaje/tests/model/basic/EVanillaCollection.java +++ b/src/test/java/com/avaje/tests/model/basic/EVanillaCollection.java @@ -19,7 +19,7 @@ public class EVanillaCollection { List details; public EVanillaCollection() { - details = new ArrayList(); + details = new ArrayList<>(); } public Integer getId() { diff --git a/src/test/java/com/avaje/tests/model/basic/MUser.java b/src/test/java/com/avaje/tests/model/basic/MUser.java index 558b590d7..21b22b2e5 100644 --- a/src/test/java/com/avaje/tests/model/basic/MUser.java +++ b/src/test/java/com/avaje/tests/model/basic/MUser.java @@ -64,7 +64,7 @@ public class MUser { public void addRole(MRole role) { if (roles == null) { - roles = new ArrayList(); + roles = new ArrayList<>(); } roles.add(role); } diff --git a/src/test/java/com/avaje/tests/model/basic/MnocUser.java b/src/test/java/com/avaje/tests/model/basic/MnocUser.java index 7cfbd7265..d746716e8 100644 --- a/src/test/java/com/avaje/tests/model/basic/MnocUser.java +++ b/src/test/java/com/avaje/tests/model/basic/MnocUser.java @@ -67,7 +67,7 @@ public class MnocUser { public void addValidRole(MnocRole role) { if (validRoles == null) { - validRoles = new ArrayList(); + validRoles = new ArrayList<>(); } validRoles.add(role); } diff --git a/src/test/java/com/avaje/tests/model/basic/MyEBasicConfigStartup.java b/src/test/java/com/avaje/tests/model/basic/MyEBasicConfigStartup.java index 3941e5c77..e2e19b863 100644 --- a/src/test/java/com/avaje/tests/model/basic/MyEBasicConfigStartup.java +++ b/src/test/java/com/avaje/tests/model/basic/MyEBasicConfigStartup.java @@ -30,7 +30,7 @@ public class MyEBasicConfigStartup implements ServerConfigStartup { public static class EbasicBulkListener implements BulkTableEventListener { - final Set s = new HashSet(); + final Set s = new HashSet<>(); EbasicBulkListener() { s.add("e_basic"); diff --git a/src/test/java/com/avaje/tests/model/basic/OCachedBean.java b/src/test/java/com/avaje/tests/model/basic/OCachedBean.java index cc7be91b2..4d2636696 100644 --- a/src/test/java/com/avaje/tests/model/basic/OCachedBean.java +++ b/src/test/java/com/avaje/tests/model/basic/OCachedBean.java @@ -25,10 +25,10 @@ public class OCachedBean { String name; @ManyToMany(cascade = CascadeType.ALL) - List countries = new ArrayList(); + List countries = new ArrayList<>(); @OneToMany(mappedBy = "cachedBean", cascade = CascadeType.ALL) - List children = new ArrayList(); + List children = new ArrayList<>(); public Long getId() { return id; diff --git a/src/test/java/com/avaje/tests/model/basic/Order.java b/src/test/java/com/avaje/tests/model/basic/Order.java index 98e7cb722..13b91815f 100644 --- a/src/test/java/com/avaje/tests/model/basic/Order.java +++ b/src/test/java/com/avaje/tests/model/basic/Order.java @@ -252,7 +252,7 @@ public class Order implements Serializable { public void addDetail(OrderDetail detail) { if (details == null) { - details = new ArrayList(); + details = new ArrayList<>(); } details.add(detail); } @@ -268,7 +268,7 @@ public class Order implements Serializable { public void addShipment(OrderShipment shipment) { if (shipments == null) { - shipments = new ArrayList(); + shipments = new ArrayList<>(); } shipments.add(shipment); } diff --git a/src/test/java/com/avaje/tests/model/basic/ResetBasicData.java b/src/test/java/com/avaje/tests/model/basic/ResetBasicData.java index b4d3bd35d..4280fe31a 100644 --- a/src/test/java/com/avaje/tests/model/basic/ResetBasicData.java +++ b/src/test/java/com/avaje/tests/model/basic/ResetBasicData.java @@ -257,7 +257,7 @@ public class ResetBasicData { Order order = new Order(); order.setCustomer(customer); - List details = new ArrayList(); + List details = new ArrayList<>(); details.add(new OrderDetail(product1, 5, 10.50)); details.add(new OrderDetail(product2, 3, 1.10)); details.add(new OrderDetail(product3, 1, 2.00)); @@ -278,7 +278,7 @@ public class ResetBasicData { order.setStatus(Status.SHIPPED); order.setCustomer(customer); - List details = new ArrayList(); + List details = new ArrayList<>(); details.add(new OrderDetail(product1, 4, 10.50)); order.setDetails(details); @@ -296,7 +296,7 @@ public class ResetBasicData { order.setStatus(Status.COMPLETE); order.setCustomer(customer); - List details = new ArrayList(); + List details = new ArrayList<>(); details.add(new OrderDetail(product1, 3, 10.50)); details.add(new OrderDetail(product3, 40, 2.10)); details.add(new OrderDetail(product1, 5, 10.00)); diff --git a/src/test/java/com/avaje/tests/model/basic/Section.java b/src/test/java/com/avaje/tests/model/basic/Section.java index 429732c86..016433f03 100644 --- a/src/test/java/com/avaje/tests/model/basic/Section.java +++ b/src/test/java/com/avaje/tests/model/basic/Section.java @@ -73,7 +73,7 @@ public class Section extends BasicDomain { public void addSubSection(SubSection s) { if (subSections == null) { - subSections = new ArrayList(); + subSections = new ArrayList<>(); } subSections.add(s); } diff --git a/src/test/java/com/avaje/tests/model/basic/TSMaster.java b/src/test/java/com/avaje/tests/model/basic/TSMaster.java index ff1306887..9de0b7b0d 100644 --- a/src/test/java/com/avaje/tests/model/basic/TSMaster.java +++ b/src/test/java/com/avaje/tests/model/basic/TSMaster.java @@ -75,7 +75,7 @@ public class TSMaster { public void addDetail(TSDetail detail) { if (details == null) { - details = new ArrayList(); + details = new ArrayList<>(); } details.add(detail); } diff --git a/src/test/java/com/avaje/tests/model/basic/TSMasterTwo.java b/src/test/java/com/avaje/tests/model/basic/TSMasterTwo.java index ebb860ae5..f78aa69ec 100644 --- a/src/test/java/com/avaje/tests/model/basic/TSMasterTwo.java +++ b/src/test/java/com/avaje/tests/model/basic/TSMasterTwo.java @@ -72,7 +72,7 @@ public class TSMasterTwo { public void addDetail(TSDetailTwo detail) { if (details == null) { - details = new ArrayList(); + details = new ArrayList<>(); } details.add(detail); } diff --git a/src/test/java/com/avaje/tests/model/basic/UTMaster.java b/src/test/java/com/avaje/tests/model/basic/UTMaster.java index fe2d38d7d..6a31d0bc3 100644 --- a/src/test/java/com/avaje/tests/model/basic/UTMaster.java +++ b/src/test/java/com/avaje/tests/model/basic/UTMaster.java @@ -78,7 +78,7 @@ public class UTMaster extends Model { public void addDetail(UTDetail detail) { if (details == null) { - details = new ArrayList(); + details = new ArrayList<>(); } details.add(detail); } diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/TestDeleteUnloadedChildren.java b/src/test/java/com/avaje/tests/model/basic/xtra/TestDeleteUnloadedChildren.java index 0df57a452..a3223937b 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/TestDeleteUnloadedChildren.java +++ b/src/test/java/com/avaje/tests/model/basic/xtra/TestDeleteUnloadedChildren.java @@ -30,7 +30,7 @@ public class TestDeleteUnloadedChildren extends BaseTestCase { EdChild child = new EdChild(); child.setName("Harddisk 123"); child.setParent(parent); - ArrayList children = new ArrayList(); + ArrayList children = new ArrayList<>(); children.add(child); parent.setChildren(children); @@ -42,7 +42,7 @@ public class TestDeleteUnloadedChildren extends BaseTestCase { child = new EdChild(); child.setName("DVBS Card"); - children = new ArrayList(); + children = new ArrayList<>(); children.add(child); extendedParent.setChildren(children); diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java index c0334d51c..ba2951f55 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java +++ b/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java @@ -31,7 +31,7 @@ public class TestInsertBatchThenFlushThenUpdate extends BaseTestCase { EdChild child = new EdChild(); child.setName("Harddisk 123"); child.setParent(parent); - ArrayList children = new ArrayList(); + ArrayList children = new ArrayList<>(); children.add(child); parent.setChildren(children); diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchThenUpdate.java index a9c22e64c..ca0912c49 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchThenUpdate.java +++ b/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchThenUpdate.java @@ -33,7 +33,7 @@ public class TestInsertBatchThenUpdate extends BaseTestCase { EdChild child = new EdChild(); child.setName("Harddisk 123"); child.setParent(parent); - ArrayList children = new ArrayList(); + ArrayList children = new ArrayList<>(); children.add(child); parent.setChildren(children); diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java index 56042653d..ae6d10a04 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java +++ b/src/test/java/com/avaje/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java @@ -30,7 +30,7 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase { EdChild child = new EdChild(); child.setName("Harddisk 123"); child.setParent(parent); - ArrayList children = new ArrayList(); + ArrayList children = new ArrayList<>(); children.add(child); parent.setChildren(children); @@ -42,7 +42,7 @@ public class TestInsertBatchWithDifferentRootTypes extends BaseTestCase { child = new EdChild(); child.setName("DVBS Card"); - children = new ArrayList(); + children = new ArrayList<>(); children.add(child); extendedParent.setChildren(children); diff --git a/src/test/java/com/avaje/tests/model/info/InfoCompany.java b/src/test/java/com/avaje/tests/model/info/InfoCompany.java index 7d8e698f0..67448e4cf 100644 --- a/src/test/java/com/avaje/tests/model/info/InfoCompany.java +++ b/src/test/java/com/avaje/tests/model/info/InfoCompany.java @@ -10,7 +10,7 @@ import java.util.List; @Entity public class InfoCompany extends Model { - public static final Finder find = new Finder(InfoCompany.class); + public static final Finder find = new Finder<>(InfoCompany.class); @Id Long id; @@ -22,7 +22,7 @@ public class InfoCompany extends Model { @JsonIgnore @OneToMany(mappedBy = "company", cascade = CascadeType.ALL) - List contacts = new ArrayList(); + List contacts = new ArrayList<>(); public Long getId() { return id; diff --git a/src/test/java/com/avaje/tests/model/info/InfoCustomer.java b/src/test/java/com/avaje/tests/model/info/InfoCustomer.java index eea7e2154..ed422e2fe 100644 --- a/src/test/java/com/avaje/tests/model/info/InfoCustomer.java +++ b/src/test/java/com/avaje/tests/model/info/InfoCustomer.java @@ -11,7 +11,7 @@ import javax.persistence.Version; @Entity public class InfoCustomer extends Model { - public static final Finder find = new Finder(InfoCustomer.class); + public static final Finder find = new Finder<>(InfoCustomer.class); @Id Long id; diff --git a/src/test/java/com/avaje/tests/model/ivo/Oid.java b/src/test/java/com/avaje/tests/model/ivo/Oid.java index 6d8ebf808..7629c33a3 100644 --- a/src/test/java/com/avaje/tests/model/ivo/Oid.java +++ b/src/test/java/com/avaje/tests/model/ivo/Oid.java @@ -31,15 +31,15 @@ public class Oid { } public static Oid valueOf(String s) { - return new Oid(Integer.valueOf(s)); + return new Oid<>(Integer.valueOf(s)); } public static Oid valueOf(long i) { - return new Oid(i); + return new Oid<>(i); } public static Oid valueOf(Class cls, String s) { Integer v = Integer.valueOf(s); - return new Oid(v); + return new Oid<>(v); } } diff --git a/src/test/java/com/avaje/tests/model/ivo/converter/OidTypeConverter.java b/src/test/java/com/avaje/tests/model/ivo/converter/OidTypeConverter.java index 689cc59a6..cb5abdb42 100644 --- a/src/test/java/com/avaje/tests/model/ivo/converter/OidTypeConverter.java +++ b/src/test/java/com/avaje/tests/model/ivo/converter/OidTypeConverter.java @@ -9,7 +9,7 @@ public class OidTypeConverter {//implements ScalarTypeConverter,Long> { if (scalarType == null){ return null; } - return new Oid(scalarType); + return new Oid<>(scalarType); } public Long unwrapValue(Oid beanType) { diff --git a/src/test/java/com/avaje/tests/model/json/EBasicHstore.java b/src/test/java/com/avaje/tests/model/json/EBasicHstore.java index 0c6ccfea9..775559a44 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicHstore.java +++ b/src/test/java/com/avaje/tests/model/json/EBasicHstore.java @@ -25,7 +25,7 @@ public class EBasicHstore { public EBasicHstore(String name) { this.name = name; - this.map = new LinkedHashMap(); + this.map = new LinkedHashMap<>(); } public Long getId() { diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonList.java b/src/test/java/com/avaje/tests/model/json/EBasicJsonList.java index 800c8b427..ab841aebe 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonList.java +++ b/src/test/java/com/avaje/tests/model/json/EBasicJsonList.java @@ -29,16 +29,16 @@ public class EBasicJsonList { List beanList; @DbJson(length = 700) - Map beanMap = new LinkedHashMap(); + Map beanMap = new LinkedHashMap<>(); @DbJson(length = 500) PlainBean plainBean; @DbJson(length = 50) - Set flags = new LinkedHashSet(); + Set flags = new LinkedHashSet<>(); @DbJson(length = 100, storage = DbJsonType.VARCHAR) - List tags = new ArrayList(); + List tags = new ArrayList<>(); @Version Long version; diff --git a/src/test/java/com/avaje/tests/model/map/MpUser.java b/src/test/java/com/avaje/tests/model/map/MpUser.java index c7efaf6e9..6801b6486 100644 --- a/src/test/java/com/avaje/tests/model/map/MpUser.java +++ b/src/test/java/com/avaje/tests/model/map/MpUser.java @@ -18,7 +18,7 @@ public class MpUser { @OneToMany(cascade = CascadeType.ALL) @MapKey(name = "code") - public Map roles = new HashMap(); + public Map roles = new HashMap<>(); public Long getId() { return id; diff --git a/src/test/java/com/avaje/tests/model/onetoone/album/Album.java b/src/test/java/com/avaje/tests/model/onetoone/album/Album.java index 3bc4f4056..faf16d6a2 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/album/Album.java +++ b/src/test/java/com/avaje/tests/model/onetoone/album/Album.java @@ -10,7 +10,7 @@ import javax.persistence.OneToOne; @Entity public class Album extends BaseModel { - public static final Model.Finder find = new Model.Finder(Album.class); + public static final Model.Finder find = new Model.Finder<>(Album.class); private String name; diff --git a/src/test/java/com/avaje/tests/model/onetoone/album/Cover.java b/src/test/java/com/avaje/tests/model/onetoone/album/Cover.java index da792d368..c274dfb4b 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/album/Cover.java +++ b/src/test/java/com/avaje/tests/model/onetoone/album/Cover.java @@ -15,7 +15,7 @@ public class Cover extends Model { private static final Logger logger = LoggerFactory.getLogger(Cover.class); - public static final Finder find = new Finder(Cover.class); + public static final Finder find = new Finder<>(Cover.class); @Id protected Long id; diff --git a/src/test/java/com/avaje/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/src/test/java/com/avaje/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java index 3ce7c919e..adde5f4fe 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java +++ b/src/test/java/com/avaje/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java @@ -296,7 +296,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { } private List ids(List beans) { - List ids = new ArrayList(); + List ids = new ArrayList<>(); for (Cover someBean : beans) { ids.add(someBean.getId()); } @@ -304,7 +304,7 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { } private List beans(int count) { - List beans = new ArrayList(); + List beans = new ArrayList<>(); for (int i = 0; i < count; i++) { beans.add(new Cover("delById " + i)); } diff --git a/src/test/java/com/avaje/tests/model/selfref/ResourceFile.java b/src/test/java/com/avaje/tests/model/selfref/ResourceFile.java index d244b5d0e..5a328da44 100644 --- a/src/test/java/com/avaje/tests/model/selfref/ResourceFile.java +++ b/src/test/java/com/avaje/tests/model/selfref/ResourceFile.java @@ -26,7 +26,7 @@ public class ResourceFile extends BaseResourceFile { @OneToMany(cascade = CascadeType.REMOVE, fetch = FetchType.LAZY, mappedBy = "parent") @PrivateOwned - private Set alternatives = new HashSet(); + private Set alternatives = new HashSet<>(); @Column(name = "name", length = 128, nullable = false) private String name; diff --git a/src/test/java/com/avaje/tests/model/survey/Group.java b/src/test/java/com/avaje/tests/model/survey/Group.java index 52ec98da3..d9a92394e 100644 --- a/src/test/java/com/avaje/tests/model/survey/Group.java +++ b/src/test/java/com/avaje/tests/model/survey/Group.java @@ -29,7 +29,7 @@ public class Group { @OneToMany(mappedBy = "group", cascade = {CascadeType.PERSIST, CascadeType.MERGE}) @OrderBy("sequenceNumber") - private List questions = new ArrayList(); + private List questions = new ArrayList<>(); private int sequenceNumber; diff --git a/src/test/java/com/avaje/tests/model/survey/TestOrderByFetch.java b/src/test/java/com/avaje/tests/model/survey/TestOrderByFetch.java index 6af87160f..5f4c1cbec 100644 --- a/src/test/java/com/avaje/tests/model/survey/TestOrderByFetch.java +++ b/src/test/java/com/avaje/tests/model/survey/TestOrderByFetch.java @@ -16,25 +16,25 @@ public class TestOrderByFetch extends BaseTestCase { public void test() { Survey survey = new Survey("s1"); - List categories = new ArrayList(); + List categories = new ArrayList<>(); Category category = new Category("c1"); category.setSequenceNumber(1); categories.add(category); survey.setCategories(categories); - List groups = new ArrayList(); + List groups = new ArrayList<>(); Group group1 = group(1); Group group2 = group(2); groups.add(group1); groups.add(group2); category.setGroups(groups); - List questionListGroup1 = new ArrayList(); + List questionListGroup1 = new ArrayList<>(); questionListGroup1.add(question(1)); questionListGroup1.add(question(2)); questionListGroup1.add(question(3)); group1.setQuestions(questionListGroup1); - List questionListGroup2 = new ArrayList(); + List questionListGroup2 = new ArrayList<>(); questionListGroup2.add(question(1)); questionListGroup2.add(question(2)); group2.setQuestions(questionListGroup2); diff --git a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java index b08030538..09d15e5fd 100644 --- a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java +++ b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java @@ -34,8 +34,8 @@ public class TestPersistenceContextScopeUsingOrders extends BaseTestCase { assertTrue(!orders.isEmpty()); // collect the customer instances - List customers = new ArrayList(); - Set identities = new HashSet(); + List customers = new ArrayList<>(); + Set identities = new HashSet<>(); for (Order order : orders) { Customer customer = order.getCustomer(); diff --git a/src/test/java/com/avaje/tests/query/TestSubQuery.java b/src/test/java/com/avaje/tests/query/TestSubQuery.java index ccb7dfff5..e7d26851d 100644 --- a/src/test/java/com/avaje/tests/query/TestSubQuery.java +++ b/src/test/java/com/avaje/tests/query/TestSubQuery.java @@ -24,7 +24,7 @@ public class TestSubQuery extends BaseTestCase { ResetBasicData.reset(); - List productIds = new ArrayList(); + List productIds = new ArrayList<>(); productIds.add(3); Query sq = Ebean.createQuery(Order.class).select("id").where() diff --git a/src/test/java/com/avaje/tests/query/other/TestManyLazyLoadingQuery.java b/src/test/java/com/avaje/tests/query/other/TestManyLazyLoadingQuery.java index 0a9aa9b49..b1b1cfe5f 100644 --- a/src/test/java/com/avaje/tests/query/other/TestManyLazyLoadingQuery.java +++ b/src/test/java/com/avaje/tests/query/other/TestManyLazyLoadingQuery.java @@ -29,7 +29,7 @@ public class TestManyLazyLoadingQuery extends BaseTestCase { BeanDescriptor descOrder = server.getBeanDescriptor(Order.class); BeanPropertyAssocMany beanProperty = (BeanPropertyAssocMany)descOrder.getBeanProperty("details"); - List parentIds = new ArrayList(); + List parentIds = new ArrayList<>(); parentIds.add(1); diff --git a/src/test/java/com/avaje/tests/query/softdelete/TestSoftDeletePagingList.java b/src/test/java/com/avaje/tests/query/softdelete/TestSoftDeletePagingList.java index d3dee624a..a0ba745c8 100644 --- a/src/test/java/com/avaje/tests/query/softdelete/TestSoftDeletePagingList.java +++ b/src/test/java/com/avaje/tests/query/softdelete/TestSoftDeletePagingList.java @@ -17,7 +17,7 @@ public class TestSoftDeletePagingList extends BaseTestCase { @Test public void test() { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(new Cover("SoftDelPaged-1")); list.add(new Cover("SoftDelPaged-2")); list.add(new Cover("SoftDelPaged-3")); diff --git a/src/test/java/com/avaje/tests/rawsql/inherit/ParentQueryTest.java b/src/test/java/com/avaje/tests/rawsql/inherit/ParentQueryTest.java index af5061306..e6b7d057b 100644 --- a/src/test/java/com/avaje/tests/rawsql/inherit/ParentQueryTest.java +++ b/src/test/java/com/avaje/tests/rawsql/inherit/ParentQueryTest.java @@ -19,7 +19,7 @@ public class ParentQueryTest extends BaseTestCase { @Test public void QueryParentCollectionFetch() { - List exampleData = new ArrayList(); + List exampleData = new ArrayList<>(); exampleData.add(new Data(0)); exampleData.add(new Data(1)); exampleData.add(new Data(2)); diff --git a/src/test/java/com/avaje/tests/rawsql/inherit/ParentRawSqlTest.java b/src/test/java/com/avaje/tests/rawsql/inherit/ParentRawSqlTest.java index 15109274d..6a867ac26 100644 --- a/src/test/java/com/avaje/tests/rawsql/inherit/ParentRawSqlTest.java +++ b/src/test/java/com/avaje/tests/rawsql/inherit/ParentRawSqlTest.java @@ -25,7 +25,7 @@ public class ParentRawSqlTest extends BaseTestCase { @Test public void RawSqlParentLoad() { - List exampleData = new ArrayList(); + List exampleData = new ArrayList<>(); exampleData.add(new Data(0)); exampleData.add(new Data(1)); exampleData.add(new Data(2)); @@ -57,7 +57,7 @@ public class ParentRawSqlTest extends BaseTestCase { @Test public void RawSqlParentFetch() { - List exampleData = new ArrayList(); + List exampleData = new ArrayList<>(); exampleData.add(new Data(0)); exampleData.add(new Data(1)); exampleData.add(new Data(2)); @@ -178,7 +178,7 @@ public class ParentRawSqlTest extends BaseTestCase { .fetch("parent", new FetchConfig().query()) .findList(); - List partial = new ArrayList(); + List partial = new ArrayList<>(); for (ParentAggregate aggregate : aggregates) { partial.add(aggregate.parent); } @@ -202,7 +202,7 @@ public class ParentRawSqlTest extends BaseTestCase { .fetch("parent", new FetchConfig().query()) .findList(); - List partial = new ArrayList(); + List partial = new ArrayList<>(); for (ParentAggregate aggregate : aggregates) { partial.add(aggregate.parent); } @@ -228,7 +228,7 @@ public class ParentRawSqlTest extends BaseTestCase { .fetch("parent", new FetchConfig().query()) .findList(); - List partial = new ArrayList(); + List partial = new ArrayList<>(); for (ParentAggregate aggregate : aggregates) { partial.add(aggregate.parent); } diff --git a/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java b/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java index 927e75bba..43fa894db 100644 --- a/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java +++ b/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java @@ -359,9 +359,9 @@ public class TestReadAudit extends BaseTestCase { class TDReadAuditLogger implements ReadAuditLogger { - Set plans = new HashSet(); - List beans = new ArrayList(); - List many = new ArrayList(); + Set plans = new HashSet<>(); + List beans = new ArrayList<>(); + List many = new ArrayList<>(); TDReadAuditLogger(boolean dummy) { } diff --git a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteTop.java b/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteTop.java index 2f7af21ab..89feea799 100644 --- a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteTop.java +++ b/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteTop.java @@ -43,7 +43,7 @@ public class TestSoftDeleteTop extends BaseTestCase { transaction.end(); } - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(up1); list.add(up2); @@ -56,7 +56,7 @@ public class TestSoftDeleteTop extends BaseTestCase { ESoftDelUp up1 = new ESoftDelUp("upBatchX"); ESoftDelUp up2 = new ESoftDelUp("upBatchY"); - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(up1); list.add(up2); diff --git a/src/test/java/com/avaje/tests/sp/TestManyToManySaveTwice.java b/src/test/java/com/avaje/tests/sp/TestManyToManySaveTwice.java index a641f2d5c..b700e3a93 100644 --- a/src/test/java/com/avaje/tests/sp/TestManyToManySaveTwice.java +++ b/src/test/java/com/avaje/tests/sp/TestManyToManySaveTwice.java @@ -20,7 +20,7 @@ public class TestManyToManySaveTwice extends BaseTestCase { Ebean.createSqlUpdate("delete from sp_car_wheel").execute(); Ebean.createSqlUpdate("delete from sp_car_car").execute(); - List wheels = new LinkedList(); + List wheels = new LinkedList<>(); wheels.add(new Wheel()); wheels.add(new Wheel()); wheels.add(new Wheel()); diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonSimple.java b/src/test/java/com/avaje/tests/text/json/TestJsonSimple.java index 8e588564a..5ccf92d73 100644 --- a/src/test/java/com/avaje/tests/text/json/TestJsonSimple.java +++ b/src/test/java/com/avaje/tests/text/json/TestJsonSimple.java @@ -44,7 +44,7 @@ public class TestJsonSimple extends BaseTestCase { Assert.assertEquals(12L, e2.get("a")); Assert.assertEquals("rob", ((Map)e2.get("name")).get("first")); - Map m = new LinkedHashMap(); + Map m = new LinkedHashMap<>(); m.put("hello", "rob"); m.put("test", "me"); diff --git a/src/test/java/com/avaje/tests/transaction/TestInsertManyAndRef.java b/src/test/java/com/avaje/tests/transaction/TestInsertManyAndRef.java index 3726099f8..e83c9b328 100644 --- a/src/test/java/com/avaje/tests/transaction/TestInsertManyAndRef.java +++ b/src/test/java/com/avaje/tests/transaction/TestInsertManyAndRef.java @@ -39,7 +39,7 @@ public class TestInsertManyAndRef extends BaseTestCase { u.setName("Mr Test"); u.setPassword("password"); - final List bookmarks = new ArrayList(); + final List bookmarks = new ArrayList<>(); final BBookmark b1 = new BBookmark(); b1.setBookmarkReference("Acts 2:7-20"); b1.setUser(u); diff --git a/src/test/java/com/avaje/tests/unitinternal/TestOrderByParse.java b/src/test/java/com/avaje/tests/unitinternal/TestOrderByParse.java index 11267f790..940b352e8 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestOrderByParse.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestOrderByParse.java @@ -16,25 +16,25 @@ public class TestOrderByParse extends BaseTestCase { @Test public void testParsingOne() { - OrderBy o1 = new OrderBy("id"); + OrderBy o1 = new OrderBy<>("id"); assertTrue(o1.getProperties().size() == 1); assertTrue(o1.getProperties().get(0).getProperty().equals("id")); assertTrue(o1.getProperties().get(0).isAscending()); assertTrue(o1.toStringFormat().equals("id")); - o1 = new OrderBy("id asc"); + o1 = new OrderBy<>("id asc"); assertTrue(o1.getProperties().size() == 1); assertTrue(o1.getProperties().get(0).getProperty().equals("id")); assertTrue(o1.getProperties().get(0).isAscending()); assertTrue(o1.toStringFormat().equals("id")); - o1 = new OrderBy("id desc"); + o1 = new OrderBy<>("id desc"); assertTrue(o1.getProperties().size() == 1); assertTrue(o1.getProperties().get(0).getProperty().equals("id")); assertTrue(!o1.getProperties().get(0).isAscending()); assertTrue(o1.toStringFormat().equals("id desc")); - o1 = new OrderBy(" id asc "); + o1 = new OrderBy<>(" id asc "); assertTrue(o1.getProperties().size() == 1); assertTrue(o1.getProperties().get(0).getProperty().equals("id")); assertTrue(o1.getProperties().get(0).isAscending()); @@ -47,7 +47,7 @@ public class TestOrderByParse extends BaseTestCase { @Test public void parseNullsHigh() { - OrderBy o1 = new OrderBy("id desc nulls high"); + OrderBy o1 = new OrderBy<>("id desc nulls high"); assertTrue(o1.getProperties().size() == 1); assertTrue(o1.getProperties().get(0).getProperty().equals("id")); assertTrue(!o1.getProperties().get(0).isAscending()); @@ -57,7 +57,7 @@ public class TestOrderByParse extends BaseTestCase { @Test public void add_parse() { - OrderBy o1 = new OrderBy(); + OrderBy o1 = new OrderBy<>(); o1.add("id desc nulls high"); assertTrue(o1.getProperties().size() == 1); assertTrue(o1.getProperties().get(0).getProperty().equals("id")); @@ -68,7 +68,7 @@ public class TestOrderByParse extends BaseTestCase { @Test public void parseNullsHigh_with_second() { - OrderBy o1 = new OrderBy("id desc nulls high, name"); + OrderBy o1 = new OrderBy<>("id desc nulls high, name"); assertTrue(o1.getProperties().size() == 2); assertTrue(o1.getProperties().get(0).getProperty().equals("id")); assertTrue(!o1.getProperties().get(0).isAscending()); @@ -80,7 +80,7 @@ public class TestOrderByParse extends BaseTestCase { @Test public void testParsingTwo() { - OrderBy o1 = new OrderBy("id,name"); + OrderBy o1 = new OrderBy<>("id,name"); assertTrue(o1.getProperties().size() == 2); assertTrue(o1.getProperties().get(0).getProperty().equals("id")); assertTrue(o1.getProperties().get(0).isAscending()); @@ -88,7 +88,7 @@ public class TestOrderByParse extends BaseTestCase { assertTrue(o1.getProperties().get(1).isAscending()); assertEquals("id, name", o1.toStringFormat()); - o1 = new OrderBy(" id , name "); + o1 = new OrderBy<>(" id , name "); assertTrue(o1.getProperties().size() == 2); assertTrue(o1.getProperties().get(0).getProperty().equals("id")); assertTrue(o1.getProperties().get(0).isAscending()); @@ -96,7 +96,7 @@ public class TestOrderByParse extends BaseTestCase { assertTrue(o1.getProperties().get(1).isAscending()); assertEquals("id, name", o1.toStringFormat()); - o1 = new OrderBy(" id desc , name desc "); + o1 = new OrderBy<>(" id desc , name desc "); assertTrue(o1.getProperties().size() == 2); assertTrue(o1.getProperties().get(0).getProperty().equals("id")); assertTrue(!o1.getProperties().get(0).isAscending()); @@ -104,7 +104,7 @@ public class TestOrderByParse extends BaseTestCase { assertTrue(!o1.getProperties().get(1).isAscending()); assertEquals("id desc, name desc", o1.toStringFormat()); - o1 = new OrderBy(" id ascending, name asc"); + o1 = new OrderBy<>(" id ascending, name asc"); assertTrue(o1.getProperties().size() == 2); assertTrue(o1.getProperties().get(0).getProperty().equals("id")); assertTrue(o1.getProperties().get(0).isAscending()); @@ -117,7 +117,7 @@ public class TestOrderByParse extends BaseTestCase { @Test public void testAddMethods() { - OrderBy o1 = new OrderBy(); + OrderBy o1 = new OrderBy<>(); o1.asc("id"); o1.asc("name"); assertTrue(o1.getProperties().size() == 2); @@ -127,7 +127,7 @@ public class TestOrderByParse extends BaseTestCase { assertTrue(o1.getProperties().get(1).isAscending()); assertEquals("id, name", o1.toStringFormat()); - o1 = new OrderBy(); + o1 = new OrderBy<>(); o1.desc("id"); o1.desc("name"); assertTrue(o1.getProperties().size() == 2); diff --git a/src/test/java/com/avaje/tests/update/TestStatelessUpdate.java b/src/test/java/com/avaje/tests/update/TestStatelessUpdate.java index 9c832c6cc..a5d832825 100644 --- a/src/test/java/com/avaje/tests/update/TestStatelessUpdate.java +++ b/src/test/java/com/avaje/tests/update/TestStatelessUpdate.java @@ -136,7 +136,7 @@ public class TestStatelessUpdate extends BaseTestCase { Customer customer = new Customer(); customer.setName("something"); - customer.setContacts(new ArrayList()); + customer.setContacts(new ArrayList<>()); customer.getContacts().add(contact); server.save(customer); @@ -171,7 +171,7 @@ public class TestStatelessUpdate extends BaseTestCase { Customer customer = new Customer(); customer.setName("something"); - customer.setContacts(new ArrayList()); + customer.setContacts(new ArrayList<>()); customer.getContacts().add(contact); server.save(customer); @@ -204,7 +204,7 @@ public class TestStatelessUpdate extends BaseTestCase { Customer customer = new Customer(); customer.setName("something"); - customer.setContacts(new ArrayList()); + customer.setContacts(new ArrayList<>()); customer.getContacts().add(contact); server.save(customer); @@ -314,8 +314,8 @@ public class TestStatelessUpdate extends BaseTestCase { Customer assCustomer = server.find(Customer.class, customer.getId()); List assContacts = assCustomer.getContacts(); assertEquals(2, assContacts.size()); - Set ids = new LinkedHashSet(); - Set names = new LinkedHashSet(); + Set ids = new LinkedHashSet<>(); + Set names = new LinkedHashSet<>(); for (Contact contact : assContacts) { ids.add(contact.getId()); names.add(contact.getLastName()); @@ -372,8 +372,8 @@ public class TestStatelessUpdate extends BaseTestCase { // contact 2 was not deleted this time assertEquals(3, assContacts.size()); - Set ids = new LinkedHashSet(); - Set names = new LinkedHashSet(); + Set ids = new LinkedHashSet<>(); + Set names = new LinkedHashSet<>(); for (Contact contact : assContacts) { ids.add(contact.getId()); names.add(contact.getLastName()); diff --git a/src/test/java/org/avaje/ebeantest/LoggedSqlCollector.java b/src/test/java/org/avaje/ebeantest/LoggedSqlCollector.java index e0399cad5..c6b273502 100644 --- a/src/test/java/org/avaje/ebeantest/LoggedSqlCollector.java +++ b/src/test/java/org/avaje/ebeantest/LoggedSqlCollector.java @@ -55,7 +55,7 @@ public class LoggedSqlCollector { private static class BasicAppender extends UnsynchronizedAppenderBase { - List messages = new ArrayList(); + List messages = new ArrayList<>(); @Override protected void append(ILoggingEvent eventObject) { @@ -69,7 +69,7 @@ public class LoggedSqlCollector { */ List collectStart() { List tempMessages = messages; - messages = new ArrayList(); + messages = new ArrayList<>(); // set started flag start(); return tempMessages; @@ -82,7 +82,7 @@ public class LoggedSqlCollector { // set stopped state stop(); List tempMessages = messages; - messages = new ArrayList(); + messages = new ArrayList<>(); return tempMessages; } diff --git a/src/test/java/org/avaje/test/model/rawsql/inherit/Data.java b/src/test/java/org/avaje/test/model/rawsql/inherit/Data.java index 4665a14c9..0858128b7 100644 --- a/src/test/java/org/avaje/test/model/rawsql/inherit/Data.java +++ b/src/test/java/org/avaje/test/model/rawsql/inherit/Data.java @@ -17,7 +17,7 @@ public class Data { private Integer val; @ManyToMany(mappedBy = "data") - public List parents = new ArrayList(); + public List parents = new ArrayList<>(); public Data(int number) { this.val = number; diff --git a/src/test/java/org/avaje/test/model/rawsql/inherit/Parent.java b/src/test/java/org/avaje/test/model/rawsql/inherit/Parent.java index 2a5376be4..fbc9cd5f8 100644 --- a/src/test/java/org/avaje/test/model/rawsql/inherit/Parent.java +++ b/src/test/java/org/avaje/test/model/rawsql/inherit/Parent.java @@ -25,7 +25,7 @@ public abstract class Parent { private String more; @ManyToMany(cascade = CascadeType.PERSIST) - private List data = new ArrayList(); + private List data = new ArrayList<>(); protected Parent(Integer val, String more) { this.val = val;