JSON bean dirty detection via MD5 of JSON string content

- MD5 of json content stored on EntityBeanIntercept for dirty detection
- Only convert to JSON once (at dirty detection time). Store this json content on EntityBeanIntercept to later push to ScalarTypeJsonObjectMapper for bind

Should consider alternative to extend BeanProperty rather than have these if blocks.

ebean-core/src/test/java/org/tests/json/TestDbJson_Jackson3.java

@@ -74,6 +74,7 @@ public class TestDbJson_Jackson3 extends BaseTestCase {
 
     final List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("update ebasic_json_list set name=?, bean_list=?, plain_bean=?, version=? where id=?");
+    // plain_bean=?, no longer included with MD5 dirty detection
+    assertThat(sql.get(0)).contains("update ebasic_json_list set name=?, bean_list=?, version=? where id=?");
   }
 }

ebean-core/src/test/java/org/tests/json/TestDbJson_List.java

@@ -113,7 +113,8 @@ public class TestDbJson_List extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
 
     // we don't update the phone numbers (as they are not dirty)
-    assertSql(sql.get(0)).contains("update ebasic_json_list set name=?, plain_bean=?, version=? where");
+    // plain_bean=?, no longer included with MD5 dirty detection
+    assertSql(sql.get(0)).contains("update ebasic_json_list set name=?, version=? where");
   }
 
   public void update_when_dirty() {
@@ -126,7 +127,8 @@ public class TestDbJson_List extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
 
     // we don't update the phone numbers (as they are not dirty)
-    assertSql(sql.get(0)).contains("update ebasic_json_list set plain_bean=?, tags=?, version=? where id=? and version=?");
+    // plain_bean=? not included using MD5 dirty detection
+    assertSql(sql.get(0)).contains("update ebasic_json_list set tags=?, version=? where id=? and version=?");
   }
 
   public void update_when_dirty_flags() {
@@ -139,7 +141,8 @@ public class TestDbJson_List extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
 
     // we don't update the phone numbers (as they are not dirty)
-    assertSql(sql.get(0)).contains("update ebasic_json_list set plain_bean=?, flags=?, version=? where id=? and version=?;");
+    // plain_bean=? not included with MD5 dirty detection
+    assertSql(sql.get(0)).contains("update ebasic_json_list set flags=?, version=? where id=? and version=?;");
   }
 
   public void update_when_dirty_SetListMap() {
@@ -154,7 +157,8 @@ public class TestDbJson_List extends BaseTestCase {
     List<String> sql = LoggedSqlCollector.stop();
 
     // we don't update the phone numbers (as they are not dirty)
-    assertSql(sql.get(0)).contains("update ebasic_json_list set beans=?, bean_list=?, bean_map=?, plain_bean=?, version=? where id=? and version=?");
+    // plain_bean=? not included with MD5 dirty detection
+    assertSql(sql.get(0)).contains("update ebasic_json_list set beans=?, bean_list=?, bean_map=?, version=? where id=? and version=?");
   }
 
   @Test

ebean-core/src/test/java/org/tests/model/json/EBasicPlain.java

@@ -0,0 +1,54 @@
+package org.tests.model.json;
+
+import io.ebean.annotation.DbJson;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Version;
+
+@Entity
+public class EBasicPlain {
+
+  @Id
+  long id;
+
+  String attr;
+
+  @DbJson(length = 500)
+  PlainBean plainBean;
+
+  @Version
+  long version;
+
+  public long getId() {
+    return id;
+  }
+
+  public void setId(long id) {
+    this.id = id;
+  }
+
+  public String getAttr() {
+    return attr;
+  }
+
+  public void setAttr(String attr) {
+    this.attr = attr;
+  }
+
+  public PlainBean getPlainBean() {
+    return plainBean;
+  }
+
+  public void setPlainBean(PlainBean plainBean) {
+    this.plainBean = plainBean;
+  }
+
+  public long getVersion() {
+    return version;
+  }
+
+  public void setVersion(long version) {
+    this.version = version;
+  }
+}

ebean-core/src/test/java/org/tests/model/json/TestJacksonPlainBean.java

@@ -0,0 +1,73 @@
+package org.tests.model.json;
+
+import io.ebean.DB;
+import org.ebeantest.LoggedSqlCollector;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestJacksonPlainBean {
+
+  @Test
+  public void insertUpdate() {
+
+    DB.getDefault();
+    LoggedSqlCollector.start();
+
+    PlainBean content = new PlainBean();
+    content.setAlong(42);
+    content.setName("foo");
+
+    EBasicPlain bean = new EBasicPlain();
+    bean.setAttr("attr0");
+    bean.setPlainBean(content);
+
+
+    DB.save(bean);
+    expectedSql(0, "insert into ebasic_plain (attr, plain_bean, version) values (?,?,?)");
+
+
+    // inserted plainBean has not been mutated
+    bean.setAttr("attr1");
+    DB.save(bean);
+    expectedSql(0, "update ebasic_plain set attr=?, version=? where id=? and version=?");
+
+
+    // inserted plainBean has now been mutated
+    content.setName("notFoo");
+    bean.setAttr("attr2");
+    DB.save(bean);
+    expectedSql(0, "update ebasic_plain set attr=?, plain_bean=?, version=? where id=? and version=?");
+
+
+    final EBasicPlain found = DB.find(EBasicPlain.class, bean.getId());
+
+    // update mutating PlainBean only
+    final PlainBean plainBean = found.getPlainBean();
+    plainBean.setName("mod1");
+    DB.save(found);
+    expectedSql(1, "update ebasic_plain set plain_bean=?, version=? where id=? and version=?");
+
+
+    // update bean, mutate PlainBean only
+    plainBean.setName("mod2");
+    DB.save(found);
+    expectedSql(0, "update ebasic_plain set plain_bean=?, version=? where id=? and version=?");
+
+
+    // update bean, not mutating PlainBean
+    found.setAttr("attr3");
+    DB.save(found);
+    expectedSql(LoggedSqlCollector.stop(), 0, "update ebasic_plain set attr=?, version=? where id=? and version=?");
+  }
+
+  private void expectedSql(int i, String s) {
+    assertThat(LoggedSqlCollector.current().get(i)).contains(s);
+  }
+
+  private void expectedSql(List<String> sql, int i, String s) {
+    assertThat(sql.get(i)).contains(s);
+  }
+}