diff --git a/src/main/java/io/ebean/RawSql.java b/src/main/java/io/ebean/RawSql.java index 0c52bb83e..857ce7328 100644 --- a/src/main/java/io/ebean/RawSql.java +++ b/src/main/java/io/ebean/RawSql.java @@ -1,16 +1,5 @@ package io.ebean; -import io.ebean.util.CamelCaseHelper; - -import java.io.Serializable; -import java.sql.ResultSet; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - /** * Used to build object graphs based on a raw SQL statement (rather than * generated by Ebean). diff --git a/src/main/java/io/ebeaninternal/json/DJsonService.java b/src/main/java/io/ebeaninternal/json/DJsonService.java index 8310041b0..0b4dc7412 100644 --- a/src/main/java/io/ebeaninternal/json/DJsonService.java +++ b/src/main/java/io/ebeaninternal/json/DJsonService.java @@ -22,6 +22,7 @@ public class DJsonService implements SpiJsonService { /** * Write the nested Map/List as json. */ + @Override public String write(Object object) throws IOException { return EJsonWriter.write(object); } @@ -29,6 +30,7 @@ public class DJsonService implements SpiJsonService { /** * Write the nested Map/List as json to the writer. */ + @Override public void write(Object object, Writer writer) throws IOException { EJsonWriter.write(object, writer); } @@ -36,6 +38,7 @@ public class DJsonService implements SpiJsonService { /** * Write the nested Map/List as json to the jsonGenerator. */ + @Override public void write(Object object, JsonGenerator jsonGenerator) throws IOException { EJsonWriter.write(object, jsonGenerator); } @@ -43,6 +46,7 @@ public class DJsonService implements SpiJsonService { /** * Write the collection as json array to the jsonGenerator. */ + @Override public void writeCollection(Collection collection, JsonGenerator jsonGenerator) throws IOException { EJsonWriter.writeCollection(collection, jsonGenerator); } @@ -51,6 +55,7 @@ public class DJsonService implements SpiJsonService { * Parse the json and return as a Map additionally specifying if the returned map should * be modify aware meaning that it can detect when it has been modified. */ + @Override public Map parseObject(String json, boolean modifyAware) throws IOException { return EJsonReader.parseObject(json, modifyAware); } @@ -58,6 +63,7 @@ public class DJsonService implements SpiJsonService { /** * Parse the json and return as a Map. */ + @Override public Map parseObject(String json) throws IOException { return EJsonReader.parseObject(json); } @@ -65,6 +71,7 @@ public class DJsonService implements SpiJsonService { /** * Parse the json and return as a Map taking a reader. */ + @Override public Map parseObject(Reader reader, boolean modifyAware) throws IOException { return EJsonReader.parseObject(reader, modifyAware); } @@ -72,6 +79,7 @@ public class DJsonService implements SpiJsonService { /** * Parse the json and return as a Map taking a reader. */ + @Override public Map parseObject(Reader reader) throws IOException { return EJsonReader.parseObject(reader); } @@ -79,6 +87,7 @@ public class DJsonService implements SpiJsonService { /** * Parse the json and return as a Map taking a JsonParser. */ + @Override public Map parseObject(JsonParser parser) throws IOException { return EJsonReader.parseObject(parser); } @@ -89,6 +98,7 @@ public class DJsonService implements SpiJsonService { * Used when the first token is checked to see if the value is null prior to calling this. *

*/ + @Override public Map parseObject(JsonParser parser, JsonToken token) throws IOException { return EJsonReader.parseObject(parser, token); } @@ -96,6 +106,7 @@ public class DJsonService implements SpiJsonService { /** * Parse the json and return as a modify aware List. */ + @Override public List parseList(String json, boolean modifyAware) throws IOException { return EJsonReader.parseList(json, modifyAware); } @@ -103,6 +114,7 @@ public class DJsonService implements SpiJsonService { /** * Parse the json and return as a List. */ + @Override public List parseList(String json) throws IOException { return EJsonReader.parseList(json); } @@ -110,6 +122,7 @@ public class DJsonService implements SpiJsonService { /** * Parse the json and return as a List taking a Reader. */ + @Override public List parseList(Reader reader) throws IOException { return EJsonReader.parseList(reader); } @@ -117,6 +130,7 @@ public class DJsonService implements SpiJsonService { /** * Parse the json and return as a List taking a JsonParser. */ + @Override public List parseList(JsonParser parser) throws IOException { return EJsonReader.parseList(parser, false); } @@ -124,6 +138,7 @@ public class DJsonService implements SpiJsonService { /** * Parse the json returning as a List taking into account the current token. */ + @Override @SuppressWarnings("unchecked") public List parseList(JsonParser parser, JsonToken currentToken) throws IOException { return (List) EJsonReader.parse(parser, currentToken, false); @@ -132,6 +147,7 @@ public class DJsonService implements SpiJsonService { /** * Parse the json and return as a List or Map. */ + @Override public Object parse(String json) throws IOException { return EJsonReader.parse(json); } @@ -139,6 +155,7 @@ public class DJsonService implements SpiJsonService { /** * Parse the json and return as a List or Map. */ + @Override public Object parse(Reader reader) throws IOException { return EJsonReader.parse(reader); } @@ -146,6 +163,7 @@ public class DJsonService implements SpiJsonService { /** * Parse the json and return as a List or Map. */ + @Override public Object parse(JsonParser parser) throws IOException { return EJsonReader.parse(parser); } @@ -153,6 +171,7 @@ public class DJsonService implements SpiJsonService { /** * Parse the json returning a Set that might be modify aware. */ + @Override public Set parseSet(String json, boolean modifyAware) throws IOException { List list = parseList(json, modifyAware); if (list == null) { @@ -169,6 +188,7 @@ public class DJsonService implements SpiJsonService { /** * Parse the json returning as a Set taking into account the current token. */ + @Override public Set parseSet(JsonParser parser, JsonToken currentToken) throws IOException { return new LinkedHashSet<>(parseList(parser, currentToken)); } diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index 7b3b54718..fd7024ac6 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -965,6 +965,7 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc { /** * Skip JSON write value for ToMany property. */ + @Override public void jsonWriteValue(SpiJsonWriter writeJson, Object value) throws IOException { // do nothing, exclude ToMany properties } diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java index dd1b8093d..a6f72b567 100644 --- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java +++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.persist.dmlbind; import io.ebeaninternal.server.deploy.BeanProperty; -import io.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; import io.ebeaninternal.server.persist.dml.DmlMode; /** 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 7e65c7829..20c7d3f28 100644 --- a/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java +++ b/src/main/java/io/ebeaninternal/server/text/json/WriteJson.java @@ -342,28 +342,34 @@ public class WriteJson implements SpiJsonWriter { } } + @Override public boolean isParentBean(Object bean) { return !parentBeans.isEmpty() && parentBeans.contains(bean); } + @Override public void pushParentBeanMany(EntityBean parentBean) { parentBeans.push(parentBean); } + @Override public void popParentBeanMany() { parentBeans.pop(); } + @Override public void beginAssocOne(String key, EntityBean bean) { parentBeans.push(bean); pathStack.pushPathKey(key); } + @Override public void endAssocOne() { parentBeans.pop(); pathStack.pop(); } + @Override public void beginAssocMany(String key) { try { pathStack.pushPathKey(key); @@ -374,6 +380,7 @@ public class WriteJson implements SpiJsonWriter { } } + @Override public void endAssocMany() { try { pathStack.pop(); @@ -407,6 +414,7 @@ public class WriteJson implements SpiJsonWriter { return new WriteBean(desc, explicitAllProps, currentIncludeProps, bean, visitor); } + @Override public void writeValueUsingObjectMapper(String name, Object value) { if (!isIncludeEmpty()) { @@ -534,6 +542,7 @@ public class WriteJson implements SpiJsonWriter { } } + @Override public Boolean includeMany(String key) { if (fetchPath != null) { String fullPath = pathStack.peekFullPath(key); @@ -542,6 +551,7 @@ public class WriteJson implements SpiJsonWriter { return null; } + @Override public void toJson(String name, Collection c) { try { diff --git a/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java b/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java index 64e1f0a91..b3d4812cb 100644 --- a/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java +++ b/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java @@ -13,7 +13,6 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; public class TestUpdateAllLoadedProperties extends BaseTestCase {