diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index 54eeae122..b97c0a75a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -780,6 +780,7 @@ public class BeanPropertyAssocOne extends BeanPropertyAssoc implements STr } } + @SuppressWarnings("unchecked") @Override public void jsonRead(SpiJsonReader readJson, EntityBean bean) throws IOException { if (jsonDeserialize && targetDescriptor != null) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java index 81b5576e9..7e5a09782 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java @@ -106,10 +106,7 @@ final class ReadAnnotationConfig { if (javaxValidation != null && javaxValidation.isValidationNotNull(property)) { return true; } - if (jakartaValidation != null && jakartaValidation.isValidationNotNull(property)) { - return true; - } - return false; + return jakartaValidation != null && jakartaValidation.isValidationNotNull(property); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java index 0dacd596e..340f978e1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java @@ -122,7 +122,6 @@ public final class DJsonContext implements SpiJsonContext { @Override public T toBean(Class cls, JsonParser parser, JsonReadOptions options) throws JsonIOException { - BeanDescriptor desc = getDescriptor(cls); try { return desc.jsonRead(new ReadJson(desc, parser, options, determineObjectMapper(options), false), null, null); @@ -156,9 +155,9 @@ public final class DJsonContext implements SpiJsonContext { toBean(target, parser, null); } + @SuppressWarnings("unchecked") @Override public void toBean(T target, JsonParser parser, JsonReadOptions options) throws JsonIOException { - BeanDescriptor desc = (BeanDescriptor) getDescriptor(target.getClass()); try { desc.jsonRead(new ReadJson(desc, parser, options, determineObjectMapper(options), target != null), null, target); @@ -169,14 +168,12 @@ public final class DJsonContext implements SpiJsonContext { @Override public DJsonBeanReader createBeanReader(Class cls, JsonParser parser, JsonReadOptions options) throws JsonIOException { - BeanDescriptor desc = getDescriptor(cls); return new DJsonBeanReader<>(desc, new ReadJson(desc, parser, options, determineObjectMapper(options), false)); } @Override public DJsonBeanReader createBeanReader(BeanType beanType, JsonParser parser, JsonReadOptions options) throws JsonIOException { - BeanDescriptor desc = (BeanDescriptor) beanType; SpiJsonReader readJson = new ReadJson(desc, parser, options, determineObjectMapper(options), false); return new DJsonBeanReader<>(desc, readJson); @@ -209,7 +206,6 @@ public final class DJsonContext implements SpiJsonContext { @Override public List toList(Class cls, JsonParser src, JsonReadOptions options) throws JsonIOException { - BeanDescriptor desc = getDescriptor(cls); SpiJsonReader readJson = new ReadJson(desc, src, options, determineObjectMapper(options), false); try { @@ -241,19 +237,16 @@ public final class DJsonContext implements SpiJsonContext { @Override public Object toObject(Type genericType, String json) throws JsonIOException { - return toObject(genericType, createParser(new StringReader(json))); } @Override public Object toObject(Type genericType, Reader json) throws JsonIOException { - return toObject(genericType, createParser(json)); } @Override public Object toObject(Type genericType, JsonParser jsonParser) throws JsonIOException { - TypeInfo info = ParamTypeHelper.getTypeInfo(genericType); ManyType manyType = info.getManyType(); switch (manyType) { @@ -362,7 +355,6 @@ public final class DJsonContext implements SpiJsonContext { @SuppressWarnings("unchecked") private void toJsonInternal(Object value, JsonGenerator gen, JsonWriteOptions options) throws IOException { - if (value == null) { gen.writeNull(); } else if (value instanceof Number) { @@ -392,7 +384,6 @@ public final class DJsonContext implements SpiJsonContext { @Override public SpiJsonReader createJsonRead(BeanType beanType, String json) { - BeanDescriptor desc = (BeanDescriptor) beanType; JsonParser parser = createParser(new StringReader(json)); return new ReadJson(desc, parser, null, defaultObjectMapper, false); @@ -415,7 +406,6 @@ public final class DJsonContext implements SpiJsonContext { } private void toJsonFromCollection(Collection collection, String key, JsonGenerator gen, JsonWriteOptions options) throws IOException { - if (key != null) { gen.writeFieldName(key); } @@ -429,7 +419,6 @@ public final class DJsonContext implements SpiJsonContext { } private void toJsonFromMap(Map map, JsonGenerator gen, JsonWriteOptions options) throws IOException { - Set> entrySet = map.entrySet(); Iterator> it = entrySet.iterator(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java index 8fe761119..e2ce3f307 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java @@ -480,10 +480,8 @@ public final class OrmQueryDetail implements Serializable { if (create && props == null) { props = new OrmQueryProperties(path); fetch(props); - return props; - } else { - return props; } + return props; } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java index 35bd40a97..cce8f185a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java @@ -161,7 +161,7 @@ class ScalarTypeArrayList extends ScalarTypeArrayBase implements ScalarTyp /** * Convert from the json types to the proper scalar types (uuid, enum, double etc) */ - @SuppressWarnings("rawtypes") + @SuppressWarnings({"rawtypes", "unchecked"}) private List convert(List rawList) { List list = new ArrayList(rawList.size()); for (Object rawVal : rawList) {