#650 - Refactor: Optimise L2 cache entry for serialisation

src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java

@@ -32,9 +32,9 @@ public class CachedBeanDataFromBeanTest extends BaseTestCase {
 
     CachedBeanData cacheData = CachedBeanDataFromBean.extract(desc, (EntityBean) customer);
 
-    assertEquals(cacheData.getData("id"), Integer.valueOf(42));
+    assertEquals(cacheData.getData("id"), "42");
     assertEquals(cacheData.getData("name"), "Rob");
-    assertEquals(cacheData.getData("billingAddress"), Short.valueOf("12"));
+    assertEquals(cacheData.getData("billingAddress"), "12");
   }
 
 

src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java

@@ -0,0 +1,137 @@
+package com.avaje.ebeaninternal.server.cache;
+
+import com.avaje.ebean.BaseTestCase;
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.bean.EntityBean;
+import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
+import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.ResetBasicData;
+import com.avaje.tests.model.basic.TBytesOnly;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+
+public class CachedBeanDataSerializeTest extends BaseTestCase {
+
+  @Test
+  public void write() throws IOException, ClassNotFoundException {
+
+    Map<String, Object> map = new LinkedHashMap<String,Object>();
+    map.put("name", "rob");
+    map.put("some", "thing");
+    map.put("whenCreated", ""+System.currentTimeMillis());
+
+    long version = System.currentTimeMillis();
+    CachedBeanData write = new CachedBeanData(null, "C", map, version);
+
+    ByteArrayOutputStream os = new ByteArrayOutputStream();
+    ObjectOutputStream oos = new ObjectOutputStream(os);
+
+    write.writeExternal(oos);
+    oos.flush();
+    oos.close();
+
+    byte[] bytes = os.toByteArray();
+
+    ByteArrayInputStream is = new ByteArrayInputStream(bytes);
+    ObjectInputStream ois = new ObjectInputStream(is);
+
+    CachedBeanData read = new CachedBeanData();
+    read.readExternal(ois);
+
+    assertEquals(read.getVersion(), write.getVersion());
+    assertEquals(read.getWhenCreated(), write.getWhenCreated());
+    assertEquals(read.getDiscValue(), write.getDiscValue());
+    assertEquals(read.getData(), write.getData());
+  }
+
+
+  @Test
+  public void fullBean() throws IOException, ClassNotFoundException {
+
+    ResetBasicData.reset();
+
+    List<Customer> customers = Ebean.find(Customer.class)
+        .orderBy().asc("id")
+        .setMaxRows(1).findList();
+
+    Customer customer = customers.get(0);
+
+    BeanDescriptor<Customer> desc = getBeanDescriptor(Customer.class);
+    CachedBeanData extract = CachedBeanDataFromBean.extract(desc, (EntityBean)customer);
+
+    ByteArrayOutputStream os = new ByteArrayOutputStream();
+    writeToStream(extract, os);
+
+    byte[] bytes = os.toByteArray();
+
+    CachedBeanData read = readFromStream(bytes);
+
+    assertEquals(read.getData(), extract.getData());
+
+    Customer loadCustomer = new Customer();
+    CachedBeanDataToBean.load(desc, (EntityBean)loadCustomer, read);
+
+    assertEquals(loadCustomer.getVersion(), customer.getVersion());
+    assertEquals(loadCustomer.getId(), customer.getId());
+    assertEquals(loadCustomer.getName(), customer.getName());
+    assertEquals(loadCustomer.getStatus(), customer.getStatus());
+  }
+
+  @Test
+  public void beanWithByteArray() throws IOException, ClassNotFoundException {
+
+    String stringContent = "ThisIsSome";
+
+    TBytesOnly bean = new TBytesOnly();
+    bean.setId(42);
+    bean.setContent(stringContent.getBytes("UTF8"));
+
+    BeanDescriptor<TBytesOnly> desc = getBeanDescriptor(TBytesOnly.class);
+    CachedBeanData extract = CachedBeanDataFromBean.extract(desc, (EntityBean)bean);
+
+    ByteArrayOutputStream os = new ByteArrayOutputStream();
+    writeToStream(extract, os);
+    byte[] bytes = os.toByteArray();
+
+    CachedBeanData read = readFromStream(bytes);
+    byte[] extraContent = (byte[])extract.getData("content");
+
+    assertEquals(stringContent, new String(extraContent));
+    assertTrue(Arrays.equals(bean.getContent(), extraContent));
+
+    TBytesOnly loadBean= new TBytesOnly();
+    CachedBeanDataToBean.load(desc, (EntityBean)loadBean, read);
+
+    assertEquals(loadBean.getId(), bean.getId());
+    assertTrue(Arrays.equals(loadBean.getContent(), bean.getContent()));
+  }
+
+  private CachedBeanData readFromStream(byte[] bytes) throws IOException, ClassNotFoundException {
+
+    ByteArrayInputStream is = new ByteArrayInputStream(bytes);
+    ObjectInputStream ois = new ObjectInputStream(is);
+    return (CachedBeanData)ois.readObject();
+  }
+
+  private void writeToStream(CachedBeanData extract, ByteArrayOutputStream os) throws IOException {
+
+    ObjectOutputStream oos = new ObjectOutputStream(os);
+    oos.writeObject(extract);
+    oos.flush();
+    oos.close();
+  }
+
+}