#115 - Mapping - Add support for @ElementCollection enhancement

Add element collection L2 cache support

src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java

@@ -5,7 +5,7 @@ import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 import org.junit.Test;
 import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
@@ -57,7 +57,7 @@ public class TestDiffHelpInsertSimple extends BaseTestCase {
     SpiJsonWriter jsonWriter = spiEbeanServer().jsonExtended().createJsonWriter(buffer);
 
     orderDesc.jsonWriteForInsert(jsonWriter, (EntityBean) order1);
-    jsonWriter.gen().flush();
+    jsonWriter.flush();
 
     String asJson = buffer.toString();
 

src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java

@@ -5,7 +5,7 @@ import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.bean.EntityBean;
 import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.server.text.json.SpiJsonWriter;
+import io.ebeaninternal.api.json.SpiJsonWriter;
 import org.junit.Test;
 import org.tests.model.embedded.EMain;
 import org.tests.model.embedded.Eembeddable;
@@ -44,7 +44,7 @@ public class TestDiffHelpInsertWithEmbedded extends BaseTestCase {
     SpiJsonWriter jsonWriter = spiEbeanServer().jsonExtended().createJsonWriter(buffer);
 
     emainDesc.jsonWriteForInsert(jsonWriter, emain1);
-    jsonWriter.gen().flush();
+    jsonWriter.flush();
 
     return buffer.toString();
   }

src/test/java/org/tests/model/elementcollection/EcPerson.java

@@ -1,5 +1,7 @@
 package org.tests.model.elementcollection;
 
+import io.ebean.annotation.Cache;
+
 import javax.persistence.CollectionTable;
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
@@ -10,6 +12,7 @@ import javax.persistence.Version;
 import java.util.ArrayList;
 import java.util.List;
 
+@Cache
 @Entity
 public class EcPerson {
 

src/test/java/org/tests/model/elementcollection/EcblPerson.java

@@ -1,5 +1,7 @@
 package org.tests.model.elementcollection;
 
+import io.ebean.annotation.Cache;
+
 import javax.persistence.CollectionTable;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
@@ -9,6 +11,7 @@ import javax.persistence.Version;
 import java.util.ArrayList;
 import java.util.List;
 
+@Cache
 @Entity
 public class EcblPerson {
 

src/test/java/org/tests/model/elementcollection/EcbmPerson.java

@@ -1,5 +1,7 @@
 package org.tests.model.elementcollection;
 
+import io.ebean.annotation.Cache;
+
 import javax.persistence.CollectionTable;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
@@ -9,7 +11,7 @@ import javax.persistence.Version;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-
+@Cache
 @Entity
 public class EcbmPerson {
 

src/test/java/org/tests/model/elementcollection/EcmPerson.java

@@ -1,5 +1,7 @@
 package org.tests.model.elementcollection;
 
+import io.ebean.annotation.Cache;
+
 import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
@@ -9,6 +11,7 @@ import javax.persistence.Version;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+@Cache
 @Entity
 public class EcmPerson {
 

src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java

@@ -0,0 +1,80 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestElementCollectionBasicCache {
+
+  @Test
+  public void test() {
+
+    EcPerson person = new EcPerson("Cache1");
+    person.getPhoneNumbers().add("021 1234");
+    person.getPhoneNumbers().add("021 4321");
+    Ebean.save(person);
+
+    EcPerson one = Ebean.find(EcPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    one.getPhoneNumbers().size();
+
+    LoggedSqlCollector.start();
+
+    EcPerson two = Ebean.find(EcPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    two.setName("CacheMod");
+    two.getPhoneNumbers().add("027 234234");
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit containing phone numbers
+
+    Ebean.save(two);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+
+    Ebean.save(two);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // no change
+
+    EcPerson three = Ebean.find(EcPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    assertThat(three.getName()).isEqualTo("CacheMod");
+    assertThat(three.getPhoneNumbers()).contains("021 1234", "021 4321", "027 234234");
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit
+
+    three.getPhoneNumbers().add("09 6534");
+    Ebean.save(three);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2); // cache hit
+
+    EcPerson four = Ebean.find(EcPerson.class)
+      .setId(person.getId())
+      .fetch("phoneNumbers")
+      .findOne();
+
+    assertThat(four.getName()).isEqualTo("CacheMod");
+    assertThat(four.getPhoneNumbers()).contains("021 1234", "021 4321", "027 234234", "09 6534");
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit
+
+    Ebean.delete(four);
+
+    LoggedSqlCollector.stop();
+  }
+}

src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java

@@ -0,0 +1,85 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestElementCollectionBasicMapCache {
+
+  @Test
+  public void test() {
+
+    EcmPerson person = new EcmPerson("CacheMap");
+    person.getPhoneNumbers().put("home", "021 1234");
+    person.getPhoneNumbers().put("work", "021 4321");
+    Ebean.save(person);
+
+
+    EcmPerson one = Ebean.find(EcmPerson.class)
+      .setId(person.getId())
+      .fetch("phoneNumbers")
+      .findOne();
+
+    one.getPhoneNumbers().size();
+
+    LoggedSqlCollector.start();
+
+    EcmPerson two = Ebean.find(EcmPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    two.setName("CacheMod");
+    two.getPhoneNumbers().put("mob", "027 234234");
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit containing phone numbers
+
+    Ebean.save(two);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+
+    Ebean.save(two);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // no change
+
+    EcmPerson three = Ebean.find(EcmPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    assertThat(three.getName()).isEqualTo("CacheMod");
+    assertThat(three.getPhoneNumbers().toString()).contains("021 1234", "021 4321", "027 234234");
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit
+
+    three.getPhoneNumbers().put("oth", "09 6534");
+    three.getPhoneNumbers().remove("home");
+    three.getPhoneNumbers().remove("work");
+    Ebean.save(three);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2); // cache hit
+
+    EcmPerson four = Ebean.find(EcmPerson.class)
+      .setId(person.getId())
+      .fetch("phoneNumbers")
+      .findOne();
+
+    assertThat(four.getName()).isEqualTo("CacheMod");
+    assertThat(four.getPhoneNumbers().toString()).contains("027 234234", "09 6534");
+    assertThat(four.getPhoneNumbers()).hasSize(2);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit
+
+    Ebean.delete(four);
+
+    LoggedSqlCollector.stop();
+  }
+}

src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java

@@ -0,0 +1,88 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestElementCollectionEmbeddedListCache extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    EcblPerson person = new EcblPerson("CacheL");
+    person.getPhoneNumbers().add(new EcPhone("64", "021","1234"));
+    person.getPhoneNumbers().add(new EcPhone("64","021","4321"));
+    Ebean.save(person);
+
+    EcblPerson one = Ebean.find(EcblPerson.class)
+      .setId(person.getId())
+      .fetch("phoneNumbers")
+      .findOne();
+
+    LoggedSqlCollector.start();
+
+    one.getPhoneNumbers().size();
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty();
+
+    EcblPerson two = Ebean.find(EcblPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    two.getPhoneNumbers().size();
+    assertThat(two.getPhoneNumbers().toString()).contains("64-021-1234", "64-021-4321");
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit
+
+    two.getPhoneNumbers().add(new EcPhone("61", "07", "11"));
+    two.getPhoneNumbers().remove(1);
+
+    Ebean.save(two);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2); // update of collection only
+    assertThat(sql.get(0)).contains("delete from ecbl_person_phone_numbers where person_id=?");
+    assertThat(sql.get(1)).contains("insert into ecbl_person_phone_numbers (person_id,country_code,area,number) values (?,?,?,?)");
+
+    EcblPerson three = Ebean.find(EcblPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    assertThat(three.getPhoneNumbers().toString()).contains("61-07-11", "64-021-1234");
+    assertThat(three.getPhoneNumbers()).hasSize(2);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit
+
+
+    three.setName("mod-3");
+    three.getPhoneNumbers().remove(0);
+
+    Ebean.save(three);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+
+    EcblPerson four = Ebean.find(EcblPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    assertThat(four.getPhoneNumbers().toString()).contains("61-07-11");
+    assertThat(four.getPhoneNumbers()).hasSize(1);
+
+
+    Ebean.delete(four);
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+
+
+    LoggedSqlCollector.stop();
+  }
+}

src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java

@@ -90,7 +90,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
     assertThat(sql).hasSize(3);
     assertThat(sql.get(0)).contains("update ecbm_person set name=?, version=? where id=? and version=?");
     assertThat(sql.get(1)).contains("delete from ecbm_person_phone_numbers where person_id=?");
-    assertThat(sql.get(2)).contains("insert into ecbm_person_phone_numbers (person_id,key,country_code,area,number)");
+    assertThat(sql.get(2)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number)");
 
     updateNothing(bean);
   }
@@ -113,7 +113,7 @@ public class TestElementCollectionEmbeddedMap extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.current();
     assertThat(sql).hasSize(2);
     assertThat(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
-    assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,key,country_code,area,number) values (?,?,?,?,?)");
+    assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
 
     delete(bean);
   }

src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java

@@ -0,0 +1,89 @@
+package org.tests.model.elementcollection;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestElementCollectionEmbeddedMapCache extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    EcbmPerson person = new EcbmPerson("Cache1");
+    person.getPhoneNumbers().put("home", new EcPhone("64", "021", "1234"));
+    person.getPhoneNumbers().put("work", new EcPhone("64", "021", "4321"));
+    Ebean.save(person);
+
+
+    EcbmPerson one = Ebean.find(EcbmPerson.class)
+      .setId(person.getId())
+      .fetch("phoneNumbers")
+      .findOne();
+
+    LoggedSqlCollector.start();
+
+    one.getPhoneNumbers().size();
+
+    List<String> sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty();
+
+    EcbmPerson two = Ebean.find(EcbmPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    two.getPhoneNumbers().size();
+    assertThat(two.getPhoneNumbers().toString()).contains("64-021-1234", "64-021-4321");
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit
+
+    two.getPhoneNumbers().put("mob", new EcPhone("61", "07", "11"));
+    two.getPhoneNumbers().remove("home");
+
+    Ebean.save(two);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2); // update of collection only
+    assertThat(sql.get(0)).contains("delete from ecbm_person_phone_numbers where person_id=?");
+    assertThat(sql.get(1)).contains("insert into ecbm_person_phone_numbers (person_id,mkey,country_code,area,number) values (?,?,?,?,?)");
+
+    EcbmPerson three = Ebean.find(EcbmPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    assertThat(three.getPhoneNumbers().toString()).contains("61-07-11", "64-021-4321");
+    assertThat(three.getPhoneNumbers()).hasSize(2);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).isEmpty(); // cache hit
+
+
+    three.setName("mod-3");
+    three.getPhoneNumbers().remove("work");
+
+    Ebean.save(three);
+
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(3);
+
+    EcbmPerson four = Ebean.find(EcbmPerson.class)
+      .setId(person.getId())
+      .findOne();
+
+    assertThat(four.getPhoneNumbers().toString()).contains("61-07-11");
+    assertThat(four.getPhoneNumbers()).hasSize(1);
+
+
+    Ebean.delete(four);
+    sql = LoggedSqlCollector.current();
+    assertThat(sql).hasSize(2);
+
+
+    LoggedSqlCollector.stop();
+  }
+}

src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java

@@ -1,15 +1,16 @@
 package org.tests.text.json;
 
+import com.fasterxml.jackson.core.JsonParser;
 import io.ebean.BaseTestCase;
 import io.ebean.BeanState;
 import io.ebean.Ebean;
 import io.ebeaninternal.api.SpiEbeanServer;
+import io.ebeaninternal.api.json.SpiJsonReader;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.text.json.ReadJson;
-import org.tests.model.basic.Customer;
-import com.fasterxml.jackson.core.JsonParser;
 import org.junit.Assert;
 import org.junit.Test;
+import org.tests.model.basic.Customer;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -28,7 +29,7 @@ public class TestJsonBeanDescriptorParse extends BaseTestCase {
     StringReader reader = new StringReader("{\"id\":123,\"name\":\"Hello rob\"}");
     JsonParser parser = server.json().createParser(reader);
 
-    ReadJson readJson = new ReadJson(descriptor, parser, null, null);
+    SpiJsonReader readJson = new ReadJson(descriptor, parser, null, null);
 
     Customer customer = descriptor.jsonRead(readJson, null);