From 0e3f47ee82934d3cc4adea529a30f43e9aa4a764 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Mon, 26 Feb 2018 22:15:19 +0100 Subject: [PATCH] No effective code change: Fixwarnings, overrides, generics etc. (#1285) --- src/main/java/io/ebean/Pairs.java | 2 + src/main/java/io/ebean/bean/CallStack.java | 1 + .../config/dbplatform/DatabasePlatform.java | 2 +- .../dbplatform/SequenceBatchIdGenerator.java | 1 + .../dbplatform/SequenceStepIdGenerator.java | 1 + .../ebean/config/properties/YamlLoader.java | 63 ++++++++++--------- src/main/java/io/ebean/text/json/EJson.java | 1 - .../java/io/ebean/util/AnnotationUtil.java | 8 ++- .../java/io/ebeaninternal/api/ScopeTrans.java | 1 + .../ebeaninternal/api/ScopedTransaction.java | 1 + .../io/ebeaninternal/api/SpiExpression.java | 2 +- .../server/cache/RemoteCacheEvent.java | 1 + .../server/core/OrmQueryRequest.java | 1 + .../deploy/BeanDescriptorCacheHelp.java | 4 +- .../server/deploy/BeanProperty.java | 5 +- .../server/deploy/BeanPropertyAssocOne.java | 2 + .../server/deploy/DeployPropertyParser.java | 1 + .../server/expression/AbstractExpression.java | 2 +- .../expression/DefaultExampleExpression.java | 2 +- .../expression/DefaultExpressionList.java | 2 +- .../expression/ExistsQueryExpression.java | 2 +- .../server/expression/InExpression.java | 2 +- .../server/expression/InPairsExpression.java | 2 +- .../server/expression/JunctionExpression.java | 2 +- .../server/expression/LogicExpression.java | 2 +- .../NestedPathWrapperExpression.java | 2 +- .../expression/NonPrepareExpression.java | 2 +- .../server/expression/NoopExpression.java | 2 +- .../server/expression/NotExpression.java | 2 +- .../server/expression/SimpleExpression.java | 2 +- .../server/profile/BasicProfileLocation.java | 2 + .../server/profile/DProfileLocation.java | 2 + .../server/profile/DTimeMetricStats.java | 2 + .../server/profile/DTimedMetric.java | 2 +- .../server/querydefn/OrmQueryPlanKey.java | 1 + .../transaction/TransactionManager.java | 3 + .../server/type/ArrayElementConverter.java | 1 + .../type/ArrayElementConverterEnum.java | 2 +- .../server/type/ScalarTypeArrayList.java | 1 - .../server/type/ScalarTypeArraySetH2.java | 4 +- .../dbmigration/model/EntryTest.java | 1 - .../TestDiffHelpInsertWithEmbedded.java | 1 - .../org/tests/model/onetoone/OtoPrime.java | 1 + .../tests/model/onetoone/OtoPrimeExtra.java | 1 + .../org/tests/model/onetoone/OtoUBPrime.java | 1 + .../tests/model/onetoone/OtoUBPrimeExtra.java | 1 + .../org/tests/model/onetoone/OtoUPrime.java | 1 + .../tests/model/onetoone/OtoUPrimeExtra.java | 1 + 48 files changed, 89 insertions(+), 62 deletions(-) diff --git a/src/main/java/io/ebean/Pairs.java b/src/main/java/io/ebean/Pairs.java index 8929e3dd1..d32d1c986 100644 --- a/src/main/java/io/ebean/Pairs.java +++ b/src/main/java/io/ebean/Pairs.java @@ -158,6 +158,7 @@ public class Pairs { return this; } + @Override public String toString() { return "p0:" + property0 + " p1:" + property1 + " entries:" + entries; } @@ -183,6 +184,7 @@ public class Pairs { this.b = b; } + @Override public String toString() { return "{" + a + "," + b + "}"; } diff --git a/src/main/java/io/ebean/bean/CallStack.java b/src/main/java/io/ebean/bean/CallStack.java index 1453c4238..d9006a026 100644 --- a/src/main/java/io/ebean/bean/CallStack.java +++ b/src/main/java/io/ebean/bean/CallStack.java @@ -43,6 +43,7 @@ public final class CallStack implements Serializable { return hc; } + @Override public int hashCode() { return hc; } diff --git a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java index 190e69d97..2f105e0d6 100644 --- a/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java @@ -7,7 +7,7 @@ import io.ebean.annotation.Platform; import io.ebean.config.CustomDbTypeMapping; import io.ebean.config.DbTypeConfig; import io.ebean.config.ServerConfig; -import io.ebeaninternal.util.JdbcClose; +import io.ebeaninternal.util.JdbcClose; // FIXME: should not import ebeaninternal here import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java index 6444e0d55..683203b8c 100644 --- a/src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java +++ b/src/main/java/io/ebean/config/dbplatform/SequenceBatchIdGenerator.java @@ -44,6 +44,7 @@ public abstract class SequenceBatchIdGenerator extends SequenceIdGenerator { /** * Add the next set of Ids as the next value plus all the following numbers up to the step size. */ + @Override protected List readIds(ResultSet resultSet, int loadSize) throws SQLException { List newIds = new ArrayList<>(loadSize); diff --git a/src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java b/src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java index 3e632e5fa..c4039a6f2 100644 --- a/src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java +++ b/src/main/java/io/ebean/config/dbplatform/SequenceStepIdGenerator.java @@ -23,6 +23,7 @@ public abstract class SequenceStepIdGenerator extends SequenceIdGenerator { /** * Add the next set of Ids as the next value plus all the following numbers up to the step size. */ + @Override protected List readIds(ResultSet resultSet, int ignoreRequestSize) throws SQLException { List newIds = new ArrayList<>(allocationSize); diff --git a/src/main/java/io/ebean/config/properties/YamlLoader.java b/src/main/java/io/ebean/config/properties/YamlLoader.java index 764c73a38..2c472b22b 100644 --- a/src/main/java/io/ebean/config/properties/YamlLoader.java +++ b/src/main/java/io/ebean/config/properties/YamlLoader.java @@ -13,42 +13,43 @@ import java.util.Map; */ class YamlLoader { - private final Yaml yaml = new Yaml(); + private final Yaml yaml = new Yaml(); - private final LoadContext loadContext; + private final LoadContext loadContext; - YamlLoader(LoadContext loadContext) { - this.loadContext = loadContext; - } + YamlLoader(LoadContext loadContext) { + this.loadContext = loadContext; + } - void load(InputStream is) { - if (is != null) { - loadMap(yaml.load(is), null); - } - } + void load(InputStream is) { + if (is != null) { + loadMap(yaml.load(is), null); + } + } - void loadMap(Map map, String path) { + @SuppressWarnings("unchecked") + void loadMap(Map map, String path) { - for (Map.Entry entry : map.entrySet()) { - String key = entry.getKey(); - if (path != null) { - key = path + "." + key; - } - Object val = entry.getValue(); - if (val instanceof Map) { - loadMap((Map) val, key); - } else { - addScalar(key, val); - } - } - } + for (Map.Entry entry : map.entrySet()) { + String key = entry.getKey(); + if (path != null) { + key = path + "." + key; + } + Object val = entry.getValue(); + if (val instanceof Map) { + loadMap((Map) val, key); + } else { + addScalar(key, val); + } + } + } - private void addScalar(String key, Object val) { - if (val instanceof String) { - loadContext.put(key, (String) val); - } else if (val instanceof Number || val instanceof Boolean) { - loadContext.put(key, val.toString()); - } - } + private void addScalar(String key, Object val) { + if (val instanceof String) { + loadContext.put(key, (String) val); + } else if (val instanceof Number || val instanceof Boolean) { + loadContext.put(key, val.toString()); + } + } } diff --git a/src/main/java/io/ebean/text/json/EJson.java b/src/main/java/io/ebean/text/json/EJson.java index b33b26dcb..f57253c22 100644 --- a/src/main/java/io/ebean/text/json/EJson.java +++ b/src/main/java/io/ebean/text/json/EJson.java @@ -136,7 +136,6 @@ 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 plugin.parseList(parser, currentToken); } diff --git a/src/main/java/io/ebean/util/AnnotationUtil.java b/src/main/java/io/ebean/util/AnnotationUtil.java index 0f1f2275a..1aa7e421c 100644 --- a/src/main/java/io/ebean/util/AnnotationUtil.java +++ b/src/main/java/io/ebean/util/AnnotationUtil.java @@ -34,13 +34,14 @@ public class AnnotationUtil { * does not execute specialized search algorithms for classes or methods. It only traverses through Annotations! * It also does not filter out platform dependent annotations! */ + @SuppressWarnings("unchecked") public static A findAnnotation(AnnotatedElement annotatedElement, Class annotationType) { if (annotationType == null) { return null; } // check if directly present, if not, start search for meta-annotations. - Annotation[] anns = annotatedElement.getAnnotations(); - if (anns.length == 0) { + Annotation[] anns = annotatedElement.getAnnotations(); + if (anns.length == 0) { return null; // no annotations present, so searching for meta annotations not required } @@ -51,7 +52,7 @@ public class AnnotationUtil { return (A) ann; } } - + return findAnnotation(anns, annotationType, new HashSet<>()); } @@ -62,6 +63,7 @@ public class AnnotationUtil { * the supplied element. *

Note: this method searches for annotations at class & superClass(es)! */ + @SuppressWarnings("unchecked") public static A findAnnotationRecursive(Class clazz, Class annotationType) { if (annotationType == null) { return null; diff --git a/src/main/java/io/ebeaninternal/api/ScopeTrans.java b/src/main/java/io/ebeaninternal/api/ScopeTrans.java index d1326423b..27c0430c9 100644 --- a/src/main/java/io/ebeaninternal/api/ScopeTrans.java +++ b/src/main/java/io/ebeaninternal/api/ScopeTrans.java @@ -89,6 +89,7 @@ public class ScopeTrans { } + @Override public String toString() { return "ScopeTrans[" + transaction + "]"; } diff --git a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java index 9ecd6a3b7..833a3d7b6 100644 --- a/src/main/java/io/ebeaninternal/api/ScopedTransaction.java +++ b/src/main/java/io/ebeaninternal/api/ScopedTransaction.java @@ -25,6 +25,7 @@ public class ScopedTransaction extends SpiTransactionProxy { this.manager = manager; } + @Override public String toString() { return "ScopedTransaction[" + current + "]"; } diff --git a/src/main/java/io/ebeaninternal/api/SpiExpression.java b/src/main/java/io/ebeaninternal/api/SpiExpression.java index f97380eb1..2e4954799 100644 --- a/src/main/java/io/ebeaninternal/api/SpiExpression.java +++ b/src/main/java/io/ebeaninternal/api/SpiExpression.java @@ -101,5 +101,5 @@ public interface SpiExpression extends Expression { /** * Check for match to a natural key query returning false if it doesn't match. */ - boolean naturalKey(NaturalKeyQueryData data); + boolean naturalKey(NaturalKeyQueryData data); } diff --git a/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java b/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java index 4881cfd77..e0def309f 100644 --- a/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java +++ b/src/main/java/io/ebeaninternal/server/cache/RemoteCacheEvent.java @@ -51,6 +51,7 @@ public class RemoteCacheEvent { return clearCaches; } + @Override public String toString() { return "clearAll:" + clearAll + " caches:" + clearCaches; } diff --git a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index 98692c0fc..e63a49d56 100644 --- a/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -272,6 +272,7 @@ public final class OrmQueryRequest extends BeanRequest implements BeanQueryRe /** * Rollback the transaction if it was created for this request. */ + @Override public void rollbackTransIfRequired() { if (createdTransaction) { try { diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java index 97883d3d5..ac131a884 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java @@ -429,7 +429,7 @@ final class BeanDescriptorCacheHelp { private Class theClassOf(Collection beans) { if (beans instanceof List) { - return ((List)beans).get(0).getClass(); + return ((List)beans).get(0).getClass(); } return beans.iterator().next().getClass(); } @@ -532,7 +532,6 @@ final class BeanDescriptorCacheHelp { /** * Return a bean from the bean cache. */ - @SuppressWarnings("unchecked") private T beanCacheGetInternal(Object id, Boolean readOnly, PersistenceContext context) { CachedBeanData data = (CachedBeanData) getBeanCache().get(id); @@ -548,6 +547,7 @@ final class BeanDescriptorCacheHelp { return convertToBean(id, readOnly, context, data); } + @SuppressWarnings("unchecked") private T convertToBean(Object id, Boolean readOnly, PersistenceContext context, CachedBeanData data) { if (cacheSharableBeans && !Boolean.FALSE.equals(readOnly)) { Object bean = data.getSharableBean(); diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index 03b4bb2bd..05e69add2 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -1035,7 +1035,7 @@ public class BeanProperty implements ElPropertyValue, Property { */ public Set getDbCheckConstraintValues() { if (scalarType instanceof ScalarTypeEnum) { - return ((ScalarTypeEnum) scalarType).getDbCheckConstraintValues(); + return ((ScalarTypeEnum) scalarType).getDbCheckConstraintValues(); } return null; } @@ -1391,7 +1391,6 @@ public class BeanProperty implements ElPropertyValue, Property { /** * JSON write the property for 'insert only depth'. */ - @SuppressWarnings("unchecked") public void jsonWriteForInsert(SpiJsonWriter writeJson, EntityBean bean) throws IOException { if (!jsonSerialize) { return; @@ -1422,7 +1421,6 @@ public class BeanProperty implements ElPropertyValue, Property { jsonWriteVal(writeJson, getValueIntercept(bean)); } - @SuppressWarnings("unchecked") private void jsonWriteVal(SpiJsonWriter writeJson, Object value) throws IOException { if (value == null) { writeJson.writeNullField(name); @@ -1431,6 +1429,7 @@ public class BeanProperty implements ElPropertyValue, Property { } } + @SuppressWarnings("unchecked") private void jsonWriteScalar(SpiJsonWriter writeJson, Object value) throws IOException { if (scalarType != null) { writeJson.writeFieldName(name); diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index 584f0fbfb..305ea9aa4 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -606,11 +606,13 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc { return localHelp.read(ctx); } + @Override public void addTenant(SpiQuery query, Object tenantId) { T refBean = targetDescriptor.createReference(tenantId, null); query.where().eq(name, refBean); } + @Override public void setTenantValue(EntityBean entityBean, Object tenantId) { T refBean = targetDescriptor.createReference(tenantId, null); setValue(entityBean, refBean); diff --git a/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java index 108e8f2d7..320d76a96 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java +++ b/src/main/java/io/ebeaninternal/server/deploy/DeployPropertyParser.java @@ -34,6 +34,7 @@ public final class DeployPropertyParser extends DeployParser { /** * Skip if in raw sql expression with from tableName or join tableName. */ + @Override protected boolean skipWordConvert() { return FROM.equalsIgnoreCase(priorWord) || JOIN.equalsIgnoreCase(priorWord); } diff --git a/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java b/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java index bef8c338e..0ae5cd6fc 100644 --- a/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/AbstractExpression.java @@ -23,7 +23,7 @@ public abstract class AbstractExpression implements SpiExpression { } @Override - public boolean naturalKey(NaturalKeyQueryData data) { + public boolean naturalKey(NaturalKeyQueryData data) { // by default can't use naturalKey cache return false; } diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java index 6f35c9619..f1ac4243a 100644 --- a/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExampleExpression.java @@ -89,7 +89,7 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio } @Override - public boolean naturalKey(NaturalKeyQueryData data) { + public boolean naturalKey(NaturalKeyQueryData data) { // can't use naturalKey cache return false; } diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java index ba342e559..49a6daec2 100644 --- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java +++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java @@ -126,7 +126,7 @@ public class DefaultExpressionList implements SpiExpressionList { } @Override - public boolean naturalKey(NaturalKeyQueryData data) { + public boolean naturalKey(NaturalKeyQueryData data) { // can't use naturalKey cache return false; } diff --git a/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java b/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java index 37fa4d565..c6c214f4e 100644 --- a/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/ExistsQueryExpression.java @@ -37,7 +37,7 @@ class ExistsQueryExpression implements SpiExpression, UnsupportedDocStoreExpress } @Override - public boolean naturalKey(NaturalKeyQueryData data) { + public boolean naturalKey(NaturalKeyQueryData data) { // can't use naturalKey cache return false; } diff --git a/src/main/java/io/ebeaninternal/server/expression/InExpression.java b/src/main/java/io/ebeaninternal/server/expression/InExpression.java index daf2a3f57..8c2d5f55d 100644 --- a/src/main/java/io/ebeaninternal/server/expression/InExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/InExpression.java @@ -46,7 +46,7 @@ class InExpression extends AbstractExpression { } @Override - public boolean naturalKey(NaturalKeyQueryData data) { + public boolean naturalKey(NaturalKeyQueryData data) { // can't use naturalKey cache for NOT IN return !not && data.matchIn(propName, bindValues); } diff --git a/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java b/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java index ac02ef1d6..91f6742d6 100644 --- a/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/InPairsExpression.java @@ -41,7 +41,7 @@ class InPairsExpression extends AbstractExpression { } @Override - public boolean naturalKey(NaturalKeyQueryData data) { + public boolean naturalKey(NaturalKeyQueryData data) { return !not && data.matchInPairs(pairs); } diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java index 5d16121ec..d54096cc6 100644 --- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java @@ -61,7 +61,7 @@ class JunctionExpression implements SpiJunction, SpiExpression, Expression } @Override - public boolean naturalKey(NaturalKeyQueryData data) { + public boolean naturalKey(NaturalKeyQueryData data) { // can't use naturalKey cache return false; } diff --git a/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java b/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java index 670abb0ce..363b40aab 100644 --- a/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/LogicExpression.java @@ -58,7 +58,7 @@ abstract class LogicExpression implements SpiExpression { } @Override - public boolean naturalKey(NaturalKeyQueryData data) { + public boolean naturalKey(NaturalKeyQueryData data) { // can't use naturalKey cache return false; } diff --git a/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java b/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java index 61e0d82c8..c7f5d193e 100644 --- a/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/NestedPathWrapperExpression.java @@ -25,7 +25,7 @@ class NestedPathWrapperExpression implements SpiExpression { } @Override - public boolean naturalKey(NaturalKeyQueryData data) { + public boolean naturalKey(NaturalKeyQueryData data) { // can't use naturalKey cache return false; } diff --git a/src/main/java/io/ebeaninternal/server/expression/NonPrepareExpression.java b/src/main/java/io/ebeaninternal/server/expression/NonPrepareExpression.java index f27ab9f97..675e641ee 100644 --- a/src/main/java/io/ebeaninternal/server/expression/NonPrepareExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/NonPrepareExpression.java @@ -10,7 +10,7 @@ import io.ebeaninternal.api.NaturalKeyQueryData; abstract class NonPrepareExpression implements SpiExpression { @Override - public boolean naturalKey(NaturalKeyQueryData data) { + public boolean naturalKey(NaturalKeyQueryData data) { // can't use naturalKey cache return false; } diff --git a/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java b/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java index 28ff54916..6d6a7a58a 100644 --- a/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/NoopExpression.java @@ -18,7 +18,7 @@ class NoopExpression implements SpiExpression { protected static final NoopExpression INSTANCE = new NoopExpression(); @Override - public boolean naturalKey(NaturalKeyQueryData data) { + public boolean naturalKey(NaturalKeyQueryData data) { // can't use naturalKey cache return false; } diff --git a/src/main/java/io/ebeaninternal/server/expression/NotExpression.java b/src/main/java/io/ebeaninternal/server/expression/NotExpression.java index 264d0d3db..8bafa95b0 100644 --- a/src/main/java/io/ebeaninternal/server/expression/NotExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/NotExpression.java @@ -23,7 +23,7 @@ final class NotExpression implements SpiExpression { } @Override - public boolean naturalKey(NaturalKeyQueryData data) { + public boolean naturalKey(NaturalKeyQueryData data) { // can't use naturalKey cache return false; } diff --git a/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java b/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java index e653873eb..4069999c3 100644 --- a/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java +++ b/src/main/java/io/ebeaninternal/server/expression/SimpleExpression.java @@ -28,7 +28,7 @@ public class SimpleExpression extends AbstractValueExpression { } @Override - public boolean naturalKey(NaturalKeyQueryData data) { + public boolean naturalKey(NaturalKeyQueryData data) { // can't use naturalKey cache for NOT IN if (type != Op.EQ) { return false; diff --git a/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java b/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java index 4f0a9071b..790bf2128 100644 --- a/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java +++ b/src/main/java/io/ebeaninternal/server/profile/BasicProfileLocation.java @@ -15,6 +15,7 @@ class BasicProfileLocation implements ProfileLocation { this.shortDescription = shortDesc(location); } + @Override public String toString() { return shortDescription; } @@ -24,6 +25,7 @@ class BasicProfileLocation implements ProfileLocation { // do nothing } + @Override public String obtain() { return location; } diff --git a/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java b/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java index 6ca3252e7..9a4afc62d 100644 --- a/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java +++ b/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java @@ -28,6 +28,7 @@ class DProfileLocation implements ProfileLocation { this.lineNumber = lineNumber; } + @Override public String toString() { return "location: " + location; } @@ -37,6 +38,7 @@ class DProfileLocation implements ProfileLocation { // do nothing } + @Override public String obtain() { // atomic assignment so happy with this if (location == null) { diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java b/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java index c69d1c00b..a30c41ff4 100644 --- a/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java +++ b/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java @@ -29,6 +29,7 @@ class DTimeMetricStats implements TimedMetricStats { this.max = max != Long.MIN_VALUE ? max : (count < 1 ? 0 : Math.round(total / count)); } + @Override public String toString() { StringBuilder sb = new StringBuilder(); if (location != null) { @@ -43,6 +44,7 @@ class DTimeMetricStats implements TimedMetricStats { return sb.toString(); } + @Override public void setLocation(String location) { this.location = location; } diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java index be7927c29..4ba32caa7 100644 --- a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java +++ b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java @@ -54,7 +54,7 @@ class DTimedMetric implements TimedMetric { } } -// @Override + @Override public DTimeMetricStats collect(boolean reset) { boolean empty = count.sum() == 0; if (empty) { diff --git a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java index 314996b56..f8abd66b3 100644 --- a/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java +++ b/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPlanKey.java @@ -109,6 +109,7 @@ class OrmQueryPlanKey implements CQueryPlanKey { return planHash; } + @Override public String toString() { return description + " maxRows:" + maxRows + " firstRow:" + firstRow + " rawSqlKey:" + rawSqlKey + " planHash:" + planHash; } diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java index b9d3ce08f..2a8bf37cc 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java @@ -201,6 +201,7 @@ public class TransactionManager implements SpiTransactionManager { /** * Return the current active transaction. */ + @Override public SpiTransaction getActive() { return scopeManager.getActive(); } @@ -288,10 +289,12 @@ public class TransactionManager implements SpiTransactionManager { return serverName; } + @Override public DataSource getDataSource() { return dataSourceSupplier.getDataSource(); } + @Override public DataSource getReadOnlyDataSource() { return dataSourceSupplier.getReadOnlyDataSource(); } diff --git a/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java b/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java index e13a7d212..2c6c09b76 100644 --- a/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java +++ b/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java @@ -101,6 +101,7 @@ interface ArrayElementConverter { /** * String converter (noop based). */ + @SuppressWarnings("rawtypes") class EnumConverter implements ArrayElementConverter { private final ScalarType scalarType; diff --git a/src/main/java/io/ebeaninternal/server/type/ArrayElementConverterEnum.java b/src/main/java/io/ebeaninternal/server/type/ArrayElementConverterEnum.java index 12f3aa624..fe5e9a490 100644 --- a/src/main/java/io/ebeaninternal/server/type/ArrayElementConverterEnum.java +++ b/src/main/java/io/ebeaninternal/server/type/ArrayElementConverterEnum.java @@ -13,7 +13,7 @@ public class ArrayElementConverterEnum implements ArrayElementConverter @Override public String toElement(Object rawValue) { - + // FIXME: Don't understand for what is this. Enum[] enumConstants = valueType1.getEnumConstants(); if (scalarType == null) { return rawValue.toString(); diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java index 424f8da8b..0621fe833 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java @@ -59,7 +59,6 @@ public class ScalarTypeArrayList extends ScalarTypeJsonCollection implemen } @Override - @SuppressWarnings({ "unchecked", "rawtypes" }) public ScalarTypeArrayList typeForEnum(ScalarType scalarType) { return new ScalarTypeArrayList("varchar", DocPropertyType.TEXT, new ArrayElementConverter.EnumConverter(scalarType)); } diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java index 2c7ac0123..1d54314fa 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java @@ -28,7 +28,6 @@ class ScalarTypeArraySetH2 extends ScalarTypeArraySet { * Return the ScalarType to use based on the List's generic parameter type. */ @Override - @SuppressWarnings("unchecked") public ScalarTypeArraySetH2 typeFor(Type valueType) { if (valueType.equals(java.util.UUID.class)) { return UUID; @@ -49,12 +48,13 @@ class ScalarTypeArraySetH2 extends ScalarTypeArraySet { } @Override + @SuppressWarnings({ "unchecked", "rawtypes" }) public ScalarTypeArraySetH2 typeForEnum(ScalarType scalarType) { return new ScalarTypeArraySetH2("varchar", DocPropertyType.TEXT, new ArrayElementConverter.EnumConverter(scalarType)); } } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) private ScalarTypeArraySetH2(String arrayType, DocPropertyType docPropertyType, ArrayElementConverter converter) { super(arrayType, docPropertyType, converter); } diff --git a/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java b/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java index 680ea207f..0a3546fd8 100644 --- a/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java +++ b/src/test/java/io/ebeaninternal/dbmigration/model/EntryTest.java @@ -2,7 +2,6 @@ package io.ebeaninternal.dbmigration.model; import io.ebeaninternal.dbmigration.migration.ChangeSet; import io.ebeaninternal.dbmigration.migration.DropColumn; -import javax.annotation.Nonnull; import org.junit.Test; import static org.assertj.core.api.StrictAssertions.assertThat; diff --git a/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java b/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java index 2cfed3cde..7e04187dd 100644 --- a/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java +++ b/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java @@ -28,7 +28,6 @@ public class TestDiffHelpInsertWithEmbedded extends BaseTestCase { } @Test - @SuppressWarnings("unchecked") public void simple() throws IOException { EMain emain1 = createEMain(); diff --git a/src/test/java/org/tests/model/onetoone/OtoPrime.java b/src/test/java/org/tests/model/onetoone/OtoPrime.java index 771b2de9b..33adbd04a 100644 --- a/src/test/java/org/tests/model/onetoone/OtoPrime.java +++ b/src/test/java/org/tests/model/onetoone/OtoPrime.java @@ -30,6 +30,7 @@ public class OtoPrime { this.name = name; } + @Override public String toString() { return "id:"+ pid +" name:"+name+" extra:"+extra; } diff --git a/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java b/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java index acb6fc28e..f7683c5ac 100644 --- a/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java +++ b/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java @@ -19,6 +19,7 @@ public class OtoPrimeExtra { this.extra = extra; } + @Override public String toString() { return "exId:"+ eid +" "+extra; } diff --git a/src/test/java/org/tests/model/onetoone/OtoUBPrime.java b/src/test/java/org/tests/model/onetoone/OtoUBPrime.java index 9416135c6..36d7104c2 100644 --- a/src/test/java/org/tests/model/onetoone/OtoUBPrime.java +++ b/src/test/java/org/tests/model/onetoone/OtoUBPrime.java @@ -27,6 +27,7 @@ public class OtoUBPrime { this.name = name; } + @Override public String toString() { return "id:"+ pid +" name:"+name+" extra:"+extra; } diff --git a/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java b/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java index 3b50b73f8..0a87366fa 100644 --- a/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java +++ b/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java @@ -29,6 +29,7 @@ public class OtoUBPrimeExtra { this.extra = extra; } + @Override public String toString() { return "exId:" + eid + " " + extra; } diff --git a/src/test/java/org/tests/model/onetoone/OtoUPrime.java b/src/test/java/org/tests/model/onetoone/OtoUPrime.java index 052dbf876..4b2bd894b 100644 --- a/src/test/java/org/tests/model/onetoone/OtoUPrime.java +++ b/src/test/java/org/tests/model/onetoone/OtoUPrime.java @@ -30,6 +30,7 @@ public class OtoUPrime { this.name = name; } + @Override public String toString() { return "id:"+ pid +" name:"+name+" extra:"+extra; } diff --git a/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java b/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java index 7c3fae318..edd72b0ae 100644 --- a/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java +++ b/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java @@ -20,6 +20,7 @@ public class OtoUPrimeExtra { this.extra = extra; } + @Override public String toString() { return "exId:"+ eid +" "+extra; }