#2061 - Fix for L2 bean cache loaded using lazy loading on mutated partially loaded bean

The fix is when the property is dirty (mutated) put the original value into the cache entry.

src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java

@@ -43,7 +43,7 @@ public class CacheBeanDataTest extends BaseTestCase {
     billingAddress.setLine1("92 Someplace Else");
     c.setBillingAddress(billingAddress);
 
-    ((EntityBean) c)._ebean_getIntercept().setNewBeanForUpdate();
+    ((EntityBean) c)._ebean_getIntercept().setLoaded();
 
     CachedBeanData cacheData = CachedBeanDataFromBean.extract(desc, (EntityBean) c);
 

src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java

@@ -5,21 +5,24 @@ import io.ebean.bean.EntityBean;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
+import org.junit.Test;
 import org.tests.model.basic.Address;
 import org.tests.model.basic.Car;
+import org.tests.model.basic.Contact;
 import org.tests.model.basic.Customer;
-import org.junit.Test;
 
 import java.sql.Date;
+import java.util.Map;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 public class CachedBeanDataFromBeanTest extends BaseTestCase {
 
-  SpiEbeanServer server = spiEbeanServer();
+  private final SpiEbeanServer server = spiEbeanServer();
 
   @Test
-  public void extract() throws Exception {
+  public void extract() {
 
     BeanDescriptor<Customer> desc = server.getBeanDescriptor(Customer.class);
 
@@ -64,4 +67,61 @@ public class CachedBeanDataFromBeanTest extends BaseTestCase {
     assertEquals(newCar.getDriver(), car.getDriver());
     assertEquals(newCar.getNotes(), car.getNotes());
   }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  public void dirtyScalar_expect_originalValueUsed() {
+
+    Contact contact = new Contact();
+    contact.setId(42);
+    contact.setLastName("Bygrave");
+    contact.setFirstName("Foo");
+    contact.setEmail("rob@email.com");
+
+    EntityBean entityBean = (EntityBean)contact;
+    entityBean._ebean_getIntercept().setLoaded();
+
+    // mutate, dirty
+    contact.setLastName("Banana");
+
+    final BeanDescriptor<Contact> desc = getBeanDescriptor(Contact.class);
+    CachedBeanData cacheData = CachedBeanDataFromBean.extract(desc, entityBean);
+
+    final Map<String, Object> data = cacheData.getData();
+    assertThat(data.get("id")).isEqualTo("42");
+    assertThat(data.get("lastName")).isEqualTo("Bygrave"); // ORIGINAL VALUE
+    assertThat(data.get("firstName")).isEqualTo(contact.getFirstName());
+    assertThat(data.get("email")).isEqualTo(contact.getEmail());
+  }
+
+  @Test
+  public void dirtyManyToOne_expect_originalValueUsed() {
+
+    Customer customer = new Customer();
+    customer.setId(99);
+
+    Contact contact = new Contact();
+    contact.setFirstName("Foo");
+    contact.setLastName("Bygrave");
+    contact.setEmail("rob@email.com");
+    contact.setCustomer(customer);
+
+    EntityBean entityBean = (EntityBean)contact;
+    entityBean._ebean_getIntercept().setLoaded();
+
+    // mutate, dirty
+    Customer customer2 = new Customer();
+    customer2.setId(108);
+    contact.setCustomer(customer2);
+    contact.setLastName("Banana");
+
+    final BeanDescriptor<Contact> desc = getBeanDescriptor(Contact.class);
+    CachedBeanData cacheData = CachedBeanDataFromBean.extract(desc, entityBean);
+
+    final Map<String, Object> data = cacheData.getData();
+    assertThat(data.get("lastName")).isEqualTo("Bygrave"); // Original value
+    assertThat(data.get("customer")).isEqualTo("99");  // Original value
+    assertThat(data.get("firstName")).isEqualTo(contact.getFirstName());
+    assertThat(data.get("email")).isEqualTo(contact.getEmail());
+  }
 }