From deb6ce23d7b0c1e13988fd12f382ff67ab623513 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Thu, 5 May 2016 21:34:29 +1200 Subject: [PATCH] #693 - ENH: ... support @DbJson with Set and Set support --- .../java/com/avaje/ebean/text/json/EJson.java | 12 ++ .../server/type/DefaultTypeManager.java | 41 +---- .../server/type/ModifyAwareList.java | 11 ++ .../server/type/ModifyAwareSet.java | 18 +- .../server/type/ScalarTypeJsonList.java | 13 ++ .../server/type/ScalarTypeJsonMap.java | 23 +++ .../server/type/ScalarTypeJsonSet.java | 158 +++++++++++++++++ .../java/com/avaje/ebean/json/EJsonTests.java | 164 ++++++++++-------- .../server/type/ModifyAwareListTest.java | 12 ++ .../com/avaje/tests/json/TestDbJson_List.java | 33 +++- .../tests/model/json/EBasicJsonList.java | 13 ++ 11 files changed, 388 insertions(+), 110 deletions(-) create mode 100644 src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonSet.java diff --git a/src/main/java/com/avaje/ebean/text/json/EJson.java b/src/main/java/com/avaje/ebean/text/json/EJson.java index 3090f0bf4..e22eb0903 100644 --- a/src/main/java/com/avaje/ebean/text/json/EJson.java +++ b/src/main/java/com/avaje/ebean/text/json/EJson.java @@ -6,7 +6,9 @@ import java.io.Writer; import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Set; +import com.avaje.ebeaninternal.server.type.ModifyAwareList; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -146,4 +148,14 @@ public class EJson { return EJsonReader.parse(parser); } + /** + * Parse the json returning a Set that might be modify aware. + */ + public static Set parseSet(String json, boolean modifyAware) throws IOException { + List list = parseList(json, modifyAware); + if (list == null) { + return null; + } + return ((ModifyAwareList)list).asSet(); + } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java index 44c116fe9..503019e3d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/DefaultTypeManager.java @@ -63,6 +63,7 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Set; import java.util.TimeZone; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; @@ -85,14 +86,6 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable { private final DefaultTypeFactory extraTypeFactory; - private final ScalarTypeJsonMap JSON_MAP_CLOB = new ScalarTypeJsonMap.Clob(); - - private final ScalarTypeJsonMap jsonMapClob = JSON_MAP_CLOB; - private final ScalarTypeJsonMap jsonMapBlob = new ScalarTypeJsonMap.Blob(); - private final ScalarTypeJsonMap jsonMapVarchar = new ScalarTypeJsonMap.Varchar(); - private final ScalarTypeJsonMap jsonMapJson; - private final ScalarTypeJsonMap jsonMapJsonb; - private final ScalarTypeFile fileType = new ScalarTypeFile(); private final ScalarType charType = new ScalarTypeChar(); @@ -204,14 +197,6 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable { initialiseJodaTypes(jsonDateTime, config); initialiseJacksonTypes(config); - if (postgres) { - this.jsonMapJson = new ScalarTypeJsonMapPostgres.JSON(); - this.jsonMapJsonb = new ScalarTypeJsonMapPostgres.JSONB(); - } else { - this.jsonMapJson = JSON_MAP_CLOB; - this.jsonMapJsonb = JSON_MAP_CLOB; - } - if (bootupClasses != null) { initialiseCustomScalarTypes(jsonDateTime, bootupClasses, config); initialiseScalarConverters(bootupClasses); @@ -373,30 +358,18 @@ public final class DefaultTypeManager implements TypeManager, KnownImmutable { public ScalarType getJsonScalarType(Class type, int dbType, int dbLength) { if (type.equals(List.class)) { - if (postgres) { - switch (dbType) { - case DbType.JSONB: return ScalarTypeJsonList.JSONB; - case DbType.JSON: return ScalarTypeJsonList.JSON; - } - } - return ScalarTypeJsonList.VARCHAR; + return ScalarTypeJsonList.typeFor(postgres, dbType); + } + + if (type.equals(Set.class)) { + return ScalarTypeJsonSet.typeFor(postgres, dbType); } if (type.equals(Map.class)) { - // @DbJson Map property - switch (dbType) { - case Types.VARCHAR : return jsonMapVarchar; - case Types.BLOB: return jsonMapBlob; - case Types.CLOB : return jsonMapClob; - case DbType.JSONB: return jsonMapJsonb; - case DbType.JSON: return jsonMapJson; - default: - return jsonMapJson; - } + return ScalarTypeJsonMap.typeFor(postgres, dbType); } if (type.equals(JsonNode.class)) { - // @DbJson JsonNode property (Jackson) switch (dbType) { case Types.VARCHAR : return jsonNodeVarchar; case Types.BLOB: return jsonNodeBlob; diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareList.java b/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareList.java index 10b35fcbd..432941252 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareList.java @@ -2,6 +2,7 @@ package com.avaje.ebeaninternal.server.type; import java.util.Collection; import java.util.Iterator; +import java.util.LinkedHashSet; import java.util.List; import java.util.ListIterator; @@ -168,4 +169,14 @@ public class ModifyAwareList implements List, ModifyAwareOwner { public List subList(int fromIndex, int toIndex) { return new ModifyAwareList(owner,list.subList(fromIndex, toIndex)); } + + /** + * Create an return a modify aware Set. + */ + public ModifyAwareSet asSet() { + + LinkedHashSet set = new LinkedHashSet(); + set.addAll(list); + return new ModifyAwareSet(owner, set); + } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareSet.java b/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareSet.java index eb512cee1..8bd1da4ae 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareSet.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ModifyAwareSet.java @@ -5,7 +5,7 @@ import java.util.Set; /** * Wraps a Set for the purposes of detecting modifications. */ -public class ModifyAwareSet extends ModifyAwareCollection implements Set { +public class ModifyAwareSet extends ModifyAwareCollection implements Set, ModifyAwareOwner { /** * Create with an Owner that is notified of modifications. @@ -13,5 +13,19 @@ public class ModifyAwareSet extends ModifyAwareCollection implements Set s) { super(owner, s); } - + + @Override + public boolean isMarkedDirty() { + return owner.isMarkedDirty(); + } + + @Override + public void markAsModified() { + owner.markAsModified(); + } + + @Override + public void resetMarkedDirty() { + owner.resetMarkedDirty(); + } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonList.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonList.java index 6af41ce8e..461e2fbd7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonList.java @@ -22,6 +22,19 @@ public class ScalarTypeJsonList { public static final ScalarTypeJsonCollection JSONB = new ScalarTypeJsonList.JsonB(); + /** + * Return the appropriate ScalarType based requested dbType and if Postgres. + */ + public static ScalarType typeFor(boolean postgres, int dbType) { + if (postgres) { + switch (dbType) { + case DbType.JSONB: return ScalarTypeJsonList.JSONB; + case DbType.JSON: return ScalarTypeJsonList.JSON; + } + } + return ScalarTypeJsonList.VARCHAR; + } + /** * List mapped to DB VARCHAR. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java index 753bdd8b2..670e40e50 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonMap.java @@ -1,5 +1,6 @@ package com.avaje.ebeaninternal.server.type; +import com.avaje.ebean.config.dbplatform.DbType; import com.avaje.ebean.text.TextException; import com.avaje.ebean.text.json.EJson; import com.avaje.ebeaninternal.util.EncodeUtil; @@ -22,6 +23,28 @@ import java.util.Map; */ public abstract class ScalarTypeJsonMap extends ScalarTypeBase { + private static final ScalarTypeJsonMap CLOB = new ScalarTypeJsonMap.Clob(); + private static final ScalarTypeJsonMap BLOB = new ScalarTypeJsonMap.Blob(); + private static final ScalarTypeJsonMap VARCHAR = new ScalarTypeJsonMap.Varchar(); + private static final ScalarTypeJsonMap JSON = new ScalarTypeJsonMapPostgres.JSON(); + private static final ScalarTypeJsonMap JSONB = new ScalarTypeJsonMapPostgres.JSONB(); + + /** + * Return the ScalarType for the requested dbType and postgres. + */ + public static ScalarTypeJsonMap typeFor(boolean postgres, int dbType) { + + switch (dbType) { + case Types.VARCHAR : return VARCHAR; + case Types.BLOB: return BLOB; + case Types.CLOB : return CLOB; + case DbType.JSONB: return postgres ? JSONB : CLOB; + case DbType.JSON: return postgres ? JSON : CLOB; + default: + throw new IllegalStateException("Unknown dbType "+dbType); + } + } + public static class Clob extends ScalarTypeJsonMap { public Clob() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonSet.java b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonSet.java new file mode 100644 index 000000000..1cf02d093 --- /dev/null +++ b/src/main/java/com/avaje/ebeaninternal/server/type/ScalarTypeJsonSet.java @@ -0,0 +1,158 @@ +package com.avaje.ebeaninternal.server.type; + +import com.avaje.ebean.config.dbplatform.DbType; +import com.avaje.ebean.text.json.EJson; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; + +import javax.persistence.PersistenceException; +import java.io.IOException; +import java.sql.SQLException; +import java.sql.Types; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + +/** + * Types for mapping List in JSON format to DB types VARCHAR, JSON and JSONB. + */ +public class ScalarTypeJsonSet { + + private static final ScalarTypeJsonCollection VARCHAR = new ScalarTypeJsonSet.Varchar(); + + private static final ScalarTypeJsonCollection JSON = new ScalarTypeJsonSet.Json(); + + private static final ScalarTypeJsonCollection JSONB = new ScalarTypeJsonSet.JsonB(); + + /** + * Return the appropriate ScalarType for the requested dbType and Postgres. + */ + public static ScalarType typeFor(boolean postgres, int dbType) { + if (postgres) { + switch (dbType) { + case DbType.JSONB: return ScalarTypeJsonSet.JSONB; + case DbType.JSON: return ScalarTypeJsonSet.JSON; + } + } + return ScalarTypeJsonSet.VARCHAR; + } + + /** + * List mapped to DB VARCHAR. + */ + private static class Varchar extends ScalarTypeJsonSet.Base { + public Varchar() { + super(Types.VARCHAR); + } + } + + /** + * List mapped to Postgres JSON. + */ + private static class Json extends ScalarTypeJsonSet.PgBase { + public Json() { + super(DbType.JSON, PostgresHelper.JSON_TYPE); + } + } + + /** + * List mapped to Postgres JSONB. + */ + private static class JsonB extends ScalarTypeJsonSet.PgBase { + public JsonB() { + super(DbType.JSONB, PostgresHelper.JSONB_TYPE); + } + } + + /** + * Base class for List handling. + */ + private abstract static class Base extends ScalarTypeJsonCollection { + + public Base(int dbType) { + super(Set.class, dbType); + } + + @Override + public Set read(DataReader dataReader) throws SQLException { + try { + // parse JSON into modifyAware list + return EJson.parseSet(dataReader.getString(), true); + } catch (IOException e) { + throw new SQLException("Failed to parse JSON content as List: ["+ dataReader.getString() +"]", e); + } + } + + @Override + public void bind(DataBind b, Set value) throws SQLException { + + if (value == null) { + b.setNull(Types.VARCHAR); + } else if (value.isEmpty()) { + b.setString("[]"); + } else { + try { + b.setString(EJson.write(value)); + } catch (IOException e) { + throw new SQLException("Failed to format Set into JSON content", e); + } + } + } + + @Override + public String formatValue(Set value) { + try { + return EJson.write(value); + } catch (IOException e) { + throw new PersistenceException("Failed to format List into JSON content", e); + } + } + + @Override + public Set parse(String value) { + try { + return convertList(EJson.parseList(value)); + } catch (IOException e) { + throw new PersistenceException("Failed to parse JSON content as Set: ["+value+"]", e); + } + } + + @Override + public Set jsonRead(JsonParser parser) throws IOException { + return convertList(EJson.parseList(parser, parser.getCurrentToken())); + } + + @Override + public void jsonWrite(JsonGenerator writer, Set value) throws IOException { + EJson.write(value, writer); + } + + @SuppressWarnings("unchecked") + private Set convertList(List list) { + LinkedHashSet set = new LinkedHashSet(); + set.addAll(list); + return set; + } + } + + /** + * Postgres extension to base List handling. + */ + private static class PgBase extends ScalarTypeJsonSet.Base { + + final String pgType; + + PgBase(int jdbcType, String pgType) { + super(jdbcType); + this.pgType = pgType; + } + + @Override + public void bind(DataBind bind, Set value) throws SQLException { + + String rawJson = (value == null) ? null : formatValue(value); + bind.setObject(PostgresHelper.asObject(pgType, rawJson)); + } + } + +} diff --git a/src/test/java/com/avaje/ebean/json/EJsonTests.java b/src/test/java/com/avaje/ebean/json/EJsonTests.java index 239fa0eaa..598d4fdeb 100644 --- a/src/test/java/com/avaje/ebean/json/EJsonTests.java +++ b/src/test/java/com/avaje/ebean/json/EJsonTests.java @@ -2,15 +2,23 @@ package com.avaje.ebean.json; import com.avaje.ebean.text.json.EJson; import com.avaje.ebeaninternal.server.type.ModifyAwareMap; +import com.avaje.ebeaninternal.server.type.ModifyAwareOwner; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; -import org.junit.Assert; import org.junit.Test; import java.io.IOException; import java.io.StringReader; +import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Set; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class EJsonTests { @@ -25,13 +33,13 @@ public class EJsonTests { Object result = EJson.parse(jsonParser); - Assert.assertTrue(result instanceof Map); + assertTrue(result instanceof Map); Map map = (Map)result; - Assert.assertEquals("rob", map.get("name")); - Assert.assertEquals(12L, map.get("age")); + assertEquals("rob", map.get("name")); + assertEquals(12L, map.get("age")); String jsonOutput = EJson.write(result); - Assert.assertEquals(jsonInput, jsonOutput); + assertEquals(jsonInput, jsonOutput); } @Test @@ -45,12 +53,12 @@ public class EJsonTests { Map map = EJson.parseObject(jsonParser); - Assert.assertNotNull(map); - Assert.assertEquals("rob", map.get("name")); - Assert.assertEquals(12L, map.get("age")); + assertNotNull(map); + assertEquals("rob", map.get("name")); + assertEquals(12L, map.get("age")); String jsonOutput = EJson.write(map); - Assert.assertEquals(jsonInput, jsonOutput); + assertEquals(jsonInput, jsonOutput); } @Test @@ -62,12 +70,12 @@ public class EJsonTests { Map map = EJson.parseObject(reader); - Assert.assertNotNull(map); - Assert.assertEquals("rob", map.get("name")); - Assert.assertEquals(12L, map.get("age")); + assertNotNull(map); + assertEquals("rob", map.get("name")); + assertEquals(12L, map.get("age")); String jsonOutput = EJson.write(map); - Assert.assertEquals(jsonInput, jsonOutput); + assertEquals(jsonInput, jsonOutput); } @Test @@ -76,24 +84,24 @@ public class EJsonTests { String jsonInput = "{\"name\":\"rob\",\"age\":12,\"org\":{\"name\":\"superorg\",\"rating\":4},\"nums\":[1,2,3]}"; Object result = EJson.parse(jsonInput); - Assert.assertTrue(result instanceof Map); + assertTrue(result instanceof Map); Map map = (Map)result; - Assert.assertEquals(4, map.size()); - Assert.assertEquals("rob", map.get("name")); - Assert.assertEquals(12L, map.get("age")); + assertEquals(4, map.size()); + assertEquals("rob", map.get("name")); + assertEquals(12L, map.get("age")); Map org = (Map)map.get("org"); - Assert.assertEquals("superorg", org.get("name")); - Assert.assertEquals(4L, org.get("rating")); + assertEquals("superorg", org.get("name")); + assertEquals(4L, org.get("rating")); List nums = (List)map.get("nums"); - Assert.assertEquals(3, nums.size()); - Assert.assertEquals(1L, nums.get(0)); - Assert.assertEquals(2L, nums.get(1)); - Assert.assertEquals(3L, nums.get(2)); + assertEquals(3, nums.size()); + assertEquals(1L, nums.get(0)); + assertEquals(2L, nums.get(1)); + assertEquals(3L, nums.get(2)); String jsonOutput = EJson.write(result); - Assert.assertEquals(jsonInput, jsonOutput); + assertEquals(jsonInput, jsonOutput); } @Test @@ -102,13 +110,13 @@ public class EJsonTests { String jsonInput = "{\"name\":\"rob\",\"age\":null}"; Object result = EJson.parse(jsonInput); - Assert.assertTrue(result instanceof Map); + assertTrue(result instanceof Map); Map map = (Map)result; - Assert.assertEquals("rob", map.get("name")); - Assert.assertNull(map.get("age")); + assertEquals("rob", map.get("name")); + assertNull(map.get("age")); String jsonOutput = EJson.write(result); - Assert.assertEquals(jsonInput, jsonOutput); + assertEquals(jsonInput, jsonOutput); } @Test @@ -117,14 +125,14 @@ public class EJsonTests { String jsonInput = "[\"name\",\"rob\",12,13]"; List list = EJson.parseList(jsonInput); - Assert.assertEquals(4, list.size()); - Assert.assertEquals("name", list.get(0)); - Assert.assertEquals("rob", list.get(1)); - Assert.assertEquals(12L, list.get(2)); - Assert.assertEquals(13L, list.get(3)); + assertEquals(4, list.size()); + assertEquals("name", list.get(0)); + assertEquals("rob", list.get(1)); + assertEquals(12L, list.get(2)); + assertEquals(13L, list.get(3)); String jsonOutput = EJson.write(list); - Assert.assertEquals(jsonInput, jsonOutput); + assertEquals(jsonInput, jsonOutput); } @Test @@ -134,14 +142,14 @@ public class EJsonTests { StringReader reader = new StringReader(jsonInput); List list = EJson.parseList(reader); - Assert.assertEquals(4, list.size()); - Assert.assertEquals("name", list.get(0)); - Assert.assertEquals("rob", list.get(1)); - Assert.assertEquals(12L, list.get(2)); - Assert.assertEquals(13L, list.get(3)); + assertEquals(4, list.size()); + assertEquals("name", list.get(0)); + assertEquals("rob", list.get(1)); + assertEquals(12L, list.get(2)); + assertEquals(13L, list.get(3)); String jsonOutput = EJson.write(list); - Assert.assertEquals(jsonInput, jsonOutput); + assertEquals(jsonInput, jsonOutput); } @Test @@ -154,14 +162,14 @@ public class EJsonTests { List list = EJson.parseList(parser); - Assert.assertEquals(4, list.size()); - Assert.assertEquals("name", list.get(0)); - Assert.assertEquals("rob", list.get(1)); - Assert.assertEquals(12L, list.get(2)); - Assert.assertEquals(13L, list.get(3)); + assertEquals(4, list.size()); + assertEquals("name", list.get(0)); + assertEquals("rob", list.get(1)); + assertEquals(12L, list.get(2)); + assertEquals(13L, list.get(3)); String jsonOutput = EJson.write(list); - Assert.assertEquals(jsonInput, jsonOutput); + assertEquals(jsonInput, jsonOutput); } @SuppressWarnings("unchecked") @@ -171,17 +179,17 @@ public class EJsonTests { String jsonInput = "[{\"name\":\"rob\",\"age\":12},{\"name\":\"mike\",\"age\":13}]"; Object result = EJson.parse(jsonInput); - Assert.assertTrue(result instanceof List); + assertTrue(result instanceof List); List> list = (List>)result; - Assert.assertEquals(2, list.size()); - Assert.assertEquals("rob", list.get(0).get("name")); - Assert.assertEquals(12L, list.get(0).get("age")); - Assert.assertEquals("mike", list.get(1).get("name")); - Assert.assertEquals(13L, list.get(1).get("age")); + assertEquals(2, list.size()); + assertEquals("rob", list.get(0).get("name")); + assertEquals(12L, list.get(0).get("age")); + assertEquals("mike", list.get(1).get("name")); + assertEquals(13L, list.get(1).get("age")); String jsonOutput = EJson.write(result); - Assert.assertEquals(jsonInput, jsonOutput); + assertEquals(jsonInput, jsonOutput); } @Test @@ -192,15 +200,14 @@ public class EJsonTests { Object result = EJson.parse(reader); - Assert.assertTrue(result instanceof Map); + assertTrue(result instanceof Map); Map map = (Map)result; - Assert.assertEquals("rob", map.get("name")); - Assert.assertNull(map.get("age")); + assertEquals("rob", map.get("name")); + assertNull(map.get("age")); Map friend = (Map)map.get("friend"); - Assert.assertEquals("mike", friend.get("name")); - Assert.assertEquals(13L, friend.get("age")); - + assertEquals("mike", friend.get("name")); + assertEquals(13L, friend.get("age")); } @@ -210,12 +217,11 @@ public class EJsonTests { String jsonInput = "{\"name\":\"rob\",\"age\":12,\"org\":{\"name\":\"superorg\",\"rating\":4},\"nums\":[1,2,3]}"; ModifyAwareMap map = (ModifyAwareMap) EJson.parseObject(jsonInput, true); - Assert.assertFalse(map.isMarkedDirty()); - Assert.assertEquals(4, map.size()); + assertFalse(map.isMarkedDirty()); + assertEquals(4, map.size()); map.put("name", "jim"); - Assert.assertTrue(map.isMarkedDirty()); - + assertTrue(map.isMarkedDirty()); } @SuppressWarnings("unchecked") @@ -224,12 +230,11 @@ public class EJsonTests { String jsonInput = "{\"name\":\"rob\",\"age\":12,\"org\":{\"name\":\"superorg\",\"rating\":4},\"nums\":[1,2,3]}"; ModifyAwareMap map = (ModifyAwareMap) EJson.parseObject(jsonInput, true); - Assert.assertFalse(map.isMarkedDirty()); + assertFalse(map.isMarkedDirty()); List nums = (List) map.get("nums"); nums.add(4); - Assert.assertTrue(map.isMarkedDirty()); - + assertTrue(map.isMarkedDirty()); } @SuppressWarnings("unchecked") @@ -238,12 +243,11 @@ public class EJsonTests { String jsonInput = "{\"name\":\"rob\",\"age\":12,\"org\":{\"name\":\"superorg\",\"rating\":4},\"nums\":[1,2,3]}"; ModifyAwareMap map = (ModifyAwareMap) EJson.parseObject(jsonInput, true); - Assert.assertFalse(map.isMarkedDirty()); + assertFalse(map.isMarkedDirty()); Map org = (Map) map.get("org"); org.put("extra","foo"); - Assert.assertTrue(map.isMarkedDirty()); - + assertTrue(map.isMarkedDirty()); } @@ -251,13 +255,31 @@ public class EJsonTests { public void parse_when_null() throws IOException { Object nothing = EJson.parse((String) null); - Assert.assertNull(nothing); + assertNull(nothing); } @Test public void parseList_when_null() throws IOException { Object nothing = EJson.parseList((String) null); - Assert.assertNull(nothing); + assertNull(nothing); + } + + @Test + public void parseSet_when_modifyAware() throws IOException { + + String jsonInput = "[{\"name\":\"rob\",\"age\":12},{\"name\":\"jim\",\"age\":42}]"; + + Set set = EJson.parseSet(jsonInput, true); + + ModifyAwareOwner modAware = (ModifyAwareOwner)set; + assertFalse(modAware.isMarkedDirty()); + + Iterator iterator = set.iterator(); + if (iterator.hasNext()) { + Map map = (Map)iterator.next(); + map.put("name","stu"); + assertTrue(modAware.isMarkedDirty()); + } } } diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareListTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareListTest.java index 3c194c83c..6dd619067 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareListTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareListTest.java @@ -225,4 +225,16 @@ public class ModifyAwareListTest { sub.remove("C"); assertTrue(list.isMarkedDirty()); } + + @Test + public void testAsSet() throws Exception { + + ModifyAwareList list = createList(); + ModifyAwareSet set = list.asSet(); + assertFalse(set.isMarkedDirty()); + + set.add("next"); + + assertTrue(set.isMarkedDirty()); + } } \ No newline at end of file diff --git a/src/test/java/com/avaje/tests/json/TestDbJson_List.java b/src/test/java/com/avaje/tests/json/TestDbJson_List.java index 34e7891f7..7e876027d 100644 --- a/src/test/java/com/avaje/tests/json/TestDbJson_List.java +++ b/src/test/java/com/avaje/tests/json/TestDbJson_List.java @@ -10,6 +10,7 @@ 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 TestDbJson_List extends BaseTestCase { @@ -22,19 +23,26 @@ public class TestDbJson_List extends BaseTestCase { bean.setName("stuff"); - List tags = bean.getTags(); - tags.add("one"); - tags.add("two"); + bean.getTags().add("one"); + bean.getTags().add("two"); + + bean.getFlags().add(42L); + bean.getFlags().add(43L); + bean.getFlags().add(44L); Ebean.save(bean); found = Ebean.find(EBasicJsonList.class, bean.getId()); assertThat(found.getTags()).containsExactly("one", "two"); + assertTrue(found.getFlags().contains(42L)); + assertTrue(found.getFlags().contains(43L)); + assertTrue(found.getFlags().contains(44L)); json_parse_format(); update_when_notDirty(); update_when_dirty(); + update_when_dirty_flags(); } //@Test//(dependsOnMethods = "insert") @@ -42,6 +50,7 @@ public class TestDbJson_List extends BaseTestCase { String asJson = Ebean.json().toJson(found); assertThat(asJson).contains("\"tags\":[\"one\",\"two\"]"); + assertThat(asJson).contains("\"flags\":[42,43,44]"); assertThat(asJson).contains("\"id\":"); EBasicJsonList fromJson = Ebean.json().toBean(EBasicJsonList.class, asJson); @@ -49,6 +58,10 @@ public class TestDbJson_List extends BaseTestCase { assertEquals(found.getId(), fromJson.getId()); assertEquals(found.getName(), fromJson.getName()); assertThat(fromJson.getTags()).containsExactly("one", "two"); + assertTrue(fromJson.getFlags().contains(42L)); + assertTrue(fromJson.getFlags().contains(43L)); + assertTrue(fromJson.getFlags().contains(44L)); + } //@Test//(dependsOnMethods = "insert") @@ -75,4 +88,18 @@ public class TestDbJson_List extends BaseTestCase { // we don't update the phone numbers (as they are not dirty) assertThat(sql.get(0)).contains("update ebasic_json_list set tags=?, version=? where"); } + + public void update_when_dirty_flags() { + + //found.setName("modAgain"); + found.getFlags().remove(42L); + + LoggedSqlCollector.start(); + Ebean.save(found); + List sql = LoggedSqlCollector.stop(); + + // we don't update the phone numbers (as they are not dirty) + assertThat(sql.get(0)).contains("update ebasic_json_list set flags=?, version=? where"); + } + } diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonList.java b/src/test/java/com/avaje/tests/model/json/EBasicJsonList.java index cf694cb23..9d6688a08 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonList.java +++ b/src/test/java/com/avaje/tests/model/json/EBasicJsonList.java @@ -7,7 +7,9 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Version; import java.util.ArrayList; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Set; @Entity public class EBasicJsonList { @@ -17,6 +19,9 @@ public class EBasicJsonList { String name; + @DbJson(length = 50) + Set flags = new LinkedHashSet(); + @DbJson(length = 100, storage = DbJsonType.VARCHAR) List tags = new ArrayList(); @@ -47,6 +52,14 @@ public class EBasicJsonList { this.tags = tags; } + public Set getFlags() { + return flags; + } + + public void setFlags(Set flags) { + this.flags = flags; + } + public Long getVersion() { return version; }