From e6c9f151c17ee37d9951b0e7ff3b395a28ad9119 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Fri, 28 Jun 2019 23:20:57 +1200 Subject: [PATCH] #1738 - Refactor tidy suppressWarnings and access --- .../java/io/ebean/config/ServerConfig.java | 1 + .../java/io/ebean/plugin/ExpressionPath.java | 2 +- .../server/deploy/BeanDescriptor.java | 31 +++++++------------ .../server/deploy/BeanPropertyAssoc.java | 1 + .../server/deploy/BeanPropertyIdClass.java | 1 + .../deploy/meta/DeployBeanDescriptor.java | 1 + .../deploy/parse/AnnotationAssocManys.java | 1 + .../expression/DefaultExpressionList.java | 2 +- .../ebeaninternal/server/persist/Binder.java | 2 +- .../io/ebeaninternal/server/query/CQuery.java | 7 ++--- .../server/query/CQueryBindCapture.java | 2 +- .../server/querydefn/DefaultOrmQuery.java | 1 + 12 files changed, 25 insertions(+), 27 deletions(-) diff --git a/src/main/java/io/ebean/config/ServerConfig.java b/src/main/java/io/ebean/config/ServerConfig.java index d5fb6092e..76cb0654c 100644 --- a/src/main/java/io/ebean/config/ServerConfig.java +++ b/src/main/java/io/ebean/config/ServerConfig.java @@ -653,6 +653,7 @@ public class ServerConfig { * @param cls The type of the service object to obtain * @return The service object given the class type */ + @SuppressWarnings("unchecked") public

P getServiceObject(Class

cls) { return (P) serviceObject.get(serviceObjectKey(cls)); } diff --git a/src/main/java/io/ebean/plugin/ExpressionPath.java b/src/main/java/io/ebean/plugin/ExpressionPath.java index a1ab051f3..45de4c66b 100644 --- a/src/main/java/io/ebean/plugin/ExpressionPath.java +++ b/src/main/java/io/ebean/plugin/ExpressionPath.java @@ -77,7 +77,7 @@ public interface ExpressionPath { /** * Return the underlying bean property. */ - public Property getProperty(); + Property getProperty(); /** * The ElPrefix plus name. diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index d6c6d722a..f0a269f57 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -235,7 +235,7 @@ public class BeanDescriptor implements BeanType, STreeType { /** * Map of BeanProperty Linked so as to preserve order. */ - protected final LinkedHashMap propMap; + private final LinkedHashMap propMap; /** * Map of DB column to property path (for nativeSql mapping). @@ -252,7 +252,7 @@ public class BeanDescriptor implements BeanType, STreeType { */ final Class beanType; - protected final Class rootBeanType; + final Class rootBeanType; /** * This is not sent to a remote client. @@ -287,11 +287,6 @@ public class BeanDescriptor implements BeanType, STreeType { */ private final ChangeLogFilter changeLogFilter; - /** - * The table joins for this bean. - */ - private final TableJoin[] derivedTableJoins; - /** * Inheritance information. Server side only. */ @@ -374,7 +369,7 @@ public class BeanDescriptor implements BeanType, STreeType { * All non transient properties excluding the id properties. */ private final BeanProperty[] propertiesNonTransient; - protected final BeanProperty[] propertiesIndex; + final BeanProperty[] propertiesIndex; private final BeanProperty[] propertiesGenInsert; private final BeanProperty[] propertiesGenUpdate; private final List propertiesUnique = new ArrayList<>(); @@ -423,7 +418,7 @@ public class BeanDescriptor implements BeanType, STreeType { private final BeanDescriptorDraftHelp draftHelp; private final BeanDescriptorCacheHelp cacheHelp; - final BeanDescriptorJsonHelp jsonHelp; + private final BeanDescriptorJsonHelp jsonHelp; private DocStoreBeanAdapter docStoreAdapter; private DocumentMapping docMapping; private boolean docStoreEmbeddedInvalidation; @@ -529,8 +524,6 @@ public class BeanDescriptor implements BeanType, STreeType { this.propertiesGenInsert = listHelper.getGeneratedInsert(); this.propertiesGenUpdate = listHelper.getGeneratedUpdate(); - this.derivedTableJoins = listHelper.getTableJoin(); - boolean noRelationships = propertiesOne.length + propertiesMany.length == 0; this.cacheSharableBeans = noRelationships && deploy.getCacheOptions().isReadOnly(); @@ -655,7 +648,7 @@ public class BeanDescriptor implements BeanType, STreeType { /** * Return true if this is an abstract type. */ - public boolean isAbstractType() { + boolean isAbstractType() { return abstractType; } @@ -689,7 +682,7 @@ public class BeanDescriptor implements BeanType, STreeType { * as they are used to get the imported and exported properties. *

*/ - public void initialiseId(BeanDescriptorInitContext initContext) { + void initialiseId(BeanDescriptorInitContext initContext) { if (logger.isTraceEnabled()) { logger.trace("BeanDescriptor initialise " + fullName); @@ -783,7 +776,7 @@ public class BeanDescriptor implements BeanType, STreeType { /** * Perform last initialisation for the descriptor. */ - public void initLast() { + void initLast() { for (BeanProperty prop : propertiesNonTransient) { if (prop.isUnique()) { @@ -825,7 +818,7 @@ public class BeanDescriptor implements BeanType, STreeType { * Initialise the document mapping. */ @SuppressWarnings("unchecked") - public void initialiseDocMapping() { + void initialiseDocMapping() { for (BeanPropertyAssocMany many : propertiesMany) { many.initialisePostTarget(); } @@ -840,7 +833,7 @@ public class BeanDescriptor implements BeanType, STreeType { cacheHelp.deriveNotifyFlags(); } - public void initInheritInfo() { + void initInheritInfo() { if (inheritInfo != null) { // need to check every BeanDescriptor in the inheritance hierarchy if (saveRecurseSkippable) { @@ -894,7 +887,7 @@ public class BeanDescriptor implements BeanType, STreeType { /** * Return the ReadAuditPrepare for preparing read audit events prior to logging. */ - public ReadAuditPrepare getReadAuditPrepare() { + private ReadAuditPrepare getReadAuditPrepare() { return ebeanServer.getReadAuditPrepare(); } @@ -980,7 +973,7 @@ public class BeanDescriptor implements BeanType, STreeType { /** * Populate the diff for inserts with flattened non-null property values. */ - protected void jsonWriteForInsert(SpiJsonWriter jsonWriter, EntityBean newBean) throws IOException { + void jsonWriteForInsert(SpiJsonWriter jsonWriter, EntityBean newBean) throws IOException { jsonWriter.writeStartObject(); for (BeanProperty prop : propertiesBaseScalar) { prop.jsonWriteForInsert(jsonWriter, newBean); @@ -1057,7 +1050,7 @@ public class BeanDescriptor implements BeanType, STreeType { elDeployCache.put(fkey.getName(), fkey); } - public void initialiseFkeys() { + void initialiseFkeys() { for (BeanPropertyAssocOne aPropertiesOneImported : propertiesOneImported) { if (!aPropertiesOneImported.isFormula()) { aPropertiesOneImported.addFkey(); diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java index 782ee8043..b8915f710 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java @@ -107,6 +107,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty implements STree /** * Copy constructor for ManyToOne inside Embeddable. */ + @SuppressWarnings("unchecked") public BeanPropertyAssoc(BeanPropertyAssoc source, BeanPropertyOverride override) { super(source, override); foreignKey = source.foreignKey; diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyIdClass.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyIdClass.java index bd8486b39..45d3614c3 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyIdClass.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyIdClass.java @@ -8,6 +8,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; */ public class BeanPropertyIdClass extends BeanPropertyAssocOne { + @SuppressWarnings("unchecked") public BeanPropertyIdClass(BeanDescriptorMap owner, BeanDescriptor descriptor, DeployBeanPropertyAssocOne deploy) { super(owner, descriptor, deploy); } diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java index bf51ceea6..15f9e9723 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java +++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java @@ -1267,6 +1267,7 @@ public class DeployBeanDescriptor { /** * Returns the jackson annotated class, if jackson is present. */ + @SuppressWarnings("unchecked") public Object /*AnnotatedClass*/ getJacksonAnnotatedClass() { if (jacksonAnnotatedClass == null) { jacksonAnnotatedClass = new DeployBeanObtainJackson(serverConfig, beanType).obtain(); diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java index 1914051aa..1fd035739 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java +++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java @@ -183,6 +183,7 @@ class AnnotationAssocManys extends AnnotationParser { } } + @SuppressWarnings("unchecked") private void readElementCollection(DeployBeanPropertyAssocMany prop, ElementCollection elementCollection) { prop.setElementCollection(); diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java index 35a388094..33cd9dd2e 100644 --- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java +++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java @@ -495,7 +495,7 @@ public class DefaultExpressionList implements SpiExpressionList { } @Override - public Query select(FetchGroup fetchGroup) { + public Query select(FetchGroup fetchGroup) { return query.select(fetchGroup); } diff --git a/src/main/java/io/ebeaninternal/server/persist/Binder.java b/src/main/java/io/ebeaninternal/server/persist/Binder.java index 666b3660a..ae1d23c04 100644 --- a/src/main/java/io/ebeaninternal/server/persist/Binder.java +++ b/src/main/java/io/ebeaninternal/server/persist/Binder.java @@ -108,7 +108,7 @@ public class Binder { if (isLob(dt)) { bindBuf.append("[LOB]"); } else { - bindBuf.append(String.valueOf(val)); + bindBuf.append(val); } } } diff --git a/src/main/java/io/ebeaninternal/server/query/CQuery.java b/src/main/java/io/ebeaninternal/server/query/CQuery.java index ae0a376ff..6d5a2637e 100644 --- a/src/main/java/io/ebeaninternal/server/query/CQuery.java +++ b/src/main/java/io/ebeaninternal/server/query/CQuery.java @@ -198,6 +198,7 @@ public class CQuery implements DbReadContext, CancelableQuery, SpiProfileTran /** * Create the Sql select based on the request. */ + @SuppressWarnings("unchecked") public CQuery(OrmQueryRequest request, CQueryPredicates predicates, CQueryPlan queryPlan) { this.request = request; this.audit = request.isAuditReads(); @@ -569,13 +570,11 @@ public class CQuery implements DbReadContext, CancelableQuery, SpiProfileTran return null; } + @SuppressWarnings("unchecked") BeanCollection readCollection() throws SQLException { - while (hasNext()) { - EntityBean bean = next(); - help.add(collection, bean, false); + help.add(collection, next(), false); } - updateExecutionStatistics(); return collection; } diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java b/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java index 90c4a1e72..dceb4fc52 100644 --- a/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java @@ -5,7 +5,7 @@ import io.ebeaninternal.server.type.bindcapture.BindCapture; class CQueryBindCapture { - private final double multiplier = 1.3d; + private static final double multiplier = 1.3d; private final CQueryPlan cQueryPlan; private final QueryPlanLogger planLogger; diff --git a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 56a7c35c2..1e9a40ada 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -1718,6 +1718,7 @@ public class DefaultOrmQuery implements SpiQuery { return beanDescriptor.getBeanType(); } + @SuppressWarnings("unchecked") @Override public Query setInheritType(Class type) { if (type == beanType) {