Merge pull request #2107 from ebean-orm/feature/ModifyAwareType

Refactor io.ebeaninternal.json.ModifyAwareOwner to io.ebean.ModifyAwareType

ebean-core/src/test/java/io/ebean/json/EJsonTests.java

@@ -2,7 +2,7 @@ package io.ebean.json;
 
 import io.ebean.text.json.EJson;
 import io.ebeaninternal.json.ModifyAwareMap;
-import io.ebeaninternal.json.ModifyAwareOwner;
+import io.ebean.ModifyAwareType;
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import org.junit.Test;
@@ -293,7 +293,7 @@ public class EJsonTests {
 
     Set set = EJson.parseSet(jsonInput, true);
 
-    ModifyAwareOwner modAware = (ModifyAwareOwner) set;
+    ModifyAwareType modAware = (ModifyAwareType) set;
     assertFalse(modAware.isMarkedDirty());
 
     Iterator iterator = set.iterator();

ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java

@@ -59,7 +59,7 @@ public class ModifyAwareMapTest {
     ModifyAwareMap<String, String> map = createMap();
     assertFalse(map.isMarkedDirty());
 
-    map.markAsModified();
+    map.setMarkedDirty(true);
     Assert.assertTrue(map.isMarkedDirty());
   }
 

ebean-core/src/test/java/io/ebeaninternal/server/type/ModifyAwareFlagTest.java

@@ -20,7 +20,7 @@ public class ModifyAwareFlagTest {
     ObjectOutputStream oos = new ObjectOutputStream(os);
 
     ModifyAwareFlag flag = new ModifyAwareFlag();
-    flag.markAsModified();
+    flag.setMarkedDirty(true);
     oos.writeObject(flag);
     oos.flush();
     oos.close();