From ac6708e0d0a83aa6f8ffd791d26ee97c5c5c3edf Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Wed, 13 Sep 2017 14:29:01 +0200 Subject: [PATCH] Fix warnings (#1129) * FIX: warnings (add generics, overrides, fix imports) - should be no effecive code change * replaced deprecated methods by default methods * FIX: more compiler warnings * FIX more warnings - no code changes --- src/main/java/io/ebean/EbeanServer.java | 10 +++-- src/main/java/io/ebean/TxCallable.java | 1 + src/main/java/io/ebean/TxRunnable.java | 1 + .../ddlgeneration/platform/BaseTableDdl.java | 1 - .../ddlgeneration/platform/DB2Ddl.java | 1 + .../ddlgeneration/platform/SqlServerDdl.java | 1 + .../platform/SqlServerHistoryDdl.java | 1 - src/main/java/io/ebean/text/json/EJson.java | 18 ++++---- .../java/io/ebean/text/json/EJsonReader.java | 4 +- .../extraddl/model/ExtraDdlXmlReader.java | 1 - .../server/core/DefaultServer.java | 12 ------ .../server/core/OrmQueryRequest.java | 6 +-- .../server/core/bootup/ManifestReader.java | 1 - .../deploy/BeanCollectionHelpFactory.java | 2 + .../server/deploy/BeanDescriptor.java | 6 +-- .../server/deploy/BeanPropertyAssocMany.java | 2 +- .../server/deploy/DbMigrationInfo.java | 2 - .../server/expression/JunctionExpression.java | 3 +- .../server/query/SqlTreeNodeBean.java | 2 +- .../server/querydefn/OrmUpdateProperties.java | 1 - .../server/text/json/WriteJson.java | 12 +++--- .../server/type/DefaultTypeManager.java | 4 +- .../server/type/ScalarTypeArraySet.java | 42 +++++++++---------- .../server/type/ScalarTypeArraySetH2.java | 20 ++++----- .../server/type/TypeManager.java | 1 + src/test/java/io/ebean/StringHelperTest.java | 2 - .../dbmigration/DbMigrationGenerateTest.java | 1 - src/test/java/io/ebean/json/EJsonTests.java | 3 +- .../ebeaninternal/api/TDSpiEbeanServer.java | 10 ----- .../deploy/BeanPropertyAssocManyTest.java | 1 + .../TestBeanDescriptorHasIdProperty.java | 1 + .../expression/DefaultExpressionListTest.java | 6 +-- .../server/expression/InExpressionTest.java | 2 +- .../expression/JunctionExpressionTest.java | 4 +- .../expression/PrepareDocNestedTest.java | 2 +- .../server/grammer/EqlParserTest.java | 2 +- .../server/persist/BatchedBeanHolderTest.java | 1 + .../server/query/OrderVersionDescTest.java | 6 +-- .../server/type/ModifyAwareListTest.java | 3 +- .../server/type/ModifyAwareMapTest.java | 1 + .../server/type/ModifyAwareSetTest.java | 1 + .../server/type/ScalarTypeDurationTest.java | 2 +- .../type/ScalarTypeDurationWithNanosTest.java | 2 +- .../server/type/ScalarTypeInstantTest.java | 6 +-- .../type/ScalarTypeLocalDateTimeTest.java | 6 +-- .../server/type/ScalarTypeLocalTimeTest.java | 2 +- .../ScalarTypeLocalTimeWithNanosTest.java | 2 +- .../type/ScalarTypeOffsetDateTimeTest.java | 6 +-- .../server/type/ScalarTypeYearTest.java | 2 +- .../type/ScalarTypeZonedDateTimeTest.java | 6 +-- src/test/java/misc/migration/v1_0/EBasic.java | 1 - src/test/java/misc/migration/v1_1/EBasic.java | 1 - src/test/java/misc/migration/v1_2/EBasic.java | 1 - ...tBatchInsertWithInitialisedCollection.java | 2 +- .../java/org/tests/model/survey/Category.java | 4 ++ .../java/org/tests/model/survey/Group.java | 4 ++ .../java/org/tests/model/survey/Question.java | 3 ++ .../TestInheritQuery.java | 1 + .../transaction/TestBatchModelFlush.java | 1 + .../update/TestUpdateAllLoadedProperties.java | 2 +- 60 files changed, 127 insertions(+), 128 deletions(-) diff --git a/src/main/java/io/ebean/EbeanServer.java b/src/main/java/io/ebean/EbeanServer.java index 5cedbce81..b961cd0b3 100644 --- a/src/main/java/io/ebean/EbeanServer.java +++ b/src/main/java/io/ebean/EbeanServer.java @@ -1668,10 +1668,12 @@ public interface EbeanServer { * Deprecated - please migrate to executeCall(). */ @Deprecated - T execute(TxScope scope, TxCallable callable); + default T execute(TxScope scope, TxCallable callable) { + return executeCall(scope, callable); + } /** - * Execute a Callable in a Transaction with the default scope. + * Execute a TxCallable in a Transaction with the default scope. *

* The default scope runs with REQUIRED and by default will rollback on any * exception (checked or runtime). @@ -1702,7 +1704,9 @@ public interface EbeanServer { * Deprecated - please migrate to executeCall(). */ @Deprecated - T execute(TxCallable callable); + default T execute(TxCallable callable) { + return executeCall(null, callable); + } /** * Return the manager of the server cache ("L2" cache). diff --git a/src/main/java/io/ebean/TxCallable.java b/src/main/java/io/ebean/TxCallable.java index 8ac3e7499..e3278b720 100644 --- a/src/main/java/io/ebean/TxCallable.java +++ b/src/main/java/io/ebean/TxCallable.java @@ -46,5 +46,6 @@ public interface TxCallable extends Callable { * instead. *

*/ + @Override T call(); } diff --git a/src/main/java/io/ebean/TxRunnable.java b/src/main/java/io/ebean/TxRunnable.java index 718ca3789..e66a00af3 100644 --- a/src/main/java/io/ebean/TxRunnable.java +++ b/src/main/java/io/ebean/TxRunnable.java @@ -37,5 +37,6 @@ public interface TxRunnable extends Runnable { /** * Run the method in a transaction sope. */ + @Override void run(); } diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java index ff3087311..0f6cd24bd 100644 --- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/BaseTableDdl.java @@ -4,7 +4,6 @@ import io.ebean.config.DbConstraintNaming; import io.ebean.config.NamingConvention; import io.ebean.config.ServerConfig; import io.ebean.config.dbplatform.DbHistorySupport; -import io.ebean.config.dbplatform.DbIdentity; import io.ebean.config.dbplatform.IdType; import io.ebean.dbmigration.ddlgeneration.DdlBuffer; import io.ebean.dbmigration.ddlgeneration.DdlWrite; diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DB2Ddl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DB2Ddl.java index ed9a42b87..06550d803 100644 --- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DB2Ddl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/DB2Ddl.java @@ -17,6 +17,7 @@ public class DB2Ddl extends PlatformDdl { this.inlineUniqueWhenNullable = false; } + @Override public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns, boolean notNull) { if (notNull) { return super.alterTableAddUniqueConstraint(tableName, uqName, columns, true); diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerDdl.java index 29815929f..75d7eb46f 100644 --- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerDdl.java @@ -82,6 +82,7 @@ public class SqlServerDdl extends PlatformDdl { return sb.toString(); } + @Override public String alterTableDropConstraint(String tableName, String constraintName) { StringBuilder sb = new StringBuilder(); sb.append("IF (OBJECT_ID('").append(constraintName).append("', 'C') IS NOT NULL) "); diff --git a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java index b7c374117..817d7aca9 100644 --- a/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java +++ b/src/main/java/io/ebean/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java @@ -1,6 +1,5 @@ package io.ebean.dbmigration.ddlgeneration.platform; -import io.ebean.config.DbConstraintNaming; import io.ebean.config.ServerConfig; import io.ebean.dbmigration.ddlgeneration.DdlBuffer; import io.ebean.dbmigration.ddlgeneration.DdlWrite; diff --git a/src/main/java/io/ebean/text/json/EJson.java b/src/main/java/io/ebean/text/json/EJson.java index f1b59c561..93b007625 100644 --- a/src/main/java/io/ebean/text/json/EJson.java +++ b/src/main/java/io/ebean/text/json/EJson.java @@ -96,7 +96,7 @@ public class EJson { /** * Parse the json and return as a modify aware List. */ - public static List parseList(String json, boolean modifyAware) throws IOException { + public static List parseList(String json, boolean modifyAware) throws IOException { return EJsonReader.parseList(json, modifyAware); } @@ -125,8 +125,8 @@ public class EJson { * Parse the json returning as a List taking into account the current token. */ @SuppressWarnings("unchecked") - public static List parseList(JsonParser parser, JsonToken currentToken) throws IOException { - return (List) EJsonReader.parse(parser, currentToken, false); + public static List parseList(JsonParser parser, JsonToken currentToken) throws IOException { + return (List) EJsonReader.parse(parser, currentToken, false); } /** @@ -153,23 +153,23 @@ public class EJson { /** * Parse the json returning a Set that might be modify aware. */ - public static Set parseSet(String json, boolean modifyAware) throws IOException { - List list = parseList(json, modifyAware); + public static Set parseSet(String json, boolean modifyAware) throws IOException { + List list = parseList(json, modifyAware); if (list == null) { return null; } if (modifyAware) { - return ((ModifyAwareList) list).asSet(); + return ((ModifyAwareList) list).asSet(); } else { - return new LinkedHashSet<>(list); + return new LinkedHashSet(list); } } /** * Parse the json returning as a Set taking into account the current token. */ - public static Set parseSet(JsonParser parser, JsonToken currentToken) throws IOException { - return new LinkedHashSet<>(parseList(parser, currentToken)); + public static Set parseSet(JsonParser parser, JsonToken currentToken) throws IOException { + return new LinkedHashSet(parseList(parser, currentToken)); } } diff --git a/src/main/java/io/ebean/text/json/EJsonReader.java b/src/main/java/io/ebean/text/json/EJsonReader.java index 9b00ed67f..8b2992976 100644 --- a/src/main/java/io/ebean/text/json/EJsonReader.java +++ b/src/main/java/io/ebean/text/json/EJsonReader.java @@ -52,8 +52,8 @@ class EJsonReader { } @SuppressWarnings("unchecked") - static List parseList(String json, boolean modifyAware) throws IOException { - return (List) parse(json, modifyAware); + static List parseList(String json, boolean modifyAware) throws IOException { + return (List) parse(json, modifyAware); } @SuppressWarnings("unchecked") diff --git a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java index 225e2e464..48cee9129 100644 --- a/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java +++ b/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java @@ -1,6 +1,5 @@ package io.ebeaninternal.extraddl.model; -import java.util.regex.Pattern; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 912569e4e..f1cbee308 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -20,8 +20,6 @@ import io.ebean.SqlRow; import io.ebean.SqlUpdate; import io.ebean.Transaction; import io.ebean.TransactionCallback; -import io.ebean.TxCallable; -import io.ebean.TxRunnable; import io.ebean.TxScope; import io.ebean.Update; import io.ebean.UpdateQuery; @@ -661,16 +659,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { return transactionManager.createTransaction(true, isolation.getLevel()); } - @Override - public T execute(TxCallable c) { - return execute(null, c); - } - - @Override - public T execute(TxScope scope, TxCallable c) { - return executeCall(scope, c); - } - @Override public T executeCall(Callable c) { return executeCall(null, c); diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index 78cbda57b..cd45991b9 100644 --- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -504,11 +504,11 @@ public final class OrmQueryRequest extends BeanRequest implements BeanQueryRe if (cached instanceof BeanCollection) { cached = ((BeanCollection)cached).getShallowCopy(); } else if (cached instanceof List) { - cached = new CopyOnFirstWriteList<>((List)cached); + cached = new CopyOnFirstWriteList<>((List)cached); } else if (cached instanceof Set) { - cached = new LinkedHashSet<>((Set)cached); + cached = new LinkedHashSet<>((Set)cached); } else if (cached instanceof Map) { - cached = new LinkedHashMap<>((Map)cached); + cached = new LinkedHashMap<>((Map)cached); } } return cached; diff --git a/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java b/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java index fc989ddc3..627ab77d9 100644 --- a/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java +++ b/src/main/java/io/ebeaninternal/server/core/bootup/ManifestReader.java @@ -1,6 +1,5 @@ package io.ebeaninternal.server.core.bootup; -import java.util.regex.Pattern; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java index 856e25c91..4afd1325c 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java @@ -9,8 +9,10 @@ import io.ebeaninternal.server.core.OrmQueryRequest; */ public class BeanCollectionHelpFactory { + @SuppressWarnings("rawtypes") static final BeanListHelp LIST_HELP = new BeanListHelp(); + @SuppressWarnings("rawtypes") static final BeanSetHelp SET_HELP = new BeanSetHelp(); /** diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index a19c98982..a154a714c 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -1747,7 +1747,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { * account inheritance. */ public BeanProperty getBeanPropertyFromPath(String path) { - BeanDescriptor other = this; + BeanDescriptor other = this; while (true) { String[] split = SplitName.splitBegin(path); @@ -1771,7 +1771,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { * Return the BeanDescriptor for a given path of Associated One or Many beans. */ public BeanDescriptor getBeanDescriptor(String path) { - BeanDescriptor result = this; + BeanDescriptor result = this; while (true) { if (path == null) { return result; @@ -1806,7 +1806,7 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { *

*/ public BeanPropertyAssocOne getUnidirectional() { - BeanDescriptor other = this; + BeanDescriptor other = this; while (true) { if (other.unidirectional != null) { return other.unidirectional; diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index 4630b4082..4d5193487 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -263,7 +263,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc { Object value = getValue(bean); if (value instanceof BeanCollection) { // reset the collection back to empty - ((BeanCollection) value).reset(bean, name); + ((BeanCollection) value).reset(bean, name); } else { createReference(bean); } diff --git a/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java b/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java index ef8e3ebc9..33d8e11dc 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java +++ b/src/main/java/io/ebeaninternal/server/deploy/DbMigrationInfo.java @@ -1,10 +1,8 @@ package io.ebeaninternal.server.deploy; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Objects; import io.ebean.Platform; /** diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java index 7ba4a5086..9586bddc6 100644 --- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java @@ -59,6 +59,7 @@ class JunctionExpression implements SpiJunction, SpiExpression, Expression List list = exprList.list; if (list.size() == 1 && list.get(0) instanceof JunctionExpression) { + @SuppressWarnings("rawtypes") JunctionExpression nested = (JunctionExpression) list.get(0); if (type == Type.AND && !nested.type.isText()) { // and (and (a, b, c)) -> and (a, b, c) @@ -204,7 +205,7 @@ class JunctionExpression implements SpiJunction, SpiExpression, Expression @Override public boolean isSameByBind(SpiExpression other) { - JunctionExpression that = (JunctionExpression) other; + JunctionExpression that = (JunctionExpression) other; return type == that.type && exprList.isSameByBind(that.exprList); } diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java index 8b430e16d..9824d665f 100644 --- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java @@ -147,7 +147,7 @@ class SqlTreeNodeBean implements SqlTreeNode { return children[0].getSingleAttributeScalarType(); } if (properties[0] instanceof BeanPropertyAssocOne) { - BeanPropertyAssocOne assocOne = (BeanPropertyAssocOne)properties[0]; + BeanPropertyAssocOne assocOne = (BeanPropertyAssocOne)properties[0]; if (assocOne.isAssocId()) { return assocOne.getTargetDescriptor().getIdProperty().getScalarType(); } diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java index 2d5228973..02cb166c7 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmUpdateProperties.java @@ -1,6 +1,5 @@ package io.ebeaninternal.server.querydefn; -import io.ebeaninternal.api.HashQueryPlanBuilder; import io.ebeaninternal.server.deploy.DeployParser; import io.ebeaninternal.server.persist.Binder; import io.ebeaninternal.server.type.DataBind; diff --git a/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java b/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java index fec1d1a53..7c5e02eb3 100644 --- a/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java +++ b/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java @@ -387,7 +387,7 @@ public class WriteJson implements JsonWriter { public WriteBean createWriteBean(BeanDescriptor desc, EntityBean bean) { String path = pathStack.peekWithNull(); - JsonWriteBeanVisitor visitor = (visitors == null) ? null : visitors.get(path); + JsonWriteBeanVisitor visitor = (visitors == null) ? null : visitors.get(path); if (fetchPath == null) { return new WriteBean(desc, bean, visitor); } @@ -407,10 +407,10 @@ public class WriteJson implements JsonWriter { if (!isIncludeEmpty()) { // check for suppression of empty collection or map - if (value instanceof Collection && ((Collection) value).isEmpty()) { + if (value instanceof Collection && ((Collection) value).isEmpty()) { // suppress empty collection return; - } else if (value instanceof Map && ((Map) value).isEmpty()) { + } else if (value instanceof Map && ((Map) value).isEmpty()) { // suppress empty map return; } @@ -436,13 +436,15 @@ public class WriteJson implements JsonWriter { final Set currentIncludeProps; final BeanDescriptor desc; final EntityBean currentBean; + + @SuppressWarnings("rawtypes") final JsonWriteBeanVisitor visitor; - WriteBean(BeanDescriptor desc, EntityBean currentBean, JsonWriteBeanVisitor visitor) { + WriteBean(BeanDescriptor desc, EntityBean currentBean, JsonWriteBeanVisitor visitor) { this(desc, false, null, currentBean, visitor); } - WriteBean(BeanDescriptor desc, boolean explicitAllProps, Set currentIncludeProps, EntityBean currentBean, JsonWriteBeanVisitor visitor) { + WriteBean(BeanDescriptor desc, boolean explicitAllProps, Set currentIncludeProps, EntityBean currentBean, JsonWriteBeanVisitor visitor) { super(); this.desc = desc; this.currentBean = currentBean; diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index 121e0c771..597060606 100644 --- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -239,8 +239,8 @@ public final class DefaultTypeManager implements TypeManager { if (iterator.hasNext()) { // use the cacheFactory (via classpath service loader) ExtraTypeFactory plugin = iterator.next(); - List types = plugin.createTypes(config, objectMapper); - for (ScalarType type : types) { + List> types = plugin.createTypes(config, objectMapper); + for (ScalarType type : types) { logger.debug("adding ScalarType {}", type.getClass()); addCustomType(type); } diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java index c78951bda..8181ba46c 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java @@ -19,13 +19,13 @@ import java.util.UUID; /** * Type mapped for DB ARRAY type (Postgres only effectively). */ -public class ScalarTypeArraySet extends ScalarTypeJsonCollection implements ScalarTypeArray { +public class ScalarTypeArraySet extends ScalarTypeJsonCollection> implements ScalarTypeArray { - private static ScalarTypeArraySet UUID = new ScalarTypeArraySet("uuid", DocPropertyType.UUID, ArrayElementConverter.UUID); - private static ScalarTypeArraySet LONG = new ScalarTypeArraySet("bigint", DocPropertyType.LONG, ArrayElementConverter.LONG); - private static ScalarTypeArraySet INTEGER = new ScalarTypeArraySet("integer", DocPropertyType.INTEGER, ArrayElementConverter.INTEGER); - private static ScalarTypeArraySet DOUBLE = new ScalarTypeArraySet("float", DocPropertyType.DOUBLE, ArrayElementConverter.DOUBLE); - private static ScalarTypeArraySet STRING = new ScalarTypeArraySet("varchar", DocPropertyType.TEXT, ArrayElementConverter.STRING); + private static final ScalarTypeArraySet UUID = new ScalarTypeArraySet<>("uuid", DocPropertyType.UUID, ArrayElementConverter.UUID); + private static final ScalarTypeArraySet LONG = new ScalarTypeArraySet<>("bigint", DocPropertyType.LONG, ArrayElementConverter.LONG); + private static final ScalarTypeArraySet INTEGER = new ScalarTypeArraySet<>("integer", DocPropertyType.INTEGER, ArrayElementConverter.INTEGER); + private static final ScalarTypeArraySet DOUBLE = new ScalarTypeArraySet<>("float", DocPropertyType.DOUBLE, ArrayElementConverter.DOUBLE); + private static final ScalarTypeArraySet STRING = new ScalarTypeArraySet<>("varchar", DocPropertyType.TEXT, ArrayElementConverter.STRING); static PlatformArrayTypeFactory factory() { return new Factory(); @@ -37,7 +37,7 @@ public class ScalarTypeArraySet extends ScalarTypeJsonCollection implements * Return the ScalarType to use based on the List's generic parameter type. */ @Override - public ScalarTypeArraySet typeFor(Type valueType) { + public ScalarTypeArraySet typeFor(Type valueType) { if (valueType.equals(UUID.class)) { return UUID; } @@ -59,10 +59,11 @@ public class ScalarTypeArraySet extends ScalarTypeJsonCollection implements private final String arrayType; - private final ArrayElementConverter converter; + private final ArrayElementConverter converter; - public ScalarTypeArraySet(String arrayType, DocPropertyType docPropertyType, ArrayElementConverter converter) { - super(Set.class, Types.ARRAY, docPropertyType); + @SuppressWarnings({ "unchecked", "rawtypes" }) + public ScalarTypeArraySet(String arrayType, DocPropertyType docPropertyType, ArrayElementConverter converter) { + super((Class)Set.class, Types.ARRAY, docPropertyType); this.arrayType = arrayType; this.converter = converter; } @@ -80,21 +81,20 @@ public class ScalarTypeArraySet extends ScalarTypeJsonCollection implements return arrayType + "[]"; } - @SuppressWarnings("unchecked") - private Set fromArray(Object[] array1) { - Set set = new LinkedHashSet(); + private Set fromArray(Object[] array1) { + Set set = new LinkedHashSet<>(); for (Object element : array1) { set.add(converter.toElement(element)); } - return new ModifyAwareSet(set); + return new ModifyAwareSet<>(set); } - protected Object[] toArray(Set value) { + protected Object[] toArray(Set value) { return value.toArray(); } @Override - public Set read(DataReader reader) throws SQLException { + public Set read(DataReader reader) throws SQLException { Array array = reader.getArray(); if (array == null) { return null; @@ -104,7 +104,7 @@ public class ScalarTypeArraySet extends ScalarTypeJsonCollection implements } @Override - public void bind(DataBind bind, Set value) throws SQLException { + public void bind(DataBind bind, Set value) throws SQLException { if (value == null) { bind.setNull(Types.ARRAY); } else { @@ -113,7 +113,7 @@ public class ScalarTypeArraySet extends ScalarTypeJsonCollection implements } @Override - public String formatValue(Set value) { + public String formatValue(Set value) { try { return EJson.write(value); } catch (IOException e) { @@ -122,7 +122,7 @@ public class ScalarTypeArraySet extends ScalarTypeJsonCollection implements } @Override - public Set parse(String value) { + public Set parse(String value) { try { return EJson.parseSet(value, false); } catch (IOException e) { @@ -131,12 +131,12 @@ public class ScalarTypeArraySet extends ScalarTypeJsonCollection implements } @Override - public Set jsonRead(JsonParser parser) throws IOException { + public Set jsonRead(JsonParser parser) throws IOException { return EJson.parseSet(parser, parser.getCurrentToken()); } @Override - public void jsonWrite(JsonGenerator writer, Set value) throws IOException { + public void jsonWrite(JsonGenerator writer, Set value) throws IOException { EJson.write(value, writer); } diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java index aa8a2a23a..03aa65a6c 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java @@ -6,17 +6,17 @@ import java.lang.reflect.Type; import java.sql.SQLException; import java.sql.Types; import java.util.Set; - +import java.util.UUID; /** * H2 database support for DB ARRAY. */ -class ScalarTypeArraySetH2 extends ScalarTypeArraySet { +class ScalarTypeArraySetH2 extends ScalarTypeArraySet { - private static ScalarTypeArraySetH2 UUID = new ScalarTypeArraySetH2("uuid", DocPropertyType.UUID, ArrayElementConverter.UUID); - private static ScalarTypeArraySetH2 LONG = new ScalarTypeArraySetH2("bigint", DocPropertyType.LONG, ArrayElementConverter.LONG); - private static ScalarTypeArraySetH2 INTEGER = new ScalarTypeArraySetH2("integer", DocPropertyType.INTEGER, ArrayElementConverter.INTEGER); - private static ScalarTypeArraySetH2 DOUBLE = new ScalarTypeArraySetH2("double", DocPropertyType.DOUBLE, ArrayElementConverter.DOUBLE); - private static ScalarTypeArraySetH2 STRING = new ScalarTypeArraySetH2("varchar", DocPropertyType.TEXT, ArrayElementConverter.STRING); + private static final ScalarTypeArraySetH2 UUID = new ScalarTypeArraySetH2<>("uuid", DocPropertyType.UUID, ArrayElementConverter.UUID); + private static final ScalarTypeArraySetH2 LONG = new ScalarTypeArraySetH2<>("bigint", DocPropertyType.LONG, ArrayElementConverter.LONG); + private static final ScalarTypeArraySetH2 INTEGER = new ScalarTypeArraySetH2<>("integer", DocPropertyType.INTEGER, ArrayElementConverter.INTEGER); + private static final ScalarTypeArraySetH2 DOUBLE = new ScalarTypeArraySetH2<>("double", DocPropertyType.DOUBLE, ArrayElementConverter.DOUBLE); + private static final ScalarTypeArraySetH2 STRING = new ScalarTypeArraySetH2<>("varchar", DocPropertyType.TEXT, ArrayElementConverter.STRING); static PlatformArrayTypeFactory factory() { return new ScalarTypeArraySetH2.Factory(); @@ -28,7 +28,7 @@ class ScalarTypeArraySetH2 extends ScalarTypeArraySet { * Return the ScalarType to use based on the List's generic parameter type. */ @Override - public ScalarTypeArraySetH2 typeFor(Type valueType) { + public ScalarTypeArraySetH2 typeFor(Type valueType) { if (valueType.equals(java.util.UUID.class)) { return UUID; } @@ -48,12 +48,12 @@ class ScalarTypeArraySetH2 extends ScalarTypeArraySet { } } - private ScalarTypeArraySetH2(String arrayType, DocPropertyType docPropertyType, ArrayElementConverter converter) { + private ScalarTypeArraySetH2(String arrayType, DocPropertyType docPropertyType, ArrayElementConverter converter) { super(arrayType, docPropertyType, converter); } @Override - public void bind(DataBind bind, Set value) throws SQLException { + public void bind(DataBind bind, Set value) throws SQLException { if (value == null) { bind.setNull(Types.ARRAY); } else { diff --git a/src/main/java/io/ebeaninternal/server/type/TypeManager.java b/src/main/java/io/ebeaninternal/server/type/TypeManager.java index 6deee5612..9e5e39aec 100644 --- a/src/main/java/io/ebeaninternal/server/type/TypeManager.java +++ b/src/main/java/io/ebeaninternal/server/type/TypeManager.java @@ -17,6 +17,7 @@ public interface TypeManager { /** * Register a ScalarType for an Enum with can have multiple classes. */ + @SuppressWarnings("rawtypes") void addEnumType(ScalarType type, Class myEnumClass); /** diff --git a/src/test/java/io/ebean/StringHelperTest.java b/src/test/java/io/ebean/StringHelperTest.java index 9c300c0cb..40eaf32d4 100644 --- a/src/test/java/io/ebean/StringHelperTest.java +++ b/src/test/java/io/ebean/StringHelperTest.java @@ -1,9 +1,7 @@ package io.ebean; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.*; -import java.util.HashMap; import java.util.Map; import org.junit.Test; diff --git a/src/test/java/io/ebean/dbmigration/DbMigrationGenerateTest.java b/src/test/java/io/ebean/dbmigration/DbMigrationGenerateTest.java index 1d38b8ec7..54846b2e3 100644 --- a/src/test/java/io/ebean/dbmigration/DbMigrationGenerateTest.java +++ b/src/test/java/io/ebean/dbmigration/DbMigrationGenerateTest.java @@ -1,6 +1,5 @@ package io.ebean.dbmigration; -import io.ebean.BaseTestCase; import io.ebean.EbeanServer; import io.ebean.EbeanServerFactory; import io.ebean.Platform; diff --git a/src/test/java/io/ebean/json/EJsonTests.java b/src/test/java/io/ebean/json/EJsonTests.java index 368967a06..b3d311c7c 100644 --- a/src/test/java/io/ebean/json/EJsonTests.java +++ b/src/test/java/io/ebean/json/EJsonTests.java @@ -286,6 +286,7 @@ public class EJsonTests { } @Test + @SuppressWarnings({ "rawtypes", "unchecked" }) public void parseSet_when_modifyAware() throws IOException { String jsonInput = "[{\"name\":\"rob\",\"age\":12},{\"name\":\"jim\",\"age\":42}]"; @@ -308,7 +309,7 @@ public class EJsonTests { String jsonInput = "[{\"name\":\"rob\",\"age\":12},{\"name\":\"jim\",\"age\":42}]"; - Set set = EJson.parseSet(jsonInput, false); + Set set = EJson.parseSet(jsonInput, false); assertTrue(set instanceof LinkedHashSet); } } diff --git a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java index d64579d27..91623ca4b 100644 --- a/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java @@ -709,16 +709,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer { } - @Override - public T execute(TxScope scope, TxCallable c) { - return null; - } - - @Override - public T execute(TxCallable c) { - return null; - } - @Override public T executeCall(TxScope scope, Callable callable) { return null; diff --git a/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java index f7ffd16f5..881614304 100644 --- a/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java +++ b/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java @@ -18,6 +18,7 @@ public class BeanPropertyAssocManyTest extends BaseTestCase { BeanDescriptor customerDesc = spiEbeanServer().getBeanDescriptor(Customer.class); + @SuppressWarnings("unchecked") BeanPropertyAssocMany contacts() { return (BeanPropertyAssocMany) customerDesc.getBeanProperty("contacts"); } diff --git a/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java index bbd9325a9..a355c5577 100644 --- a/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java +++ b/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java @@ -88,6 +88,7 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase { BeanDescriptor rcustDesc = spiServer.getBeanDescriptor(RCustomer.class); + @SuppressWarnings("unchecked") Map idForJson = (Map) rcustDesc.getIdForJson(rCustomer); assertEquals("comp", idForJson.get("company")); assertEquals("fred", idForJson.get("name")); diff --git a/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java b/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java index 149b620db..9357e06e6 100644 --- a/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionListTest.java @@ -8,13 +8,13 @@ import static org.assertj.core.api.StrictAssertions.assertThat; public class DefaultExpressionListTest extends BaseExpressionTest { - DefaultExpressionList exp() { + DefaultExpressionList exp() { return new DefaultExpressionList<>(null, new DefaultExpressionFactory(true, true), null); } - private DefaultExpressionList spi(ExpressionList list) { - return (DefaultExpressionList) list; + private DefaultExpressionList spi(ExpressionList list) { + return (DefaultExpressionList) list; } @Test diff --git a/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java index f5fe6b782..b2a4c17b8 100644 --- a/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/InExpressionTest.java @@ -69,7 +69,7 @@ public class InExpressionTest extends BaseExpressionTest { } private List values(int... vals) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for (int val : vals) { list.add(val); } diff --git a/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java index 57a1cd4b2..fe2e1224e 100644 --- a/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/JunctionExpressionTest.java @@ -21,11 +21,11 @@ public class JunctionExpressionTest extends BaseExpressionTest { return list; } - JunctionExpression and(DefaultExpressionList list) { + JunctionExpression and(DefaultExpressionList list) { return new JunctionExpression<>(Junction.Type.AND, list); } - JunctionExpression or(DefaultExpressionList list) { + JunctionExpression or(DefaultExpressionList list) { return new JunctionExpression<>(Junction.Type.OR, list); } diff --git a/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java b/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java index 2ecec367e..b33019cce 100644 --- a/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java +++ b/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java @@ -90,7 +90,7 @@ public class PrepareDocNestedTest extends BaseTestCase { JunctionExpression junction = (JunctionExpression) underlyingList.get(0); List junctionUnderlying = junction.exprList.getUnderlyingList(); - JunctionExpression nestedNestedPath = (JunctionExpression) junctionUnderlying.get(1); + JunctionExpression nestedNestedPath = (JunctionExpression) junctionUnderlying.get(1); assertEquals(nestedNestedPath.exprList.allDocNestedPath, "details"); } diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java index 4e6e1922c..395680f48 100644 --- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java +++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java @@ -467,7 +467,7 @@ public class EqlParserTest extends BaseTestCase { private Query parse(String raw) { Query query = Ebean.find(Customer.class); - EqlParser.parse(raw, (SpiQuery) query); + EqlParser.parse(raw, (SpiQuery) query); return query; } diff --git a/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java b/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java index 4af908aea..95fda1082 100644 --- a/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java +++ b/src/test/java/io/ebeaninternal/server/persist/BatchedBeanHolderTest.java @@ -13,6 +13,7 @@ import static org.junit.Assert.assertEquals; public class BatchedBeanHolderTest { + @SuppressWarnings({ "rawtypes", "unchecked" }) @Test public void testAppend() throws Exception { diff --git a/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java b/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java index 00bdc25ea..35f3cf546 100644 --- a/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java +++ b/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java @@ -69,12 +69,12 @@ public class OrderVersionDescTest { } private Version atNull() { - return new Version(); + return new Version<>(); } - private Version at(long diff) { + private Version at(long diff) { Timestamp timestamp = new Timestamp(now + diff); - Version ver = new Version(); + Version ver = new Version<>(); ver.setStart(timestamp); return ver; } diff --git a/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java b/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java index 98fbd8d2d..ba4143a92 100644 --- a/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ModifyAwareListTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue; public class ModifyAwareListTest { private ModifyAwareList createList() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.addAll(Arrays.asList("A", "B", "C", "D", "E")); return new ModifyAwareList<>(list); } @@ -265,6 +265,7 @@ public class ModifyAwareListTest { ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray()); ObjectInputStream ois = new ObjectInputStream(is); + @SuppressWarnings("unchecked") ModifyAwareList read = (ModifyAwareList)ois.readObject(); assertThat(read).contains("A", "B", "C", "D", "E"); } diff --git a/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java b/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java index 94cbf6ce7..c654dc633 100644 --- a/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java @@ -202,6 +202,7 @@ public class ModifyAwareMapTest { ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray()); ObjectInputStream ois = new ObjectInputStream(is); + @SuppressWarnings("unchecked") ModifyAwareMap read = (ModifyAwareMap)ois.readObject(); assertThat(read).hasSize(orig.size()); } diff --git a/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java b/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java index dbe0b3226..5371b14e9 100644 --- a/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ModifyAwareSetTest.java @@ -33,6 +33,7 @@ public class ModifyAwareSetTest { ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray()); ObjectInputStream ois = new ObjectInputStream(is); + @SuppressWarnings("unchecked") ModifyAwareSet read = (ModifyAwareSet)ois.readObject(); assertThat(read).contains("A", "B", "C", "D", "E"); } diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java index d31050174..c9173d58f 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationTest.java @@ -98,7 +98,7 @@ public class ScalarTypeDurationTest { Duration duration = Duration.ofSeconds(1234); - JsonTester jsonTester = new JsonTester(type); + JsonTester jsonTester = new JsonTester<>(type); jsonTester.test(duration); } diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java index 82f60a2be..f3fd9ff62 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java @@ -98,7 +98,7 @@ public class ScalarTypeDurationWithNanosTest { Duration duration = Duration.ofSeconds(323, 1500000); - JsonTester jsonTester = new JsonTester(type); + JsonTester jsonTester = new JsonTester<>(type); jsonTester.test(duration); } diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java index f358a131f..f2593c08e 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeInstantTest.java @@ -118,15 +118,15 @@ public class ScalarTypeInstantTest { Instant now = Instant.now(); - JsonTester jsonTester = new JsonTester(type); + JsonTester jsonTester = new JsonTester<>(type); jsonTester.test(now); ScalarTypeInstant typeNanos = new ScalarTypeInstant(JsonConfig.DateTime.NANOS); - jsonTester = new JsonTester(typeNanos); + jsonTester = new JsonTester<>(typeNanos); jsonTester.test(now); ScalarTypeInstant typeIso = new ScalarTypeInstant(JsonConfig.DateTime.ISO8601); - jsonTester = new JsonTester(typeIso); + jsonTester = new JsonTester<>(typeIso); jsonTester.test(now); } diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java index 120f20ff4..b4dd13014 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTimeTest.java @@ -76,15 +76,15 @@ public class ScalarTypeLocalDateTimeTest { LocalDateTime now = LocalDateTime.now(); - JsonTester jsonTester = new JsonTester(type); + JsonTester jsonTester = new JsonTester<>(type); jsonTester.test(now); ScalarTypeLocalDateTime typeNanos = new ScalarTypeLocalDateTime(JsonConfig.DateTime.NANOS); - jsonTester = new JsonTester(typeNanos); + jsonTester = new JsonTester<>(typeNanos); jsonTester.test(now); ScalarTypeLocalDateTime typeIso = new ScalarTypeLocalDateTime(JsonConfig.DateTime.ISO8601); - jsonTester = new JsonTester(typeIso); + jsonTester = new JsonTester<>(typeIso); jsonTester.test(now); } } diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java index ef2db5270..c2e73356f 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java @@ -95,7 +95,7 @@ public class ScalarTypeLocalTimeTest { LocalTime localTime = LocalTime.of(9, 23, 45); - JsonTester jsonTester = new JsonTester(type); + JsonTester jsonTester = new JsonTester<>(type); jsonTester.test(localTime); } diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java index b2f42946a..a415a0dd7 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java @@ -94,7 +94,7 @@ public class ScalarTypeLocalTimeWithNanosTest { LocalTime localTime = LocalTime.of(9, 23, 45); - JsonTester jsonTester = new JsonTester(type); + JsonTester jsonTester = new JsonTester<>(type); jsonTester.test(localTime); } diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java index 1f2ae9ebf..eb2bba0a7 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java @@ -63,15 +63,15 @@ public class ScalarTypeOffsetDateTimeTest { OffsetDateTime now = OffsetDateTime.now(); - JsonTester jsonTester = new JsonTester(type); + JsonTester jsonTester = new JsonTester<>(type); jsonTester.test(now); ScalarTypeOffsetDateTime typeNanos = new ScalarTypeOffsetDateTime(JsonConfig.DateTime.NANOS); - jsonTester = new JsonTester(typeNanos); + jsonTester = new JsonTester<>(typeNanos); jsonTester.test(now); ScalarTypeOffsetDateTime typeIso = new ScalarTypeOffsetDateTime(JsonConfig.DateTime.ISO8601); - jsonTester = new JsonTester(typeIso); + jsonTester = new JsonTester<>(typeIso); jsonTester.test(now); } } diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java index 72732eea6..be37fb162 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearTest.java @@ -91,7 +91,7 @@ public class ScalarTypeYearTest { @Test public void testJson() throws Exception { - JsonTester jsonTester = new JsonTester(type); + JsonTester jsonTester = new JsonTester<>(type); jsonTester.test(Year.of(2013)); } diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java index b5494963b..b9d40b708 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java @@ -64,15 +64,15 @@ public class ScalarTypeZonedDateTimeTest { ZonedDateTime now = ZonedDateTime.now(); - JsonTester jsonTester = new JsonTester(type); + JsonTester jsonTester = new JsonTester<>(type); jsonTester.test(now); ScalarTypeZonedDateTime typeNanos = new ScalarTypeZonedDateTime(JsonConfig.DateTime.NANOS); - jsonTester = new JsonTester(typeNanos); + jsonTester = new JsonTester<>(typeNanos); jsonTester.test(now); ScalarTypeZonedDateTime typeIso = new ScalarTypeZonedDateTime(JsonConfig.DateTime.ISO8601); - jsonTester = new JsonTester(typeIso); + jsonTester = new JsonTester<>(typeIso); jsonTester.test(now); } } diff --git a/src/test/java/misc/migration/v1_0/EBasic.java b/src/test/java/misc/migration/v1_0/EBasic.java index 5d7842b85..ebdcceb3f 100644 --- a/src/test/java/misc/migration/v1_0/EBasic.java +++ b/src/test/java/misc/migration/v1_0/EBasic.java @@ -3,7 +3,6 @@ package misc.migration.v1_0; import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; import io.ebean.annotation.NotNull; -import misc.migration.v1_1.EUser; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/misc/migration/v1_1/EBasic.java b/src/test/java/misc/migration/v1_1/EBasic.java index 26d708ac1..0429d78e0 100644 --- a/src/test/java/misc/migration/v1_1/EBasic.java +++ b/src/test/java/misc/migration/v1_1/EBasic.java @@ -1,6 +1,5 @@ package misc.migration.v1_1; -import io.ebean.Platform; import io.ebean.annotation.DbDefault; import io.ebean.annotation.DbMigration; import io.ebean.annotation.EnumValue; diff --git a/src/test/java/misc/migration/v1_2/EBasic.java b/src/test/java/misc/migration/v1_2/EBasic.java index 3dc070818..16f459775 100644 --- a/src/test/java/misc/migration/v1_2/EBasic.java +++ b/src/test/java/misc/migration/v1_2/EBasic.java @@ -4,7 +4,6 @@ import io.ebean.annotation.DbDefault; import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; import io.ebean.annotation.NotNull; -import misc.migration.v1_1.EUser; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java b/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java index ae3d5caf9..b0fd5efa5 100644 --- a/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java +++ b/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java @@ -19,7 +19,7 @@ public class TestBatchInsertWithInitialisedCollection extends BaseTestCase { public void test() { - List list = new ArrayList(); + List list = new ArrayList<>(); for (int i = 0; i < 3; i++) { OCachedBean bean = new OCachedBean(); diff --git a/src/test/java/org/tests/model/survey/Category.java b/src/test/java/org/tests/model/survey/Category.java index baeae2f96..c40114a4f 100644 --- a/src/test/java/org/tests/model/survey/Category.java +++ b/src/test/java/org/tests/model/survey/Category.java @@ -41,4 +41,8 @@ public class Category { public void setSequenceNumber(int number) { this.sequenceNumber = number; } + + public int getSequenceNumber() { + return sequenceNumber; + } } diff --git a/src/test/java/org/tests/model/survey/Group.java b/src/test/java/org/tests/model/survey/Group.java index 278864a4c..df4846938 100644 --- a/src/test/java/org/tests/model/survey/Group.java +++ b/src/test/java/org/tests/model/survey/Group.java @@ -44,4 +44,8 @@ public class Group { public void setSequenceNumber(int number) { this.sequenceNumber = number; } + + public int getSequenceNumber() { + return sequenceNumber; + } } diff --git a/src/test/java/org/tests/model/survey/Question.java b/src/test/java/org/tests/model/survey/Question.java index f133a9988..49038c9a4 100644 --- a/src/test/java/org/tests/model/survey/Question.java +++ b/src/test/java/org/tests/model/survey/Question.java @@ -26,4 +26,7 @@ public class Question { this.sequenceNumber = number; } + public int getSequenceNumber() { + return sequenceNumber; + } } diff --git a/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java b/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java index 397602566..7c7d20a34 100644 --- a/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java +++ b/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java @@ -42,6 +42,7 @@ public class TestInheritQuery extends BaseTestCase { Assert.assertTrue(rereadZone instanceof ZoneExternal); } + @SuppressWarnings("unlikely-arg-type") @Test public void testDiscriminator_bug417() { diff --git a/src/test/java/org/tests/transaction/TestBatchModelFlush.java b/src/test/java/org/tests/transaction/TestBatchModelFlush.java index 16a8cd684..c176392a1 100644 --- a/src/test/java/org/tests/transaction/TestBatchModelFlush.java +++ b/src/test/java/org/tests/transaction/TestBatchModelFlush.java @@ -8,6 +8,7 @@ import org.tests.model.m2m.MnyB; public class TestBatchModelFlush extends BaseTestCase { + @SuppressWarnings("static-access") @Transactional(batchSize = 50) @Test public void insert() { diff --git a/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java b/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java index daef5bf12..796e1b8a0 100644 --- a/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java +++ b/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java @@ -63,7 +63,7 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase { private void testPartiallyLoaded(Integer id1, Integer id2) { - List ids = new ArrayList(); + List ids = new ArrayList<>(); ids.add(id1); ids.add(id2);