From 30a0935300dab479d12708c4810076d5386a21ed Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Fri, 28 Jun 2019 23:04:20 +1200 Subject: [PATCH] #1738 - Refactor tidy suppressWarnings --- src/main/java/io/ebean/common/BeanMap.java | 2 +- .../ebeaninternal/server/core/DefaultServer.java | 1 - .../server/deploy/BeanDescriptorManager.java | 3 +-- .../server/deploy/meta/DeployBeanProperty.java | 2 +- .../deploy/meta/DeployBeanPropertyLists.java | 2 +- .../server/deploy/meta/DeployBeanTable.java | 2 +- .../server/deploy/parse/AnnotationFields.java | 2 +- .../deploy/parse/DeployCreateProperties.java | 4 ++-- .../ebeaninternal/server/el/ElMatchBuilder.java | 2 +- .../server/persist/DefaultPersister.java | 15 +++++++-------- .../server/querydefn/OrmQueryProperties.java | 3 +-- .../server/type/ScalarTypeArraySetH2.java | 2 +- 12 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/main/java/io/ebean/common/BeanMap.java b/src/main/java/io/ebean/common/BeanMap.java index 406bd9f17..8277223c0 100644 --- a/src/main/java/io/ebean/common/BeanMap.java +++ b/src/main/java/io/ebean/common/BeanMap.java @@ -237,7 +237,7 @@ public final class BeanMap extends AbstractBeanCollection implements Ma } @Override - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked"}) public Set> entrySet() { init(); if (isReadOnly()) { diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 8fa29c15d..b12ef4754 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -658,7 +658,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { *

*/ @Override - @SuppressWarnings("unchecked") public T createEntityBean(Class type) { return getBeanDescriptor(type).createBean(); } diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index d00728013..6c2ab9114 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -815,7 +815,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap { return new BeanTable(beanTable, this); } - @SuppressWarnings({"unchecked", "rawtypes"}) private void readEntityRelationships() { // We only perform 'circular' checks etc after we have @@ -1650,7 +1649,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap { return changeLogListener; } - public void addPrimaryKeyJoin(DeployBeanPropertyAssocOne prop) { + private void addPrimaryKeyJoin(DeployBeanPropertyAssocOne prop) { String baseTable = prop.getDesc().getBaseTable(); DeployTableJoin inverse = prop.getTableJoin().createInverse(baseTable); diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java index 4b38812d5..a4790d1fd 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java @@ -249,7 +249,7 @@ public class DeployBeanProperty { /** * Wrap the ScalarType using a ScalarTypeConverter. */ - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked"}) private ScalarType wrapScalarType(Class propertyType, ScalarType scalarType, ScalarTypeConverter typeConverter) { if (typeConverter == null) { return scalarType; diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java index b35d0a32d..1e1f35989 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java @@ -71,7 +71,7 @@ public class DeployBeanPropertyLists { private final BeanPropertyAssocOne unidirectional; private final BeanProperty orderColumn; - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked"}) public DeployBeanPropertyLists(BeanDescriptorMap owner, BeanDescriptor desc, DeployBeanDescriptor deploy) { this.desc = desc; diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java index 0693210dc..de0166876 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanTable.java @@ -54,7 +54,7 @@ public class DeployBeanTable { return idProperty == null ? null : createProperty(owner, idProperty); } - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked"}) private BeanProperty createProperty(BeanDescriptorMap owner, DeployBeanProperty prop) { if (prop instanceof DeployBeanPropertyAssocOne) { diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java index c140b4cc0..986dd0d92 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java @@ -496,7 +496,7 @@ public class AnnotationFields extends AnnotationParser { } } - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked"}) private ScalarTypeEncryptedWrapper createScalarType(DeployBeanProperty prop, ScalarType st) { // Use Java Encryptor wrapping the logical scalar type diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java index 1011eb23b..2ecb5ecd6 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java @@ -199,7 +199,7 @@ public class DeployCreateProperties { return null; } - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked"}) private DeployBeanProperty createManyType(DeployBeanDescriptor desc, Class targetType, ManyType manyType) { try { @@ -213,7 +213,7 @@ public class DeployCreateProperties { return new DeployBeanPropertyAssocMany(desc, targetType, manyType); } - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked"}) private DeployBeanProperty createProp(DeployBeanDescriptor desc, Field field) { Class propertyType = field.getType(); diff --git a/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java b/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java index 79c88d1d3..0cccfb9f4 100644 --- a/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java +++ b/src/main/java/io/ebeaninternal/server/el/ElMatchBuilder.java @@ -175,7 +175,7 @@ class ElMatchBuilder { final Set set; final ElPropertyValue elGetValue; - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked"}) public InSet(Set set, ElPropertyValue elGetValue) { this.set = new HashSet(set); this.elGetValue = elGetValue; diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index 28a22396a..1b8eea7bd 100644 --- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -1244,15 +1244,15 @@ public final class DefaultPersister implements Persister { * perform an insert, update or delete. */ private PersistRequestBean createRequest(T bean, Transaction t, PersistRequest.Type type) { - return createRequestInternal(bean, t, type, Flags.ZERO); + return createRequestInternal(bean, t, type); } /** * Create the Persist Request Object additionally specifying the publish status. */ - private PersistRequestBean createRequestInternal(T bean, Transaction t, PersistRequest.Type type, int flags) { + private PersistRequestBean createRequestInternal(T bean, Transaction t, PersistRequest.Type type) { BeanManager mgr = getBeanManager(bean); - return createRequest(bean, t, null, mgr, type, flags); + return createRequest(bean, t, null, mgr, type, Flags.ZERO); } /** @@ -1280,7 +1280,7 @@ public final class DefaultPersister implements Persister { * Create the Persist Request Object that wraps all the objects used to * perform an insert, update or delete. */ - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked"}) private PersistRequestBean createRequest(T bean, Transaction t, Object parentBean, BeanManager mgr, PersistRequest.Type type, int flags) { @@ -1292,13 +1292,12 @@ public final class DefaultPersister implements Persister { return createDeleteRequest(bean, t, type, Flags.unsetRecurse(flags)); } - @SuppressWarnings({"unchecked", "rawtypes"}) private PersistRequestBean createDeleteRequest(EntityBean bean, Transaction t, Type type) { return createDeleteRequest(bean, t, type, Flags.ZERO); } - @SuppressWarnings({"unchecked", "rawtypes"}) - public PersistRequestBean createDeleteRequest(Object bean, Transaction t, PersistRequest.Type type, int flags) { + @SuppressWarnings({"unchecked"}) + private PersistRequestBean createDeleteRequest(Object bean, Transaction t, PersistRequest.Type type, int flags) { BeanManager mgr = getBeanManager(bean); if (type == Type.DELETE_PERMANENT) { @@ -1308,7 +1307,7 @@ public final class DefaultPersister implements Persister { type = Type.DELETE_SOFT; } - PersistRequestBean request = new PersistRequestBean(server, (T)bean, null, mgr, (SpiTransaction) t, persistExecute, type, flags); + PersistRequestBean request = new PersistRequestBean<>(server, (T)bean, null, mgr, (SpiTransaction) t, persistExecute, type, flags); request.initForSoftDelete(); return request; } diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java index ca7a4828e..bc4d5d005 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java @@ -178,7 +178,6 @@ public class OrmQueryProperties implements Serializable { /** * Move a OrderBy.Property from the main query to this query join. */ - @SuppressWarnings("rawtypes") void addSecJoinOrderProperty(OrderBy.Property orderProp) { if (orderBy == null) { orderBy = new OrderBy(); @@ -194,7 +193,7 @@ public class OrmQueryProperties implements Serializable { * Return the expressions used to filter on this path. This should be a many path to use this * method. */ - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings({"unchecked"}) public SpiExpressionList filterMany(Query rootQuery) { if (filterMany == null) { FilterExprPath exprPath = new FilterExprPath(path); diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java index 86bc471b5..d311d666b 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java @@ -49,7 +49,7 @@ class ScalarTypeArraySetH2 extends ScalarTypeArraySet { } @Override - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"rawtypes"}) public ScalarTypeArraySetH2 typeForEnum(ScalarType scalarType) { return new ScalarTypeArraySetH2("varchar", DocPropertyType.TEXT, new ArrayElementConverter.EnumConverter(scalarType)); }