Organise imports

src/test/java/com/avaje/ebean/TestRawSqlBuilderDistinct.java

@@ -1,22 +1,22 @@
-package com.avaje.ebean;
-
-import org.junit.Assert;
-
-import com.avaje.ebean.RawSql.Sql;
-
-import junit.framework.TestCase;
-
-public class TestRawSqlBuilderDistinct extends TestCase {
-
-  public void testDistinct() {
-
-    RawSqlBuilder r = RawSqlBuilder.parse("select distinct id, name from t_cust");
-    Sql sql = r.getSql();
-    Assert.assertEquals("id, name", sql.getPreFrom());
-    Assert.assertEquals("from t_cust", sql.getPreWhere());
-    Assert.assertEquals("", sql.getPreHaving());
-    Assert.assertNull(sql.getOrderBy());
-
-  }
-
-}
+package com.avaje.ebean;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.avaje.ebean.RawSql.Sql;
+
+public class TestRawSqlBuilderDistinct extends TestCase {
+
+  public void testDistinct() {
+
+    RawSqlBuilder r = RawSqlBuilder.parse("select distinct id, name from t_cust");
+    Sql sql = r.getSql();
+    Assert.assertEquals("id, name", sql.getPreFrom());
+    Assert.assertEquals("from t_cust", sql.getPreWhere());
+    Assert.assertEquals("", sql.getPreHaving());
+    Assert.assertNull(sql.getOrderBy());
+
+  }
+
+}

src/test/java/com/avaje/ebean/TestRawSqlColumnParsing.java

@@ -1,129 +1,129 @@
-package com.avaje.ebean;
-
-import java.util.Map;
-
-import com.avaje.ebean.RawSql.ColumnMapping;
-import com.avaje.ebean.RawSql.ColumnMapping.Column;
-
-import junit.framework.TestCase;
-
-public class TestRawSqlColumnParsing extends TestCase {
-
-    public void test_simple() {
-        
-        ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a,b,c");
-        Map<String, Column> mapping = columnMapping.mapping();
-        Column c = mapping.get("a");
-        
-        assertEquals("a",c.getDbColumn());
-        assertEquals(0, c.getIndexPos());
-        assertEquals("a",c.getPropertyName());
-
-        c = mapping.get("b");
-        assertEquals("b",c.getDbColumn());
-        assertEquals(1, c.getIndexPos());
-        assertEquals("b",c.getPropertyName());
-
-        c = mapping.get("c");
-        assertEquals("c",c.getDbColumn());
-        assertEquals(2, c.getIndexPos());
-        assertEquals("c",c.getPropertyName());
-
-    }
-
-   public void test_simpleWithSpacing() {
-        
-        ColumnMapping columnMapping = DRawSqlColumnsParser.parse(" a  ,  b    ,  c   ");
-        Map<String, Column> mapping = columnMapping.mapping();
-        Column c = mapping.get("a");
-        
-        assertEquals("a",c.getDbColumn());
-        assertEquals(0, c.getIndexPos());
-        assertEquals("a", c.getPropertyName());
-
-        c = mapping.get("b");
-        assertEquals("b",c.getDbColumn());
-        assertEquals(1, c.getIndexPos());
-        assertEquals("b",c.getPropertyName());
-
-        c = mapping.get("c");
-        assertEquals("c",c.getDbColumn());
-        assertEquals(2, c.getIndexPos());
-        assertEquals("c",c.getPropertyName());
-
-    }
-   
-    public void test_withAlias() {
-        
-        ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a a0,b    b1, c  c2 ,   d    d3  , e  e4 ");
-        Map<String, Column> mapping = columnMapping.mapping();
-        
-        assertEquals(5, mapping.size());
-        
-        Column c = mapping.get("a");
-        
-        assertEquals("a",c.getDbColumn());
-        assertEquals(0, c.getIndexPos());
-        assertEquals("a0",c.getPropertyName());
-
-        c = mapping.get("b");
-        assertEquals("b",c.getDbColumn());
-        assertEquals(1, c.getIndexPos());
-        assertEquals("b1",c.getPropertyName());
-
-        c = mapping.get("c");
-        assertEquals("c",c.getDbColumn());
-        assertEquals(2, c.getIndexPos());
-        assertEquals("c2",c.getPropertyName());
-
-        c = mapping.get("d");
-        assertEquals("d",c.getDbColumn());
-        assertEquals(3, c.getIndexPos());
-        assertEquals("d3",c.getPropertyName());
-
-        
-        c = mapping.get("e");
-        assertEquals("e",c.getDbColumn());
-        assertEquals(4, c.getIndexPos());
-        assertEquals("e4",c.getPropertyName());
-
-    }
-
-    
-    public void test_withAsAlias() {
-        
-        ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a as a0,'b'    b1, \"c(blah)\" as c2 ,   d as   d3  , e     as e4 ");
-        Map<String, Column> mapping = columnMapping.mapping();
-        
-        assertEquals(5, mapping.size());
-        
-        Column c = mapping.get("a");
-        
-        assertEquals("a",c.getDbColumn());
-        assertEquals(0, c.getIndexPos());
-        assertEquals("a0",c.getPropertyName());
-
-        c = mapping.get("'b'");
-        assertEquals("'b'",c.getDbColumn());
-        assertEquals(1, c.getIndexPos());
-        assertEquals("b1",c.getPropertyName());
-
-        c = mapping.get("\"c(blah)\"");
-        assertEquals("\"c(blah)\"",c.getDbColumn());
-        assertEquals(2, c.getIndexPos());
-        assertEquals("c2",c.getPropertyName());
-
-        c = mapping.get("d");
-        assertEquals("d",c.getDbColumn());
-        assertEquals(3, c.getIndexPos());
-        assertEquals("d3",c.getPropertyName());
-
-        
-        c = mapping.get("e");
-        assertEquals("e",c.getDbColumn());
-        assertEquals(4, c.getIndexPos());
-        assertEquals("e4",c.getPropertyName());
-
-    }
-
-}
+package com.avaje.ebean;
+
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import com.avaje.ebean.RawSql.ColumnMapping;
+import com.avaje.ebean.RawSql.ColumnMapping.Column;
+
+public class TestRawSqlColumnParsing extends TestCase {
+
+    public void test_simple() {
+        
+        ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a,b,c");
+        Map<String, Column> mapping = columnMapping.mapping();
+        Column c = mapping.get("a");
+        
+        assertEquals("a",c.getDbColumn());
+        assertEquals(0, c.getIndexPos());
+        assertEquals("a",c.getPropertyName());
+
+        c = mapping.get("b");
+        assertEquals("b",c.getDbColumn());
+        assertEquals(1, c.getIndexPos());
+        assertEquals("b",c.getPropertyName());
+
+        c = mapping.get("c");
+        assertEquals("c",c.getDbColumn());
+        assertEquals(2, c.getIndexPos());
+        assertEquals("c",c.getPropertyName());
+
+    }
+
+   public void test_simpleWithSpacing() {
+        
+        ColumnMapping columnMapping = DRawSqlColumnsParser.parse(" a  ,  b    ,  c   ");
+        Map<String, Column> mapping = columnMapping.mapping();
+        Column c = mapping.get("a");
+        
+        assertEquals("a",c.getDbColumn());
+        assertEquals(0, c.getIndexPos());
+        assertEquals("a", c.getPropertyName());
+
+        c = mapping.get("b");
+        assertEquals("b",c.getDbColumn());
+        assertEquals(1, c.getIndexPos());
+        assertEquals("b",c.getPropertyName());
+
+        c = mapping.get("c");
+        assertEquals("c",c.getDbColumn());
+        assertEquals(2, c.getIndexPos());
+        assertEquals("c",c.getPropertyName());
+
+    }
+   
+    public void test_withAlias() {
+        
+        ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a a0,b    b1, c  c2 ,   d    d3  , e  e4 ");
+        Map<String, Column> mapping = columnMapping.mapping();
+        
+        assertEquals(5, mapping.size());
+        
+        Column c = mapping.get("a");
+        
+        assertEquals("a",c.getDbColumn());
+        assertEquals(0, c.getIndexPos());
+        assertEquals("a0",c.getPropertyName());
+
+        c = mapping.get("b");
+        assertEquals("b",c.getDbColumn());
+        assertEquals(1, c.getIndexPos());
+        assertEquals("b1",c.getPropertyName());
+
+        c = mapping.get("c");
+        assertEquals("c",c.getDbColumn());
+        assertEquals(2, c.getIndexPos());
+        assertEquals("c2",c.getPropertyName());
+
+        c = mapping.get("d");
+        assertEquals("d",c.getDbColumn());
+        assertEquals(3, c.getIndexPos());
+        assertEquals("d3",c.getPropertyName());
+
+        
+        c = mapping.get("e");
+        assertEquals("e",c.getDbColumn());
+        assertEquals(4, c.getIndexPos());
+        assertEquals("e4",c.getPropertyName());
+
+    }
+
+    
+    public void test_withAsAlias() {
+        
+        ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a as a0,'b'    b1, \"c(blah)\" as c2 ,   d as   d3  , e     as e4 ");
+        Map<String, Column> mapping = columnMapping.mapping();
+        
+        assertEquals(5, mapping.size());
+        
+        Column c = mapping.get("a");
+        
+        assertEquals("a",c.getDbColumn());
+        assertEquals(0, c.getIndexPos());
+        assertEquals("a0",c.getPropertyName());
+
+        c = mapping.get("'b'");
+        assertEquals("'b'",c.getDbColumn());
+        assertEquals(1, c.getIndexPos());
+        assertEquals("b1",c.getPropertyName());
+
+        c = mapping.get("\"c(blah)\"");
+        assertEquals("\"c(blah)\"",c.getDbColumn());
+        assertEquals(2, c.getIndexPos());
+        assertEquals("c2",c.getPropertyName());
+
+        c = mapping.get("d");
+        assertEquals("d",c.getDbColumn());
+        assertEquals(3, c.getIndexPos());
+        assertEquals("d3",c.getPropertyName());
+
+        
+        c = mapping.get("e");
+        assertEquals("e",c.getDbColumn());
+        assertEquals(4, c.getIndexPos());
+        assertEquals("e4",c.getPropertyName());
+
+    }
+
+}

src/test/java/com/avaje/ebean/text/TestPathPropertiesParse.java

@@ -1,30 +1,28 @@
-package com.avaje.ebean.text;
-
-import junit.framework.TestCase;
-
-import com.avaje.ebean.text.PathProperties;
-
-public class TestPathPropertiesParse extends TestCase {
-
-    public void test() {
-        
-        PathProperties s0 = PathProperties.parse("(id,name)");
-
-        assertEquals(1,s0.getPaths().size());
-        assertTrue(s0.get(null).contains("id"));
-        assertTrue(s0.get(null).contains("name"));
-        assertFalse(s0.get(null).contains("status"));
-        
-        PathProperties s1 = PathProperties.parse(":(id,name,shipAddr(*))");
-        assertEquals(2,s1.getPaths().size());
-        assertEquals(3,s1.get(null).size());
-        assertTrue(s1.get(null).contains("id"));
-        assertTrue(s1.get(null).contains("name"));
-        assertTrue(s1.get(null).contains("shipAddr"));
-        assertTrue(s1.get("shipAddr").contains("*"));
-        assertEquals(1,s1.get("shipAddr").size());
-
-
-    }
-    
-}
+package com.avaje.ebean.text;
+
+import junit.framework.TestCase;
+
+public class TestPathPropertiesParse extends TestCase {
+
+    public void test() {
+        
+        PathProperties s0 = PathProperties.parse("(id,name)");
+
+        assertEquals(1,s0.getPaths().size());
+        assertTrue(s0.get(null).contains("id"));
+        assertTrue(s0.get(null).contains("name"));
+        assertFalse(s0.get(null).contains("status"));
+        
+        PathProperties s1 = PathProperties.parse(":(id,name,shipAddr(*))");
+        assertEquals(2,s1.getPaths().size());
+        assertEquals(3,s1.get(null).size());
+        assertTrue(s1.get(null).contains("id"));
+        assertTrue(s1.get(null).contains("name"));
+        assertTrue(s1.get(null).contains("shipAddr"));
+        assertTrue(s1.get("shipAddr").contains("*"));
+        assertEquals(1,s1.get("shipAddr").size());
+
+
+    }
+    
+}

src/test/java/com/avaje/ebeaninternal/server/querydefn/TestQueryLanguage.java

@@ -1,98 +1,94 @@
-package com.avaje.ebeaninternal.server.querydefn;
-
-import java.util.Set;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebeaninternal.server.expression.DefaultExpressionFactory;
-import com.avaje.ebeaninternal.server.querydefn.DefaultOrmQuery;
-import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail;
-import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetailParser;
-import com.avaje.ebeaninternal.server.querydefn.OrmQueryProperties;
-import com.avaje.tests.model.basic.Order;
-
-
-public class TestQueryLanguage extends TestCase {
-
-    public void test() {
-        
-        
-        DefaultOrmQuery<Order> q = check("find order join customer (id, name)");
-        OrmQueryDetail detail = q.getDetail();
-        OrmQueryProperties chunk = detail.getChunk("customer", false);
-        Set<String> props = chunk.getAllIncludedProperties();
-        
-        Assert.assertTrue(props.contains("id"));
-        Assert.assertTrue(props.contains("name"));
-        
-        q = check("find order join customer(id, name)");
-        detail = q.getDetail();
-        chunk = detail.getChunk("customer", false);
-        props = chunk.getAllIncludedProperties();
-        
-        Assert.assertTrue(props.contains("id"));
-        Assert.assertTrue(props.contains("name"));
-        Assert.assertFalse(chunk.isCache());
-        Assert.assertFalse(chunk.isReadOnly());
-
-        q = check("find order join customer(+cache +readonly, id, name)");
-        detail = q.getDetail();
-        chunk = detail.getChunk("customer", false);
-        props = chunk.getAllIncludedProperties();
-        Assert.assertTrue(props.contains("id"));
-        Assert.assertTrue(props.contains("name"));
-        Assert.assertTrue(chunk.isCache());
-        Assert.assertTrue(chunk.isReadOnly());
-
-        q = check("find order join customer(+cache +readonly,id,name)");
-        detail = q.getDetail();
-        chunk = detail.getChunk("customer", false);
-        props = chunk.getAllIncludedProperties();
-        Assert.assertTrue(props.contains("id"));
-        Assert.assertTrue(props.contains("name"));
-        Assert.assertTrue(chunk.isCache());
-        Assert.assertTrue(chunk.isReadOnly());
-
-        q = check("find order(id,status) join customer(+cache +readonly,id,name)");
-        detail = q.getDetail();
-        chunk = detail.getChunk("customer", false);
-        props = chunk.getAllIncludedProperties();
-        Assert.assertTrue(props.contains("id"));
-        Assert.assertTrue(props.contains("name"));
-        Assert.assertTrue(chunk.isCache());
-        Assert.assertTrue(chunk.isReadOnly());
-
-        chunk = detail.getChunk(null, false);
-        props = chunk.getAllIncludedProperties();
-        Assert.assertTrue(props.contains("id"));
-        Assert.assertTrue(props.contains("status"));
-        Assert.assertFalse(props.contains("orderDate"));
-        
-        q = check("find order(id,status) join customer(+cache +readonly,id,name) where id > :minId order by status");
-        detail = q.getDetail();
-        chunk = detail.getChunk("customer", false);
-        props = chunk.getAllIncludedProperties();
-        Assert.assertTrue(props.contains("id"));
-        Assert.assertTrue(props.contains("name"));
-        Assert.assertTrue(chunk.isCache());
-        Assert.assertTrue(chunk.isReadOnly());
-        
-        String orderBy = q.getOrderBy().toStringFormat();
-        Assert.assertEquals("status", orderBy);
-    }
-    
-    private DefaultOrmQuery<Order> check(String q) {
-
-        EbeanServer server = Ebean.getServer(null);
-
-        OrmQueryDetailParser p = new OrmQueryDetailParser(q);
-        p.parse();
-        DefaultOrmQuery<Order> qry = new DefaultOrmQuery<Order>(Order.class, server, new DefaultExpressionFactory(), (String)null);
-        p.assign(qry);
-
-        return qry;
-    }
-}
+package com.avaje.ebeaninternal.server.querydefn;
+
+import java.util.Set;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.EbeanServer;
+import com.avaje.ebeaninternal.server.expression.DefaultExpressionFactory;
+import com.avaje.tests.model.basic.Order;
+
+
+public class TestQueryLanguage extends TestCase {
+
+    public void test() {
+        
+        
+        DefaultOrmQuery<Order> q = check("find order join customer (id, name)");
+        OrmQueryDetail detail = q.getDetail();
+        OrmQueryProperties chunk = detail.getChunk("customer", false);
+        Set<String> props = chunk.getAllIncludedProperties();
+        
+        Assert.assertTrue(props.contains("id"));
+        Assert.assertTrue(props.contains("name"));
+        
+        q = check("find order join customer(id, name)");
+        detail = q.getDetail();
+        chunk = detail.getChunk("customer", false);
+        props = chunk.getAllIncludedProperties();
+        
+        Assert.assertTrue(props.contains("id"));
+        Assert.assertTrue(props.contains("name"));
+        Assert.assertFalse(chunk.isCache());
+        Assert.assertFalse(chunk.isReadOnly());
+
+        q = check("find order join customer(+cache +readonly, id, name)");
+        detail = q.getDetail();
+        chunk = detail.getChunk("customer", false);
+        props = chunk.getAllIncludedProperties();
+        Assert.assertTrue(props.contains("id"));
+        Assert.assertTrue(props.contains("name"));
+        Assert.assertTrue(chunk.isCache());
+        Assert.assertTrue(chunk.isReadOnly());
+
+        q = check("find order join customer(+cache +readonly,id,name)");
+        detail = q.getDetail();
+        chunk = detail.getChunk("customer", false);
+        props = chunk.getAllIncludedProperties();
+        Assert.assertTrue(props.contains("id"));
+        Assert.assertTrue(props.contains("name"));
+        Assert.assertTrue(chunk.isCache());
+        Assert.assertTrue(chunk.isReadOnly());
+
+        q = check("find order(id,status) join customer(+cache +readonly,id,name)");
+        detail = q.getDetail();
+        chunk = detail.getChunk("customer", false);
+        props = chunk.getAllIncludedProperties();
+        Assert.assertTrue(props.contains("id"));
+        Assert.assertTrue(props.contains("name"));
+        Assert.assertTrue(chunk.isCache());
+        Assert.assertTrue(chunk.isReadOnly());
+
+        chunk = detail.getChunk(null, false);
+        props = chunk.getAllIncludedProperties();
+        Assert.assertTrue(props.contains("id"));
+        Assert.assertTrue(props.contains("status"));
+        Assert.assertFalse(props.contains("orderDate"));
+        
+        q = check("find order(id,status) join customer(+cache +readonly,id,name) where id > :minId order by status");
+        detail = q.getDetail();
+        chunk = detail.getChunk("customer", false);
+        props = chunk.getAllIncludedProperties();
+        Assert.assertTrue(props.contains("id"));
+        Assert.assertTrue(props.contains("name"));
+        Assert.assertTrue(chunk.isCache());
+        Assert.assertTrue(chunk.isReadOnly());
+        
+        String orderBy = q.getOrderBy().toStringFormat();
+        Assert.assertEquals("status", orderBy);
+    }
+    
+    private DefaultOrmQuery<Order> check(String q) {
+
+        EbeanServer server = Ebean.getServer(null);
+
+        OrmQueryDetailParser p = new OrmQueryDetailParser(q);
+        p.parse();
+        DefaultOrmQuery<Order> qry = new DefaultOrmQuery<Order>(Order.class, server, new DefaultExpressionFactory(), (String)null);
+        p.assign(qry);
+
+        return qry;
+    }
+}

src/test/java/com/avaje/ebeaninternal/server/rawsql/TestRawSqlParsing.java

@@ -1,31 +1,31 @@
-package com.avaje.ebeaninternal.server.rawsql;
-
-import junit.framework.TestCase;
-
-import com.avaje.ebean.RawSql;
-import com.avaje.ebean.RawSqlBuilder;
-import com.avaje.ebean.RawSql.Sql;
-
-public class TestRawSqlParsing extends TestCase {
-
-    public void test() {
-        
-        String sql 
-            = " select order_id, sum(order_qty*unit_price) as totalAmount"
-            + " from o_order_detail "
-            + " group by order_id";
-
-        RawSql rawSql = RawSqlBuilder
-            .parse(sql)
-            .columnMapping("order_id","order.id")
-            //.columnMapping("sum(order_qty*unit_price)","totalAmount")
-            .create();
-            
-        Sql rs = rawSql.getSql();
-        
-        String s = rs.toString();
-        System.out.println(s);
-        assertTrue(s, s.contains("[order_id, sum"));
-        
-    }
-}
+package com.avaje.ebeaninternal.server.rawsql;
+
+import junit.framework.TestCase;
+
+import com.avaje.ebean.RawSql;
+import com.avaje.ebean.RawSql.Sql;
+import com.avaje.ebean.RawSqlBuilder;
+
+public class TestRawSqlParsing extends TestCase {
+
+    public void test() {
+        
+        String sql 
+            = " select order_id, sum(order_qty*unit_price) as totalAmount"
+            + " from o_order_detail "
+            + " group by order_id";
+
+        RawSql rawSql = RawSqlBuilder
+            .parse(sql)
+            .columnMapping("order_id","order.id")
+            //.columnMapping("sum(order_qty*unit_price)","totalAmount")
+            .create();
+            
+        Sql rs = rawSql.getSql();
+        
+        String s = rs.toString();
+        System.out.println(s);
+        assertTrue(s, s.contains("[order_id, sum"));
+        
+    }
+}

src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java

@@ -1,43 +1,43 @@
-package com.avaje.tests.autofetch;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.config.GlobalProperties;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.ResetBasicData;
-
-import java.util.List;
-
-public class MainAutoQueryTune1 {
-
-	public static void main(String[] args) {
-		
-		//GlobalProperties.put("ebean.ddl.run", "false");
-		//GlobalProperties.put("ebean.ddl.generate", "false");
-		GlobalProperties.put("ebean.autofetch.queryTuning", "true");
-//		GlobalProperties.put("ebean.autofetch.queryTuningAddVersion", "true");
-
-		ResetBasicData.reset();
-
-		MainAutoQueryTune1 me = new MainAutoQueryTune1();		
-		me.tuneJoin();
-	}
-
-
-
-	private void tuneJoin()
-	{
-		List<Order> list = Ebean.find(Order.class)
-			.setAutofetch(true)
-			.fetch("customer")
-			.where()
-			.eq("status", Order.Status.NEW)
-			.eq("customer.name", "Rob")
-			.order().asc("id")
-			.findList();
-
-		for (Order order : list)
-		{
-			System.out.println(order.getId() + " " + order.getOrderDate());
-		}
-	}
-}
+package com.avaje.tests.autofetch;
+
+import java.util.List;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.config.GlobalProperties;
+import com.avaje.tests.model.basic.Order;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class MainAutoQueryTune1 {
+
+	public static void main(String[] args) {
+		
+		//GlobalProperties.put("ebean.ddl.run", "false");
+		//GlobalProperties.put("ebean.ddl.generate", "false");
+		GlobalProperties.put("ebean.autofetch.queryTuning", "true");
+//		GlobalProperties.put("ebean.autofetch.queryTuningAddVersion", "true");
+
+		ResetBasicData.reset();
+
+		MainAutoQueryTune1 me = new MainAutoQueryTune1();		
+		me.tuneJoin();
+	}
+
+
+
+	private void tuneJoin()
+	{
+		List<Order> list = Ebean.find(Order.class)
+			.setAutofetch(true)
+			.fetch("customer")
+			.where()
+			.eq("status", Order.Status.NEW)
+			.eq("customer.name", "Rob")
+			.order().asc("id")
+			.findList();
+
+		for (Order order : list)
+		{
+			System.out.println(order.getId() + " " + order.getOrderDate());
+		}
+	}
+}

src/test/java/com/avaje/tests/basic/MyTestDataSourcePoolListener.java

@@ -1,29 +1,29 @@
-package com.avaje.tests.basic;
-
-import com.avaje.ebeaninternal.server.lib.sql.DataSourcePoolListener;
-
-import java.sql.Connection;
-
-public class MyTestDataSourcePoolListener implements DataSourcePoolListener
-{
-    public static int SLEEP_AFTER_BORROW = 0; 
-    
-    public void onAfterBorrowConnection(Connection c)
-    {
-        if (SLEEP_AFTER_BORROW > 0)
-        {
-            try
-            {
-                Thread.sleep(SLEEP_AFTER_BORROW);
-            }
-            catch (InterruptedException e)
-            {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    public void onBeforeReturnConnection(Connection c)
-    {
-    }
-}
+package com.avaje.tests.basic;
+
+import java.sql.Connection;
+
+import com.avaje.ebeaninternal.server.lib.sql.DataSourcePoolListener;
+
+public class MyTestDataSourcePoolListener implements DataSourcePoolListener
+{
+    public static int SLEEP_AFTER_BORROW = 0; 
+    
+    public void onAfterBorrowConnection(Connection c)
+    {
+        if (SLEEP_AFTER_BORROW > 0)
+        {
+            try
+            {
+                Thread.sleep(SLEEP_AFTER_BORROW);
+            }
+            catch (InterruptedException e)
+            {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    public void onBeforeReturnConnection(Connection c)
+    {
+    }
+}

src/test/java/com/avaje/tests/basic/TestBatchLazy.java

@@ -1,41 +1,42 @@
-package com.avaje.tests.basic;
-
-import com.avaje.ebean.AdminAutofetch;
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.Query;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.OrderDetail;
-import com.avaje.tests.model.basic.ResetBasicData;
-import junit.framework.TestCase;
-
-import java.util.List;
-
-public class TestBatchLazy extends TestCase {
-
-	public void testMe() {
-		
-		ResetBasicData.reset();
-
-		Query<Order> query = Ebean.find(Order.class);
-		List<Order> list = query.findList();
-		
-		
-		for (Order order : list) {
-			Customer customer = order.getCustomer();
-			customer.getName();
-			
-			List<OrderDetail> details = order.getDetails();
-			for (OrderDetail orderDetail : details) {
-				orderDetail.getProduct().getSku();
-            }
-        }
-		
-		AdminAutofetch adminAutofetch = Ebean.getServer(null).getAdminAutofetch();
-		adminAutofetch.collectUsageViaGC();
-
-	}
-	
-	
-	
-}
+package com.avaje.tests.basic;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import com.avaje.ebean.AdminAutofetch;
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.Query;
+import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.Order;
+import com.avaje.tests.model.basic.OrderDetail;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestBatchLazy extends TestCase {
+
+	public void testMe() {
+		
+		ResetBasicData.reset();
+
+		Query<Order> query = Ebean.find(Order.class);
+		List<Order> list = query.findList();
+		
+		
+		for (Order order : list) {
+			Customer customer = order.getCustomer();
+			customer.getName();
+			
+			List<OrderDetail> details = order.getDetails();
+			for (OrderDetail orderDetail : details) {
+				orderDetail.getProduct().getSku();
+            }
+        }
+		
+		AdminAutofetch adminAutofetch = Ebean.getServer(null).getAdminAutofetch();
+		adminAutofetch.collectUsageViaGC();
+
+	}
+	
+	
+	
+}

src/test/java/com/avaje/tests/basic/TestBeanReferenceRefresh.java

@@ -1,42 +1,42 @@
-package com.avaje.tests.basic;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.ResetBasicData;
-import com.avaje.tests.model.basic.Order.Status;
-
-public class TestBeanReferenceRefresh extends TestCase {
-
-	
-	public void testMe() {
-		
-		ResetBasicData.reset();
-	
-		Order order = Ebean.getReference(Order.class, 1);
-		
-		Assert.assertTrue("isReference",Ebean.getBeanState(order).isReference());
-		
-		order.getOrderDate();
-		
-		Assert.assertFalse(Ebean.getBeanState(order).isReference());
-		Assert.assertNotNull(order.getStatus());
-		Assert.assertNotNull(order.getDetails());
-		Assert.assertNull(Ebean.getBeanState(order).getLoadedProps());
-		
-		Status status = order.getStatus();
-		Assert.assertTrue(status != Order.Status.SHIPPED);
-		order.setStatus(Order.Status.SHIPPED);
-		Ebean.refresh(order);
-		
-		Status statusRefresh = order.getStatus();
-		Assert.assertEquals(status,statusRefresh);
-		
-		System.out.println("done");
-		
-	}
-	
-	
-}
+package com.avaje.tests.basic;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.tests.model.basic.Order;
+import com.avaje.tests.model.basic.Order.Status;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestBeanReferenceRefresh extends TestCase {
+
+	
+	public void testMe() {
+		
+		ResetBasicData.reset();
+	
+		Order order = Ebean.getReference(Order.class, 1);
+		
+		Assert.assertTrue("isReference",Ebean.getBeanState(order).isReference());
+		
+		order.getOrderDate();
+		
+		Assert.assertFalse(Ebean.getBeanState(order).isReference());
+		Assert.assertNotNull(order.getStatus());
+		Assert.assertNotNull(order.getDetails());
+		Assert.assertNull(Ebean.getBeanState(order).getLoadedProps());
+		
+		Status status = order.getStatus();
+		Assert.assertTrue(status != Order.Status.SHIPPED);
+		order.setStatus(Order.Status.SHIPPED);
+		Ebean.refresh(order);
+		
+		Status statusRefresh = order.getStatus();
+		Assert.assertEquals(status,statusRefresh);
+		
+		System.out.println("done");
+		
+	}
+	
+	
+}

src/test/java/com/avaje/tests/basic/TestDeleteImportedPartial.java

@@ -1,38 +1,38 @@
-package com.avaje.tests.basic;
-
-import org.junit.Assert;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.tests.model.basic.PFile;
-import com.avaje.tests.model.basic.PFileContent;
-
-import junit.framework.TestCase;
-
-public class TestDeleteImportedPartial extends TestCase {
- 
-    public void test() {
-    
-
-        PFile persistentFile = new PFile("test.txt", new PFileContent("test".getBytes()));
-
-        Ebean.save(persistentFile);
-        Integer id = persistentFile.getId();
-        Integer contentId = persistentFile.getFileContent().getId();
-
-        PFile partialPfile = Ebean.find(PFile.class)
-            .select("id")
-            .where().idEq(persistentFile.getId())
-            .findUnique();
-        
-        // should delete file and fileContent
-        Ebean.delete(partialPfile);
-        System.out.println("finished delete");
-
-        PFile file1 = Ebean.find(PFile.class, id);
-        PFileContent content1 = Ebean.find(PFileContent.class, contentId);
-
-        Assert.assertNull(file1);
-        Assert.assertNull(content1);        
-        
-    }
-}
+package com.avaje.tests.basic;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.tests.model.basic.PFile;
+import com.avaje.tests.model.basic.PFileContent;
+
+public class TestDeleteImportedPartial extends TestCase {
+ 
+    public void test() {
+    
+
+        PFile persistentFile = new PFile("test.txt", new PFileContent("test".getBytes()));
+
+        Ebean.save(persistentFile);
+        Integer id = persistentFile.getId();
+        Integer contentId = persistentFile.getFileContent().getId();
+
+        PFile partialPfile = Ebean.find(PFile.class)
+            .select("id")
+            .where().idEq(persistentFile.getId())
+            .findUnique();
+        
+        // should delete file and fileContent
+        Ebean.delete(partialPfile);
+        System.out.println("finished delete");
+
+        PFile file1 = Ebean.find(PFile.class, id);
+        PFileContent content1 = Ebean.find(PFileContent.class, contentId);
+
+        Assert.assertNull(file1);
+        Assert.assertNull(content1);        
+        
+    }
+}

src/test/java/com/avaje/tests/basic/TestDynamicUpdate.java

@@ -1,10 +1,11 @@
 package com.avaje.tests.basic;
 
+import junit.framework.TestCase;
+
 import com.avaje.ebean.Ebean;
 import com.avaje.ebean.EbeanServer;
 import com.avaje.ebean.LogLevel;
 import com.avaje.tests.model.embedded.EMain;
-import junit.framework.TestCase;
 
 public class TestDynamicUpdate extends TestCase {
 

src/test/java/com/avaje/tests/basic/TestErrorBindLog.java

@@ -1,29 +1,29 @@
-package com.avaje.tests.basic;
-
-import javax.persistence.PersistenceException;
-
-import org.junit.Assert;
-
-import junit.framework.TestCase;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.config.GlobalProperties;
-import com.avaje.tests.model.basic.Order;
-
-public class TestErrorBindLog extends TestCase {
-
-    public void test() {
-        
-        GlobalProperties.put("somethingelse", "d:/junk2");
-        try {
-            Ebean.find(Order.class)
-                .where().gt("id", "JUNK")
-                .findList();
-        
-        } catch (PersistenceException e){
-            String msg = e.getMessage();
-            e.printStackTrace();
-            Assert.assertTrue(msg.contains("Bind values:"));
-        }
-    }
-}
+package com.avaje.tests.basic;
+
+import javax.persistence.PersistenceException;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.config.GlobalProperties;
+import com.avaje.tests.model.basic.Order;
+
+public class TestErrorBindLog extends TestCase {
+
+    public void test() {
+        
+        GlobalProperties.put("somethingelse", "d:/junk2");
+        try {
+            Ebean.find(Order.class)
+                .where().gt("id", "JUNK")
+                .findList();
+        
+        } catch (PersistenceException e){
+            String msg = e.getMessage();
+            e.printStackTrace();
+            Assert.assertTrue(msg.contains("Bind values:"));
+        }
+    }
+}

src/test/java/com/avaje/tests/basic/TestMultipleOneToOneIUD.java

@@ -1,59 +1,59 @@
-package com.avaje.tests.basic;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.tests.model.basic.OCar;
-import com.avaje.tests.model.basic.OEngine;
-import com.avaje.tests.model.basic.OGearBox;
-
-import junit.framework.TestCase;
-
-public class TestMultipleOneToOneIUD extends TestCase {
-
-    public void test() {
-        
-        OEngine engine = new OEngine();
-        engine.setShortDesc("engine 1");
-        
-        OGearBox gearBox = new OGearBox();
-        gearBox.setBoxDesc("6 speed manual");
-        gearBox.setSize(6);
-        
-        OCar car = new OCar();
-        car.setVin("xx4534");
-        car.setName("test car");
-        car.setEngine(engine);
-        
-        Ebean.beginTransaction();
-        try {
-            Ebean.save(gearBox);
-            Ebean.save(car);
-            
-            assertNotNull(car.getId());
-            assertNotNull(engine.getEngineId());
-            assertNotNull(gearBox.getId());
-                        
-            Ebean.commitTransaction();
-            
-        } finally {
-            Ebean.endTransaction();
-        }
-        
-        OCar c2 = Ebean.find(OCar.class, car.getId());
-        assertNotNull(c2);
-        assertNotNull(c2.getEngine());
-        // gearBox not assigned yet
-        assertNull(c2.getGearBox());
-        
-        // ok, assign gearBox
-        c2.setGearBox(gearBox);
-        Ebean.save(c2);
-        
-        // now all should be there...
-        OCar c3 = Ebean.find(OCar.class, car.getId());
-        assertNotNull(c3);
-        assertNotNull(c3.getEngine());
-        assertNotNull(c3.getGearBox());
-
-        
-    }
-}
+package com.avaje.tests.basic;
+
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.tests.model.basic.OCar;
+import com.avaje.tests.model.basic.OEngine;
+import com.avaje.tests.model.basic.OGearBox;
+
+public class TestMultipleOneToOneIUD extends TestCase {
+
+    public void test() {
+        
+        OEngine engine = new OEngine();
+        engine.setShortDesc("engine 1");
+        
+        OGearBox gearBox = new OGearBox();
+        gearBox.setBoxDesc("6 speed manual");
+        gearBox.setSize(6);
+        
+        OCar car = new OCar();
+        car.setVin("xx4534");
+        car.setName("test car");
+        car.setEngine(engine);
+        
+        Ebean.beginTransaction();
+        try {
+            Ebean.save(gearBox);
+            Ebean.save(car);
+            
+            assertNotNull(car.getId());
+            assertNotNull(engine.getEngineId());
+            assertNotNull(gearBox.getId());
+                        
+            Ebean.commitTransaction();
+            
+        } finally {
+            Ebean.endTransaction();
+        }
+        
+        OCar c2 = Ebean.find(OCar.class, car.getId());
+        assertNotNull(c2);
+        assertNotNull(c2.getEngine());
+        // gearBox not assigned yet
+        assertNull(c2.getGearBox());
+        
+        // ok, assign gearBox
+        c2.setGearBox(gearBox);
+        Ebean.save(c2);
+        
+        // now all should be there...
+        OCar c3 = Ebean.find(OCar.class, car.getId());
+        assertNotNull(c3);
+        assertNotNull(c3.getEngine());
+        assertNotNull(c3.getGearBox());
+
+        
+    }
+}

src/test/java/com/avaje/tests/basic/TestOrderByAnnotation.java

@@ -1,35 +1,36 @@
-package com.avaje.tests.basic;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.Query;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.ResetBasicData;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import java.util.List;
-
-public class TestOrderByAnnotation extends TestCase {
-
-	public void testOrderBy() {
-
-		ResetBasicData.reset();
-		Customer custTest = ResetBasicData.createCustAndOrder("testOrderByAnn");
-
-		Customer customer = Ebean.find(Customer.class, custTest.getId());
-		List<Order> orders = customer.getOrders();
-
-		Assert.assertTrue(orders.size() > 0);
-
-
-		Query<Order> q1 = Ebean.find(Order.class)
-			.fetch("details");
-
-		q1.findList();
-		
-		String s1 = q1.getGeneratedSql();
-
-		Assert.assertTrue(s1.contains("order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc"));
-	}
+package com.avaje.tests.basic;
+
+import java.util.List;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.Query;
+import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.Order;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestOrderByAnnotation extends TestCase {
+
+	public void testOrderBy() {
+
+		ResetBasicData.reset();
+		Customer custTest = ResetBasicData.createCustAndOrder("testOrderByAnn");
+
+		Customer customer = Ebean.find(Customer.class, custTest.getId());
+		List<Order> orders = customer.getOrders();
+
+		Assert.assertTrue(orders.size() > 0);
+
+
+		Query<Order> q1 = Ebean.find(Order.class)
+			.fetch("details");
+
+		q1.findList();
+		
+		String s1 = q1.getGeneratedSql();
+
+		Assert.assertTrue(s1.contains("order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc"));
+	}
 }

src/test/java/com/avaje/tests/basic/TestQuery.java

@@ -1,58 +1,59 @@
-package com.avaje.tests.basic;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.Query;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.ResetBasicData;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-public class TestQuery extends TestCase
-{
-
-    public void testCountOrderBy()
-    {
-
-        ResetBasicData.reset();
-
-        Query<Order> query = Ebean.find(Order.class)
-            .setAutofetch(false)
-            .order().asc("orderDate")
-            .order().desc("id");
-        //.orderBy("orderDate");
-
-        int rc = query.findList().size();
-        //int rc = query.findRowCount();
-        Assert.assertTrue(rc > 0);
-        //String generatedSql = query.getGeneratedSql();
-        //Assert.assertFalse(generatedSql.contains("order by"));
-
-    }
-
-    public void testForUpdate()
-    {
-        ResetBasicData.reset();
-
-        Query<Order> query = Ebean.find(Order.class)
-            .setAutofetch(false)
-            .setForUpdate(false)
-            .setMaxRows(1)
-            .order().asc("orderDate")
-            .order().desc("id");
-        
-        int rc = query.findList().size();
-        Assert.assertTrue(rc > 0);
-        assertTrue(query.getGeneratedSql().toLowerCase().indexOf("for update") < 0);
-
-        query = Ebean.find(Order.class)
-            .setAutofetch(false)
-            .setForUpdate(true)
-            .setMaxRows(1)
-            .order().asc("orderDate")
-            .order().desc("id");
-
-        rc = query.findList().size();
-        Assert.assertTrue(rc > 0);
-        assertTrue(query.getGeneratedSql().toLowerCase().indexOf("for update") > -1);
-    }
-}
+package com.avaje.tests.basic;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.Query;
+import com.avaje.tests.model.basic.Order;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestQuery extends TestCase
+{
+
+    public void testCountOrderBy()
+    {
+
+        ResetBasicData.reset();
+
+        Query<Order> query = Ebean.find(Order.class)
+            .setAutofetch(false)
+            .order().asc("orderDate")
+            .order().desc("id");
+        //.orderBy("orderDate");
+
+        int rc = query.findList().size();
+        //int rc = query.findRowCount();
+        Assert.assertTrue(rc > 0);
+        //String generatedSql = query.getGeneratedSql();
+        //Assert.assertFalse(generatedSql.contains("order by"));
+
+    }
+
+    public void testForUpdate()
+    {
+        ResetBasicData.reset();
+
+        Query<Order> query = Ebean.find(Order.class)
+            .setAutofetch(false)
+            .setForUpdate(false)
+            .setMaxRows(1)
+            .order().asc("orderDate")
+            .order().desc("id");
+        
+        int rc = query.findList().size();
+        Assert.assertTrue(rc > 0);
+        assertTrue(query.getGeneratedSql().toLowerCase().indexOf("for update") < 0);
+
+        query = Ebean.find(Order.class)
+            .setAutofetch(false)
+            .setForUpdate(true)
+            .setMaxRows(1)
+            .order().asc("orderDate")
+            .order().desc("id");
+
+        rc = query.findList().size();
+        Assert.assertTrue(rc > 0);
+        assertTrue(query.getGeneratedSql().toLowerCase().indexOf("for update") > -1);
+    }
+}

src/test/java/com/avaje/tests/basic/TestQueryWithCache.java

@@ -1,124 +1,120 @@
-package com.avaje.tests.basic;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import com.avaje.ebean.BeanState;
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.Query;
-import com.avaje.ebean.cache.ServerCache;
-import com.avaje.ebean.cache.ServerCacheManager;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
-import com.avaje.ebeaninternal.server.core.CacheOptions;
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
-import com.avaje.tests.model.basic.Country;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.ResetBasicData;
-
-public class TestQueryWithCache extends TestCase {
-
-	
-//	public void testJoinCache() {
-//
-//		ResetBasicData.reset();
-//
-//		Ebean.getServer(null).runCacheWarming();
-//		
-//		Query<Order> query = Ebean.createQuery(Order.class)
-//			.setAutofetch(false)
-//			.fetch("customer","+cache +readonly")
-//			.setId(1);
-//		
-//		Order order = query.findUnique();
-//		Customer customer = order.getCustomer();
-//		Assert.assertTrue(Ebean.getBeanState(customer).isReadOnly());
-//		
-////		// invoke lazy loading
-////		customer.getName();
-////		
-////		order = query.findUnique();
-////		customer = order.getCustomer();
-////		custState = Ebean.getBeanState(customer);
-////		Assert.assertFalse(custState.isReadOnly());
-//		
-//	}
-//	
-//	public void testFindId() {
-//		
-//		ResetBasicData.reset();
-//
-//		Order o  = Ebean.find(Order.class)
-//			.setUseCache(true)
-//			.setReadOnly(true)
-//			.setId(1)
-//			.findUnique();
-//
-//		BeanState beanState = Ebean.getBeanState(o);
-//		Assert.assertTrue(beanState.isReadOnly());
-//
-//		Order o2  = Ebean.find(Order.class)
-//			.setUseCache(true)
-//			.setReadOnly(true)
-//			.setId(1)
-//			.findUnique();
-//
-//		BeanState beanState2 = Ebean.getBeanState(o2);
-//
-//		// same instance as readOnly = true
-//		Assert.assertTrue("not same instance", o != o2);
-//		Assert.assertTrue(beanState2.isReadOnly());
-//		
-//		Order o3  = Ebean.find(Order.class)
-//			.setUseCache(true)
-//			.setReadOnly(false)
-//			.setId(1)
-//			.findUnique();
-//
-//		// NOT the same instance as readOnly = false
-//		Assert.assertTrue("not same instance", o != o3);
-//	}
-	
-	public void testCountryDeploy() {
-
-		ResetBasicData.reset();
-		
-		SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null);
-		BeanDescriptor<Country> beanDescriptor = server.getBeanDescriptor(Country.class);
-		CacheOptions cacheOptions = beanDescriptor.getCacheOptions();
-		
-		Assert.assertNotNull(cacheOptions);
-		Assert.assertTrue(cacheOptions.isUseCache());
-		Assert.assertTrue(cacheOptions.isReadOnly());
-		Assert.assertTrue(beanDescriptor.isCacheSharableBeans());
-		
-		ServerCacheManager serverCacheManager = server.getServerCacheManager();
-		serverCacheManager.clear(Country.class);
-		
-		ServerCache beanCache = serverCacheManager.getBeanCache(Country.class);
-		Assert.assertEquals(0, beanCache.size());
-		
-		Country nz1 = Ebean.getReference(Country.class, "NZ");
-		Assert.assertEquals(0, beanCache.size());
-		
-		// has the effect of loading the cache via lazy loading
-		nz1.getName();
-		Assert.assertEquals(1, beanCache.size());
-		
-		Country nz2 = Ebean.getReference(Country.class, "NZ");
-		Country nz2b = Ebean.getReference(Country.class, "NZ");
-		
-		Country nz3 = Ebean.find(Country.class, "NZ");
-
-		Country nz4 = Ebean.find(Country.class)
-			.setId("NZ")
-			.setAutofetch(false)
-			.setUseCache(false)
-			.findUnique();
-		
-		Assert.assertTrue(nz2 == nz2b);
-		Assert.assertTrue(nz2 == nz3);
-		Assert.assertTrue(nz3 != nz4);
-		
-	}
-}
+package com.avaje.tests.basic;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.cache.ServerCache;
+import com.avaje.ebean.cache.ServerCacheManager;
+import com.avaje.ebeaninternal.api.SpiEbeanServer;
+import com.avaje.ebeaninternal.server.core.CacheOptions;
+import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
+import com.avaje.tests.model.basic.Country;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestQueryWithCache extends TestCase {
+
+	
+//	public void testJoinCache() {
+//
+//		ResetBasicData.reset();
+//
+//		Ebean.getServer(null).runCacheWarming();
+//		
+//		Query<Order> query = Ebean.createQuery(Order.class)
+//			.setAutofetch(false)
+//			.fetch("customer","+cache +readonly")
+//			.setId(1);
+//		
+//		Order order = query.findUnique();
+//		Customer customer = order.getCustomer();
+//		Assert.assertTrue(Ebean.getBeanState(customer).isReadOnly());
+//		
+////		// invoke lazy loading
+////		customer.getName();
+////		
+////		order = query.findUnique();
+////		customer = order.getCustomer();
+////		custState = Ebean.getBeanState(customer);
+////		Assert.assertFalse(custState.isReadOnly());
+//		
+//	}
+//	
+//	public void testFindId() {
+//		
+//		ResetBasicData.reset();
+//
+//		Order o  = Ebean.find(Order.class)
+//			.setUseCache(true)
+//			.setReadOnly(true)
+//			.setId(1)
+//			.findUnique();
+//
+//		BeanState beanState = Ebean.getBeanState(o);
+//		Assert.assertTrue(beanState.isReadOnly());
+//
+//		Order o2  = Ebean.find(Order.class)
+//			.setUseCache(true)
+//			.setReadOnly(true)
+//			.setId(1)
+//			.findUnique();
+//
+//		BeanState beanState2 = Ebean.getBeanState(o2);
+//
+//		// same instance as readOnly = true
+//		Assert.assertTrue("not same instance", o != o2);
+//		Assert.assertTrue(beanState2.isReadOnly());
+//		
+//		Order o3  = Ebean.find(Order.class)
+//			.setUseCache(true)
+//			.setReadOnly(false)
+//			.setId(1)
+//			.findUnique();
+//
+//		// NOT the same instance as readOnly = false
+//		Assert.assertTrue("not same instance", o != o3);
+//	}
+	
+	public void testCountryDeploy() {
+
+		ResetBasicData.reset();
+		
+		SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null);
+		BeanDescriptor<Country> beanDescriptor = server.getBeanDescriptor(Country.class);
+		CacheOptions cacheOptions = beanDescriptor.getCacheOptions();
+		
+		Assert.assertNotNull(cacheOptions);
+		Assert.assertTrue(cacheOptions.isUseCache());
+		Assert.assertTrue(cacheOptions.isReadOnly());
+		Assert.assertTrue(beanDescriptor.isCacheSharableBeans());
+		
+		ServerCacheManager serverCacheManager = server.getServerCacheManager();
+		serverCacheManager.clear(Country.class);
+		
+		ServerCache beanCache = serverCacheManager.getBeanCache(Country.class);
+		Assert.assertEquals(0, beanCache.size());
+		
+		Country nz1 = Ebean.getReference(Country.class, "NZ");
+		Assert.assertEquals(0, beanCache.size());
+		
+		// has the effect of loading the cache via lazy loading
+		nz1.getName();
+		Assert.assertEquals(1, beanCache.size());
+		
+		Country nz2 = Ebean.getReference(Country.class, "NZ");
+		Country nz2b = Ebean.getReference(Country.class, "NZ");
+		
+		Country nz3 = Ebean.find(Country.class, "NZ");
+
+		Country nz4 = Ebean.find(Country.class)
+			.setId("NZ")
+			.setAutofetch(false)
+			.setUseCache(false)
+			.findUnique();
+		
+		Assert.assertTrue(nz2 == nz2b);
+		Assert.assertTrue(nz2 == nz3);
+		Assert.assertTrue(nz3 != nz4);
+		
+	}
+}

src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOne.java

@@ -1,12 +1,12 @@
 package com.avaje.tests.basic;
 
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
 import com.avaje.ebean.Ebean;
 import com.avaje.tests.model.basic.PersistentFile;
 import com.avaje.tests.model.basic.PersistentFileContent;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
 public class TestSaveDeleteOneToOne extends TestCase {
 
 	public void testCreateDeletePersistentFile() {

src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOneMultiple.java

@@ -1,12 +1,12 @@
 package com.avaje.tests.basic;
 
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
 import com.avaje.ebean.Ebean;
 import com.avaje.tests.model.basic.PFile;
 import com.avaje.tests.model.basic.PFileContent;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
 public class TestSaveDeleteOneToOneMultiple extends TestCase {
 
 //	public void testCreateDeletePFile() {

src/test/java/com/avaje/tests/basic/TestSerialization.java

@@ -1,133 +1,133 @@
-package com.avaje.tests.basic;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.sql.Date;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebean.bean.EntityBeanIntercept;
-import com.avaje.ebean.bean.SerializeControl;
-import com.avaje.ebean.common.BeanList;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.OrderDetail;
-import com.avaje.tests.model.basic.Order.Status;
-
-public class TestSerialization extends TestCase {
-
-	public void testSerialization() {
-		
-		EbeanServer server = Ebean.getServer(null);
-		
-		Customer customer = server.getReference(Customer.class, 1);
-		
-		Order o = server.createEntityBean(Order.class);
-		o.setOrderDate(new Date(System.currentTimeMillis()));
-		o.setStatus(Status.NEW);
-		o.setCustomer(customer);
-		
-		BeanList<OrderDetail> details = new BeanList<OrderDetail>();
-		o.setDetails(details);
-		
-		EntityBean eb = (EntityBean)o;
-		
-		Order orderCopy = (Order)eb._ebean_createCopy();
-		
-		Assert.assertNotNull(orderCopy.getDetails());
-		Assert.assertNotNull(orderCopy.getCustomer());
-		
-		EntityBeanIntercept ebi = eb._ebean_getIntercept();
-		o.setStatus(Status.APPROVED);
-		
-		ebi.setReadOnly(true);
-		ebi.setLoaded();
-		
-		try {
-			o.setStatus(Status.COMPLETE);
-			Assert.assertTrue("dont get here",false);
-		} catch (IllegalStateException e){
-			Assert.assertTrue("throws exception",true);
-		}
-		
-		SerializeControl.setVanilla(true);
-		Assert.assertTrue(SerializeControl.isVanillaBeans());
-		Assert.assertTrue(SerializeControl.isVanillaCollections());
-		
-		Order testUsingSubclassing = new Order();
-		if (testUsingSubclassing instanceof EntityBean){
-			System.out.println("Need to run serialisation test with 'subclassing/proxies'");
-			
-		} else {
-			System.out.println("Testing serialisation of 'subclassing/proxies'");
-			Object vanillaOrder = serialWriteRead(o, true);
-			Assert.assertFalse("should be an EntityBean", (vanillaOrder instanceof EntityBean));			
-			Assert.assertTrue("should be an Order", (vanillaOrder instanceof Order));			
-	
-			Order vanOrder = (Order)vanillaOrder;
-			Customer vanCustomer = vanOrder.getCustomer();
-			List<OrderDetail> vanDetails = vanOrder.getDetails();
-			
-			Assert.assertFalse("should NOT be an EntityBean", (vanCustomer instanceof EntityBean));			
-			Assert.assertFalse("should NOT be an BeanList", (vanDetails instanceof BeanList<?>));			
-			Assert.assertTrue("should be an ArrayList", (vanDetails instanceof ArrayList<?>));			
-			Assert.assertTrue("should be an Customer", (vanCustomer instanceof Customer));			
-		}
-		
-		SerializeControl.setVanilla(false);
-		
-		Object subclassOrder = serialWriteRead(o, false);
-		Assert.assertTrue("should be an Order", (subclassOrder instanceof Order));			
-		Assert.assertTrue("should be an EntityBean", (subclassOrder instanceof EntityBean));			
-
-		SerializeControl.setVanilla(true);
-		
-		File serTestFile = new File("serTest");
-		if (serTestFile.exists()){
-			serTestFile.delete();
-		}
-	}
-	
-	private Object serialWriteRead(Object inputObject, boolean vanilla){
-
-		try {
-
-			
-			
-			File serTestFile = new File("serTest");
-			FileOutputStream fout = new FileOutputStream(serTestFile);
-			ObjectOutputStream oos = new ObjectOutputStream(fout);
-			
-			oos.writeObject(inputObject);
-			oos.close();
-
-			FileInputStream fin = new FileInputStream(serTestFile);
-			
-			ObjectInputStream ois;
-			if (vanilla){
-				ois = new ObjectInputStream(fin);
-			} else {
-				ois = Ebean.getServer(null).createProxyObjectInputStream(fin);
-			}
-			Object readObject = ois.readObject();
-			ois.close();
-			return readObject;
-			
-		} catch (Exception e){
-			e.printStackTrace();
-			Assert.assertTrue(false);
-			return null;
-		}
-
-	}
-	
-}
+package com.avaje.tests.basic;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.sql.Date;
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.EbeanServer;
+import com.avaje.ebean.bean.EntityBean;
+import com.avaje.ebean.bean.EntityBeanIntercept;
+import com.avaje.ebean.bean.SerializeControl;
+import com.avaje.ebean.common.BeanList;
+import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.Order;
+import com.avaje.tests.model.basic.Order.Status;
+import com.avaje.tests.model.basic.OrderDetail;
+
+public class TestSerialization extends TestCase {
+
+	public void testSerialization() {
+		
+		EbeanServer server = Ebean.getServer(null);
+		
+		Customer customer = server.getReference(Customer.class, 1);
+		
+		Order o = server.createEntityBean(Order.class);
+		o.setOrderDate(new Date(System.currentTimeMillis()));
+		o.setStatus(Status.NEW);
+		o.setCustomer(customer);
+		
+		BeanList<OrderDetail> details = new BeanList<OrderDetail>();
+		o.setDetails(details);
+		
+		EntityBean eb = (EntityBean)o;
+		
+		Order orderCopy = (Order)eb._ebean_createCopy();
+		
+		Assert.assertNotNull(orderCopy.getDetails());
+		Assert.assertNotNull(orderCopy.getCustomer());
+		
+		EntityBeanIntercept ebi = eb._ebean_getIntercept();
+		o.setStatus(Status.APPROVED);
+		
+		ebi.setReadOnly(true);
+		ebi.setLoaded();
+		
+		try {
+			o.setStatus(Status.COMPLETE);
+			Assert.assertTrue("dont get here",false);
+		} catch (IllegalStateException e){
+			Assert.assertTrue("throws exception",true);
+		}
+		
+		SerializeControl.setVanilla(true);
+		Assert.assertTrue(SerializeControl.isVanillaBeans());
+		Assert.assertTrue(SerializeControl.isVanillaCollections());
+		
+		Order testUsingSubclassing = new Order();
+		if (testUsingSubclassing instanceof EntityBean){
+			System.out.println("Need to run serialisation test with 'subclassing/proxies'");
+			
+		} else {
+			System.out.println("Testing serialisation of 'subclassing/proxies'");
+			Object vanillaOrder = serialWriteRead(o, true);
+			Assert.assertFalse("should be an EntityBean", (vanillaOrder instanceof EntityBean));			
+			Assert.assertTrue("should be an Order", (vanillaOrder instanceof Order));			
+	
+			Order vanOrder = (Order)vanillaOrder;
+			Customer vanCustomer = vanOrder.getCustomer();
+			List<OrderDetail> vanDetails = vanOrder.getDetails();
+			
+			Assert.assertFalse("should NOT be an EntityBean", (vanCustomer instanceof EntityBean));			
+			Assert.assertFalse("should NOT be an BeanList", (vanDetails instanceof BeanList<?>));			
+			Assert.assertTrue("should be an ArrayList", (vanDetails instanceof ArrayList<?>));			
+			Assert.assertTrue("should be an Customer", (vanCustomer instanceof Customer));			
+		}
+		
+		SerializeControl.setVanilla(false);
+		
+		Object subclassOrder = serialWriteRead(o, false);
+		Assert.assertTrue("should be an Order", (subclassOrder instanceof Order));			
+		Assert.assertTrue("should be an EntityBean", (subclassOrder instanceof EntityBean));			
+
+		SerializeControl.setVanilla(true);
+		
+		File serTestFile = new File("serTest");
+		if (serTestFile.exists()){
+			serTestFile.delete();
+		}
+	}
+	
+	private Object serialWriteRead(Object inputObject, boolean vanilla){
+
+		try {
+
+			
+			
+			File serTestFile = new File("serTest");
+			FileOutputStream fout = new FileOutputStream(serTestFile);
+			ObjectOutputStream oos = new ObjectOutputStream(fout);
+			
+			oos.writeObject(inputObject);
+			oos.close();
+
+			FileInputStream fin = new FileInputStream(serTestFile);
+			
+			ObjectInputStream ois;
+			if (vanilla){
+				ois = new ObjectInputStream(fin);
+			} else {
+				ois = Ebean.getServer(null).createProxyObjectInputStream(fin);
+			}
+			Object readObject = ois.readObject();
+			ois.close();
+			return readObject;
+			
+		} catch (Exception e){
+			e.printStackTrace();
+			Assert.assertTrue(false);
+			return null;
+		}
+
+	}
+	
+}

src/test/java/com/avaje/tests/basic/event/TestPreInsertValidation.java

@@ -1,28 +1,28 @@
-package com.avaje.tests.basic.event;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.tests.model.basic.TWithPreInsert;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-public class TestPreInsertValidation extends TestCase {
-
-	public void test() {
-		
-		TWithPreInsert e = new TWithPreInsert();
-		e.setTitle("Mister");
-		// the perInsert should populate the
-		// name with should not be null
-		Ebean.save(e);
-		
-		// the save worked
-		Assert.assertNotNull(e.getId());
-		
-		TWithPreInsert e1 = Ebean.find(TWithPreInsert.class, e.getId());
-		
-		e1.setTitle("Missus");
-		Ebean.save(e1);
-	}
-	
-}
+package com.avaje.tests.basic.event;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.tests.model.basic.TWithPreInsert;
+
+public class TestPreInsertValidation extends TestCase {
+
+	public void test() {
+		
+		TWithPreInsert e = new TWithPreInsert();
+		e.setTitle("Mister");
+		// the perInsert should populate the
+		// name with should not be null
+		Ebean.save(e);
+		
+		// the save worked
+		Assert.assertNotNull(e.getId());
+		
+		TWithPreInsert e1 = Ebean.find(TWithPreInsert.class, e.getId());
+		
+		e1.setTitle("Missus");
+		Ebean.save(e1);
+	}
+	
+}

src/test/java/com/avaje/tests/basic/event/TestTransactionEvent.java

@@ -1,64 +1,65 @@
-package com.avaje.tests.basic.event;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.Transaction;
-import com.avaje.tests.model.basic.TWithPreInsert;
-import junit.framework.TestCase;
-
-public class TestTransactionEvent extends TestCase {
-
-  @Override
-  protected void tearDown() throws Exception {
-    MyTestTransactionEventListener.setDoTest(false);
-  }
-
-  @Override
-  protected void setUp() throws Exception {
-    MyTestTransactionEventListener.setDoTest(true);
-  }
-
-  public void test() {
-
-    assertNull(MyTestTransactionEventListener.getLastCommitted());
-    assertNull(MyTestTransactionEventListener.getLastRollbacked());
-
-    final Object myUserObject = new Object();
-
-    Transaction tx = Ebean.beginTransaction();
-    tx.putUserObject("myUserObject", myUserObject);
-
-    TWithPreInsert e = new TWithPreInsert();
-    e.setTitle("Mister Transaction1");
-    Ebean.save(e);
-
-    tx.commit();
-
-    assertNotNull(MyTestTransactionEventListener.getLastCommitted());
-    assertSame(MyTestTransactionEventListener.getLastCommitted(), tx);
-    assertNotNull(MyTestTransactionEventListener.getLastCommitted().getUserObject("myUserObject"));
-    assertSame(MyTestTransactionEventListener.getLastCommitted().getUserObject("myUserObject"), myUserObject);
-    assertNull(MyTestTransactionEventListener.getLastRollbacked());
-
-    Transaction tx2 = Ebean.beginTransaction();
-    tx2.putUserObject("myUserObject2", myUserObject);
-
-    TWithPreInsert e2 = new TWithPreInsert();
-    e2.setTitle("Mister Transaction2");
-    Ebean.save(e2);
-
-    tx2.rollback();
-
-    assertNotNull(MyTestTransactionEventListener.getLastCommitted());
-    assertNotNull(MyTestTransactionEventListener.getLastRollbacked());
-
-    assertNotSame(MyTestTransactionEventListener.getLastCommitted(), MyTestTransactionEventListener.getLastRollbacked());
-
-    assertSame(MyTestTransactionEventListener.getLastCommitted(), tx);
-    assertNotNull(MyTestTransactionEventListener.getLastCommitted().getUserObject("myUserObject"));
-    assertSame(MyTestTransactionEventListener.getLastCommitted().getUserObject("myUserObject"), myUserObject);
-
-    assertSame(MyTestTransactionEventListener.getLastRollbacked(), tx2);
-    assertNotNull(MyTestTransactionEventListener.getLastRollbacked().getUserObject("myUserObject2"));
-    assertSame(MyTestTransactionEventListener.getLastRollbacked().getUserObject("myUserObject2"), myUserObject);
-  }
-}
+package com.avaje.tests.basic.event;
+
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.Transaction;
+import com.avaje.tests.model.basic.TWithPreInsert;
+
+public class TestTransactionEvent extends TestCase {
+
+  @Override
+  protected void tearDown() throws Exception {
+    MyTestTransactionEventListener.setDoTest(false);
+  }
+
+  @Override
+  protected void setUp() throws Exception {
+    MyTestTransactionEventListener.setDoTest(true);
+  }
+
+  public void test() {
+
+    assertNull(MyTestTransactionEventListener.getLastCommitted());
+    assertNull(MyTestTransactionEventListener.getLastRollbacked());
+
+    final Object myUserObject = new Object();
+
+    Transaction tx = Ebean.beginTransaction();
+    tx.putUserObject("myUserObject", myUserObject);
+
+    TWithPreInsert e = new TWithPreInsert();
+    e.setTitle("Mister Transaction1");
+    Ebean.save(e);
+
+    tx.commit();
+
+    assertNotNull(MyTestTransactionEventListener.getLastCommitted());
+    assertSame(MyTestTransactionEventListener.getLastCommitted(), tx);
+    assertNotNull(MyTestTransactionEventListener.getLastCommitted().getUserObject("myUserObject"));
+    assertSame(MyTestTransactionEventListener.getLastCommitted().getUserObject("myUserObject"), myUserObject);
+    assertNull(MyTestTransactionEventListener.getLastRollbacked());
+
+    Transaction tx2 = Ebean.beginTransaction();
+    tx2.putUserObject("myUserObject2", myUserObject);
+
+    TWithPreInsert e2 = new TWithPreInsert();
+    e2.setTitle("Mister Transaction2");
+    Ebean.save(e2);
+
+    tx2.rollback();
+
+    assertNotNull(MyTestTransactionEventListener.getLastCommitted());
+    assertNotNull(MyTestTransactionEventListener.getLastRollbacked());
+
+    assertNotSame(MyTestTransactionEventListener.getLastCommitted(), MyTestTransactionEventListener.getLastRollbacked());
+
+    assertSame(MyTestTransactionEventListener.getLastCommitted(), tx);
+    assertNotNull(MyTestTransactionEventListener.getLastCommitted().getUserObject("myUserObject"));
+    assertSame(MyTestTransactionEventListener.getLastCommitted().getUserObject("myUserObject"), myUserObject);
+
+    assertSame(MyTestTransactionEventListener.getLastRollbacked(), tx2);
+    assertNotNull(MyTestTransactionEventListener.getLastRollbacked().getUserObject("myUserObject2"));
+    assertSame(MyTestTransactionEventListener.getLastRollbacked().getUserObject("myUserObject2"), myUserObject);
+  }
+}

src/test/java/com/avaje/tests/basic/join/TestSecondaryJoin.java

@@ -1,33 +1,33 @@
-package com.avaje.tests.basic.join;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.ResetBasicData;
-import com.avaje.tests.model.basic.Order.Status;
-
-public class TestSecondaryJoin extends TestCase {
-
-    public void test() {
-       
-        ResetBasicData.reset();
-        
-        List<Order> list = Ebean.find(Order.class)
-            //.select("*")
-            //.join("customer")
-            .findList();
-        
-        Order o0 = list.get(0);
-        o0.setCustomerName("Banan");
-        o0.setStatus(Status.APPROVED);
-        
-        Ebean.save(o0);
-        
-        System.out.println("done");
-        
-    }
-    
-}
+package com.avaje.tests.basic.join;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.tests.model.basic.Order;
+import com.avaje.tests.model.basic.Order.Status;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestSecondaryJoin extends TestCase {
+
+    public void test() {
+       
+        ResetBasicData.reset();
+        
+        List<Order> list = Ebean.find(Order.class)
+            //.select("*")
+            //.join("customer")
+            .findList();
+        
+        Order o0 = list.get(0);
+        o0.setCustomerName("Banan");
+        o0.setStatus(Status.APPROVED);
+        
+        Ebean.save(o0);
+        
+        System.out.println("done");
+        
+    }
+    
+}

src/test/java/com/avaje/tests/basic/one2one/TestOne2OneBookingInvoice.java

@@ -1,10 +1,10 @@
 package com.avaje.tests.basic.one2one;
 
-import com.avaje.ebean.Ebean;
-
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import com.avaje.ebean.Ebean;
+
 public class TestOne2OneBookingInvoice extends TestCase {
 	
 	public void test() {

src/test/java/com/avaje/tests/batchload/TestBasicLazy.java

@@ -1,254 +1,256 @@
-package com.avaje.tests.batchload;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.Expr;
-import com.avaje.ebean.FetchConfig;
-import com.avaje.ebean.Transaction;
-import com.avaje.tests.basic.MyTestDataSourcePoolListener;
-import com.avaje.tests.model.basic.Address;
-import com.avaje.tests.model.basic.Contact;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.ResetBasicData;
-import junit.framework.TestCase;
-import org.junit.Assert;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class TestBasicLazy extends TestCase
-{
-
-    public void testQueries()
-    {
-
-        ResetBasicData.reset();
-
-        Order order = Ebean.find(Order.class)
-            .select("totalAmount")
-            .setMaxRows(1)
-            .order("id")
-            .findUnique();
-
-        Assert.assertNotNull(order);
-
-        Customer customer = order.getCustomer();
-        Assert.assertNotNull(customer);
-        Assert.assertNotNull(customer.getName());
-
-        Address address = customer.getBillingAddress();
-        Assert.assertNotNull(address);
-        Assert.assertNotNull(address.getCity());
-    }
-    
-    public void test_N1N()
-    {
-        ResetBasicData.reset();
-
-        // safety check to see if our customer we are going to use for the test has some contacts 
-        Customer c = Ebean.find(Customer.class).setId(1).findUnique();
-        assertNotNull(c.getContacts());
-        assertTrue("no contacts on test customer 1", c.getContacts().size() > 0);
-        
-        // start transaction so we have a "long running" persistence context
-        Transaction tx = Ebean.beginTransaction();
-        try
-        {
-            List<Order> order = Ebean.find(Order.class)
-                .where(Expr.eq("customer.id", 1))
-                .findList();
-
-            assertNotNull(order);
-            assertTrue(order.size() > 0);
-            
-            Customer customer = order.get(0).getCustomer();
-            assertNotNull(customer);
-            assertEquals(1, customer.getId().intValue());
-
-            // this should lazily fetch the contacts
-            List<Contact> contacts = customer.getContacts();
-            
-            assertNotNull(contacts);
-            assertTrue("contacts not lazily fetched", contacts.size() > 0);
-        }
-        finally
-        {
-            tx.commit();
-        }
-    }
-
-    public void testRaceCondition_Simple() throws Throwable
-    {
-        ResetBasicData.reset();
-
-        Order order = Ebean.find(Order.class)
-            .select("totalAmount")
-            .setMaxRows(1)
-            .order("id")
-            .findUnique();
-
-        Assert.assertNotNull(order);
-
-        final Customer customer = order.getCustomer();
-        Assert.assertNotNull(customer);
-
-        Assert.assertTrue(Ebean.getBeanState(customer).isReference());
-
-        final Throwable throwables[] = new Throwable[2];
-        Thread t1 = new Thread()
-        {
-            @Override
-            public void run()
-            {
-                try
-                {
-                    Assert.assertNotNull(customer.getName());
-                }
-                catch (Throwable e)
-                {
-                    throwables[0] = e;
-                }
-            }
-        };
-
-        Thread t2 = new Thread()
-        {
-            @Override
-            public void run()
-            {
-                try
-                {
-                    Assert.assertNotNull(customer.getName());
-                }
-                catch (Throwable e)
-                {
-                    throwables[1] = e;
-                }
-            }
-        };
-
-        try
-        {
-            // prepare for race condition
-            MyTestDataSourcePoolListener.SLEEP_AFTER_BORROW = 2000;
-
-            t1.start();
-            t2.start();
-            t1.join();
-            t2.join();
-        }
-        finally
-        {
-            MyTestDataSourcePoolListener.SLEEP_AFTER_BORROW = 0;
-        }
-
-        Assert.assertFalse(Ebean.getBeanState(customer).isReference());
-
-        if (throwables[0] != null)
-        {
-            throw throwables[0];
-        }
-        if (throwables[1] != null)
-        {
-            throw throwables[1];
-        }
-    }
-
-    private final AtomicBoolean mutex = new AtomicBoolean(false);
-    private List<Order> orders;
-    
-    private List<Throwable> exceptions = Collections.synchronizedList(new ArrayList<Throwable>());
-
-    private class FetchThread extends Thread
-    {
-        private int index;
-
-        private FetchThread(ThreadGroup tg, int index)
-        {
-            super(tg, "fetcher-" + index);
-            this.index = index;
-        }
-
-        @Override
-        public void run()
-        {
-            synchronized (mutex)
-            {
-                System.err.println("** WAIT **");
-                try
-                {
-                    while (!mutex.get())
-                    {
-                        mutex.wait(100);
-                    }
-                }
-                catch (InterruptedException e)
-                {
-                    throw new RuntimeException(e);
-                }
-            }
-
-            try
-            {
-                System.err.println("** DO LAZY FETCH **");
-                orders.get(index).getCustomer().getName();
-            }
-            catch (Throwable e)
-            {
-                exceptions.add(e);
-            }
-        }
-    }
-
-    public void testRaceCondition_Complex() throws Throwable
-    {
-        ResetBasicData.reset();
-
-        ThreadGroup tg = new ThreadGroup("fetchers");
-        new FetchThread(tg, 0).start();
-        new FetchThread(tg, 1).start();
-        new FetchThread(tg, 2).start();
-        new FetchThread(tg, 3).start();
-        new FetchThread(tg, 0).start();
-        new FetchThread(tg, 1).start();
-        new FetchThread(tg, 2).start();
-        new FetchThread(tg, 3).start();
-
-        orders = Ebean.find(Order.class)
-            .fetch("customer", new FetchConfig().lazy(100))
-            .findList();
-        assertTrue(orders.size() >= 4);
-
-        try
-        {
-            MyTestDataSourcePoolListener.SLEEP_AFTER_BORROW = 2000;
-
-            synchronized (mutex)
-            {
-                mutex.set(true);
-                mutex.notifyAll();
-            }
-
-            while(tg.activeCount() > 0)
-            {
-                Thread.sleep(100);
-            }
-        }
-        finally
-        {
-            MyTestDataSourcePoolListener.SLEEP_AFTER_BORROW = 0;
-        }
-
-        if (exceptions.size() > 0)
-        {
-            System.err.println("Seen Exceptions:");
-            for (Throwable exception : exceptions)
-            {
-                exception.printStackTrace();
-            }
-            Assert.fail();
-        }
-    }
+package com.avaje.tests.batchload;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.Expr;
+import com.avaje.ebean.FetchConfig;
+import com.avaje.ebean.Transaction;
+import com.avaje.tests.basic.MyTestDataSourcePoolListener;
+import com.avaje.tests.model.basic.Address;
+import com.avaje.tests.model.basic.Contact;
+import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.Order;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestBasicLazy extends TestCase
+{
+
+    public void testQueries()
+    {
+
+        ResetBasicData.reset();
+
+        Order order = Ebean.find(Order.class)
+            .select("totalAmount")
+            .setMaxRows(1)
+            .order("id")
+            .findUnique();
+
+        Assert.assertNotNull(order);
+
+        Customer customer = order.getCustomer();
+        Assert.assertNotNull(customer);
+        Assert.assertNotNull(customer.getName());
+
+        Address address = customer.getBillingAddress();
+        Assert.assertNotNull(address);
+        Assert.assertNotNull(address.getCity());
+    }
+    
+    public void test_N1N()
+    {
+        ResetBasicData.reset();
+
+        // safety check to see if our customer we are going to use for the test has some contacts 
+        Customer c = Ebean.find(Customer.class).setId(1).findUnique();
+        assertNotNull(c.getContacts());
+        assertTrue("no contacts on test customer 1", c.getContacts().size() > 0);
+        
+        // start transaction so we have a "long running" persistence context
+        Transaction tx = Ebean.beginTransaction();
+        try
+        {
+            List<Order> order = Ebean.find(Order.class)
+                .where(Expr.eq("customer.id", 1))
+                .findList();
+
+            assertNotNull(order);
+            assertTrue(order.size() > 0);
+            
+            Customer customer = order.get(0).getCustomer();
+            assertNotNull(customer);
+            assertEquals(1, customer.getId().intValue());
+
+            // this should lazily fetch the contacts
+            List<Contact> contacts = customer.getContacts();
+            
+            assertNotNull(contacts);
+            assertTrue("contacts not lazily fetched", contacts.size() > 0);
+        }
+        finally
+        {
+            tx.commit();
+        }
+    }
+
+    public void testRaceCondition_Simple() throws Throwable
+    {
+        ResetBasicData.reset();
+
+        Order order = Ebean.find(Order.class)
+            .select("totalAmount")
+            .setMaxRows(1)
+            .order("id")
+            .findUnique();
+
+        Assert.assertNotNull(order);
+
+        final Customer customer = order.getCustomer();
+        Assert.assertNotNull(customer);
+
+        Assert.assertTrue(Ebean.getBeanState(customer).isReference());
+
+        final Throwable throwables[] = new Throwable[2];
+        Thread t1 = new Thread()
+        {
+            @Override
+            public void run()
+            {
+                try
+                {
+                    Assert.assertNotNull(customer.getName());
+                }
+                catch (Throwable e)
+                {
+                    throwables[0] = e;
+                }
+            }
+        };
+
+        Thread t2 = new Thread()
+        {
+            @Override
+            public void run()
+            {
+                try
+                {
+                    Assert.assertNotNull(customer.getName());
+                }
+                catch (Throwable e)
+                {
+                    throwables[1] = e;
+                }
+            }
+        };
+
+        try
+        {
+            // prepare for race condition
+            MyTestDataSourcePoolListener.SLEEP_AFTER_BORROW = 2000;
+
+            t1.start();
+            t2.start();
+            t1.join();
+            t2.join();
+        }
+        finally
+        {
+            MyTestDataSourcePoolListener.SLEEP_AFTER_BORROW = 0;
+        }
+
+        Assert.assertFalse(Ebean.getBeanState(customer).isReference());
+
+        if (throwables[0] != null)
+        {
+            throw throwables[0];
+        }
+        if (throwables[1] != null)
+        {
+            throw throwables[1];
+        }
+    }
+
+    private final AtomicBoolean mutex = new AtomicBoolean(false);
+    private List<Order> orders;
+    
+    private List<Throwable> exceptions = Collections.synchronizedList(new ArrayList<Throwable>());
+
+    private class FetchThread extends Thread
+    {
+        private int index;
+
+        private FetchThread(ThreadGroup tg, int index)
+        {
+            super(tg, "fetcher-" + index);
+            this.index = index;
+        }
+
+        @Override
+        public void run()
+        {
+            synchronized (mutex)
+            {
+                System.err.println("** WAIT **");
+                try
+                {
+                    while (!mutex.get())
+                    {
+                        mutex.wait(100);
+                    }
+                }
+                catch (InterruptedException e)
+                {
+                    throw new RuntimeException(e);
+                }
+            }
+
+            try
+            {
+                System.err.println("** DO LAZY FETCH **");
+                orders.get(index).getCustomer().getName();
+            }
+            catch (Throwable e)
+            {
+                exceptions.add(e);
+            }
+        }
+    }
+
+    public void testRaceCondition_Complex() throws Throwable
+    {
+        ResetBasicData.reset();
+
+        ThreadGroup tg = new ThreadGroup("fetchers");
+        new FetchThread(tg, 0).start();
+        new FetchThread(tg, 1).start();
+        new FetchThread(tg, 2).start();
+        new FetchThread(tg, 3).start();
+        new FetchThread(tg, 0).start();
+        new FetchThread(tg, 1).start();
+        new FetchThread(tg, 2).start();
+        new FetchThread(tg, 3).start();
+
+        orders = Ebean.find(Order.class)
+            .fetch("customer", new FetchConfig().lazy(100))
+            .findList();
+        assertTrue(orders.size() >= 4);
+
+        try
+        {
+            MyTestDataSourcePoolListener.SLEEP_AFTER_BORROW = 2000;
+
+            synchronized (mutex)
+            {
+                mutex.set(true);
+                mutex.notifyAll();
+            }
+
+            while(tg.activeCount() > 0)
+            {
+                Thread.sleep(100);
+            }
+        }
+        finally
+        {
+            MyTestDataSourcePoolListener.SLEEP_AFTER_BORROW = 0;
+        }
+
+        if (exceptions.size() > 0)
+        {
+            System.err.println("Seen Exceptions:");
+            for (Throwable exception : exceptions)
+            {
+                exception.printStackTrace();
+            }
+            Assert.fail();
+        }
+    }
 }

src/test/java/com/avaje/tests/batchload/TestEmptyManyLazyLoad.java

@@ -1,31 +1,31 @@
-package com.avaje.tests.batchload;
-
-import junit.framework.TestCase;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.ResetBasicData;
-import com.avaje.tests.model.basic.Order.Status;
-
-public class TestEmptyManyLazyLoad extends TestCase {
-
-    public void test() {
-        
-        ResetBasicData.reset();
-        
-        Customer c = Ebean.find(Customer.class)
-            .findList()
-            .get(0);
-        
-        Order o = new Order();
-        o.setCustomer(c);
-        o.setStatus(Status.NEW);
-        
-        Ebean.save(o);
-        
-        Order o2 = Ebean.find(Order.class, o.getId());
-        o2.getDetails().size();
-        
-    }
-}
+package com.avaje.tests.batchload;
+
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.Order;
+import com.avaje.tests.model.basic.Order.Status;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestEmptyManyLazyLoad extends TestCase {
+
+    public void test() {
+        
+        ResetBasicData.reset();
+        
+        Customer c = Ebean.find(Customer.class)
+            .findList()
+            .get(0);
+        
+        Order o = new Order();
+        o.setCustomer(c);
+        o.setStatus(Status.NEW);
+        
+        Ebean.save(o);
+        
+        Order o2 = Ebean.find(Order.class, o.getId());
+        o2.getDetails().size();
+        
+    }
+}

src/test/java/com/avaje/tests/cache/TestCacheBasic.java

@@ -1,146 +1,144 @@
-package com.avaje.tests.cache;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.cache.ServerCache;
-import com.avaje.ebean.cache.ServerCacheStatistics;
-import com.avaje.tests.model.basic.Address;
-import com.avaje.tests.model.basic.Country;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.ResetBasicData;
-
-public class TestCacheBasic extends TestCase {
-
-	
-	public void test(){
-		
-		ResetBasicData.reset();
-		
-		Ebean.getServerCacheManager().clear(Country.class);
-		ServerCache countryCache = Ebean.getServerCacheManager().getBeanCache(Country.class);
-		
-		Ebean.runCacheWarming(Country.class);
-		Assert.assertTrue(countryCache.size() > 0);
-		
-		// reset the statistics
-		countryCache.getStatistics(true);
-		
-		Country c0 = Ebean.getReference(Country.class, "NZ");
-		ServerCacheStatistics statistics = countryCache.getStatistics(false);
-		int hc = statistics.getHitCount();
-		Assert.assertEquals(1, hc);
-
-//		Country c1 = Ebean.getReference(Country.class, "NZ");
-//		Assert.assertEquals(2, countryCache.getStatistics(false).getHitCount());
-//		//Assert.assertEquals(100, countryCache.getStatistics(false).getHitRatio());
-//
-//		// same instance as caching with readOnly=true
-//		Assert.assertTrue(c0 != c1);
-//
-//		c0.getName();
-//		c1.getName();
-//		
-//		// reset the statistics
-//		Assert.assertEquals(2,countryCache.getStatistics(true).getHitCount());
-//		// now the count should be 0 again 
-//		Assert.assertEquals(0, countryCache.getStatistics(false).getHitCount());
-//		// and hitRatio is 0 as well
-//		Assert.assertEquals(0, countryCache.getStatistics(false).getHitRatio());
-//
-//		// hit the country cache automatically via join
-//		
-//		Customer custTest = ResetBasicData.createCustAndOrder("cacheBasic");
-//		Integer id = custTest.getId();
-//		Customer customer = Ebean.find(Customer.class, id);
-//		
-//		Address billingAddress = customer.getBillingAddress();
-//		Country c2 = billingAddress.getCountry();
-//		c2.getName();
-//
-//		Assert.assertTrue(countryCache.getStatistics(false).getHitCount() > 0);
-//
-//		//Country c3 = Ebean.getReference(Country.class, "NZ");
-//		//Country c4 = Ebean.find(Country.class, "NZ");
-//
-//
-//		// clear the cache
-//		Ebean.getServerCacheManager().clear(Country.class);
-//		// reset statistics
-//		countryCache.getStatistics(true);
-//
-//		// try to hit the country cache automatically via join
-//		customer = Ebean.find(Customer.class, id);
-//		billingAddress = customer.getBillingAddress();
-//		Country c5 = billingAddress.getCountry();
-//		// but cache is empty so c5 is reference that will load cache
-//		// if it is lazy loaded
-//		Assert.assertEquals("empty cache",0,countryCache.getStatistics(false).getSize());
-//		//Assert.assertEquals("missCount 1",1,countryCache.getStatistics(false).getMissCount());
-//
-//		// lazy load on c5 populates the cache
-//		c5.getName();
-//		Assert.assertEquals("cache populated via lazy load",1,countryCache.getStatistics(false).getSize());
-//		
-//		// now these get hits in the cache
-//		Country c6 = Ebean.find(Country.class, "NZ");
-//		
-//		Assert.assertTrue("different instance as cache cleared",c2 != c5);
-//		Assert.assertTrue("these 2 are different",c5 != c6);
-//		
-//		// by default readOnly based on deployment annotation
-//		Assert.assertTrue("read only",Ebean.getBeanState(c6).isReadOnly());
-//		
-//		try {
-//			// can't modify a readOnly bean
-//			c6.setName("Nu Zilund");
-//			Assert.assertFalse("Never get here",true);
-//		} catch (IllegalStateException e){
-//			Assert.assertTrue("This is readOnly",true);
-//		}
-//		
-//		Country c8 = Ebean.find(Country.class)
-//			.setId("NZ")
-//			.setReadOnly(false)
-//			.findUnique();
-//		
-//		// Explicitly NOT readOnly 
-//		Assert.assertFalse("NOT read only",Ebean.getBeanState(c8).isReadOnly());
-//		
-//		Assert.assertEquals("1 countries in cache", 1, countryCache.size()); 
-//		c8.setName("Nu Zilund");
-//		// the update will remove the entry from the cache
-//		Ebean.save(c8);
-//		
-//		Assert.assertEquals("1 country in cache", 1, countryCache.size()); 
-//		
-//		Country c9 = Ebean.find(Country.class)
-//			.setReadOnly(false)
-//			.setId("NZ")
-//			.findUnique();
-//
-//		// Find loads cache ...
-//		Assert.assertFalse(Ebean.getBeanState(c9).isReadOnly()); 
-//		Assert.assertTrue(countryCache.size() > 0); 
-//
-//		Country c10 = Ebean.find(Country.class,"NZ");
-//
-//		Assert.assertTrue(Ebean.getBeanState(c10).isReadOnly()); 
-//		Assert.assertTrue(countryCache.size() > 0); 
-//		
-//		Ebean.getServerCacheManager().clear(Country.class);
-//		Assert.assertEquals("0 country in cache", 0, countryCache.size()); 
-//
-//		// reference doesn't load cache yet
-//		Country c11 = Ebean.getReference(Country.class, "NZ");
-//
-//		// still 0 in cache
-//		Assert.assertEquals("0 country in cache", 0, countryCache.size());
-//
-//		// will invoke lazy loading..
-//		c11.getName();
-//		Assert.assertTrue(countryCache.size() > 0);
-
-	}
-}
+package com.avaje.tests.cache;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.cache.ServerCache;
+import com.avaje.ebean.cache.ServerCacheStatistics;
+import com.avaje.tests.model.basic.Country;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestCacheBasic extends TestCase {
+
+	
+	public void test(){
+		
+		ResetBasicData.reset();
+		
+		Ebean.getServerCacheManager().clear(Country.class);
+		ServerCache countryCache = Ebean.getServerCacheManager().getBeanCache(Country.class);
+		
+		Ebean.runCacheWarming(Country.class);
+		Assert.assertTrue(countryCache.size() > 0);
+		
+		// reset the statistics
+		countryCache.getStatistics(true);
+		
+		Country c0 = Ebean.getReference(Country.class, "NZ");
+		ServerCacheStatistics statistics = countryCache.getStatistics(false);
+		int hc = statistics.getHitCount();
+		Assert.assertEquals(1, hc);
+
+//		Country c1 = Ebean.getReference(Country.class, "NZ");
+//		Assert.assertEquals(2, countryCache.getStatistics(false).getHitCount());
+//		//Assert.assertEquals(100, countryCache.getStatistics(false).getHitRatio());
+//
+//		// same instance as caching with readOnly=true
+//		Assert.assertTrue(c0 != c1);
+//
+//		c0.getName();
+//		c1.getName();
+//		
+//		// reset the statistics
+//		Assert.assertEquals(2,countryCache.getStatistics(true).getHitCount());
+//		// now the count should be 0 again 
+//		Assert.assertEquals(0, countryCache.getStatistics(false).getHitCount());
+//		// and hitRatio is 0 as well
+//		Assert.assertEquals(0, countryCache.getStatistics(false).getHitRatio());
+//
+//		// hit the country cache automatically via join
+//		
+//		Customer custTest = ResetBasicData.createCustAndOrder("cacheBasic");
+//		Integer id = custTest.getId();
+//		Customer customer = Ebean.find(Customer.class, id);
+//		
+//		Address billingAddress = customer.getBillingAddress();
+//		Country c2 = billingAddress.getCountry();
+//		c2.getName();
+//
+//		Assert.assertTrue(countryCache.getStatistics(false).getHitCount() > 0);
+//
+//		//Country c3 = Ebean.getReference(Country.class, "NZ");
+//		//Country c4 = Ebean.find(Country.class, "NZ");
+//
+//
+//		// clear the cache
+//		Ebean.getServerCacheManager().clear(Country.class);
+//		// reset statistics
+//		countryCache.getStatistics(true);
+//
+//		// try to hit the country cache automatically via join
+//		customer = Ebean.find(Customer.class, id);
+//		billingAddress = customer.getBillingAddress();
+//		Country c5 = billingAddress.getCountry();
+//		// but cache is empty so c5 is reference that will load cache
+//		// if it is lazy loaded
+//		Assert.assertEquals("empty cache",0,countryCache.getStatistics(false).getSize());
+//		//Assert.assertEquals("missCount 1",1,countryCache.getStatistics(false).getMissCount());
+//
+//		// lazy load on c5 populates the cache
+//		c5.getName();
+//		Assert.assertEquals("cache populated via lazy load",1,countryCache.getStatistics(false).getSize());
+//		
+//		// now these get hits in the cache
+//		Country c6 = Ebean.find(Country.class, "NZ");
+//		
+//		Assert.assertTrue("different instance as cache cleared",c2 != c5);
+//		Assert.assertTrue("these 2 are different",c5 != c6);
+//		
+//		// by default readOnly based on deployment annotation
+//		Assert.assertTrue("read only",Ebean.getBeanState(c6).isReadOnly());
+//		
+//		try {
+//			// can't modify a readOnly bean
+//			c6.setName("Nu Zilund");
+//			Assert.assertFalse("Never get here",true);
+//		} catch (IllegalStateException e){
+//			Assert.assertTrue("This is readOnly",true);
+//		}
+//		
+//		Country c8 = Ebean.find(Country.class)
+//			.setId("NZ")
+//			.setReadOnly(false)
+//			.findUnique();
+//		
+//		// Explicitly NOT readOnly 
+//		Assert.assertFalse("NOT read only",Ebean.getBeanState(c8).isReadOnly());
+//		
+//		Assert.assertEquals("1 countries in cache", 1, countryCache.size()); 
+//		c8.setName("Nu Zilund");
+//		// the update will remove the entry from the cache
+//		Ebean.save(c8);
+//		
+//		Assert.assertEquals("1 country in cache", 1, countryCache.size()); 
+//		
+//		Country c9 = Ebean.find(Country.class)
+//			.setReadOnly(false)
+//			.setId("NZ")
+//			.findUnique();
+//
+//		// Find loads cache ...
+//		Assert.assertFalse(Ebean.getBeanState(c9).isReadOnly()); 
+//		Assert.assertTrue(countryCache.size() > 0); 
+//
+//		Country c10 = Ebean.find(Country.class,"NZ");
+//
+//		Assert.assertTrue(Ebean.getBeanState(c10).isReadOnly()); 
+//		Assert.assertTrue(countryCache.size() > 0); 
+//		
+//		Ebean.getServerCacheManager().clear(Country.class);
+//		Assert.assertEquals("0 country in cache", 0, countryCache.size()); 
+//
+//		// reference doesn't load cache yet
+//		Country c11 = Ebean.getReference(Country.class, "NZ");
+//
+//		// still 0 in cache
+//		Assert.assertEquals("0 country in cache", 0, countryCache.size());
+//
+//		// will invoke lazy loading..
+//		c11.getName();
+//		Assert.assertTrue(countryCache.size() > 0);
+
+	}
+}

src/test/java/com/avaje/tests/cache/TestQueryCache.java

@@ -1,68 +1,68 @@
-package com.avaje.tests.cache;
-
-import java.util.List;
-
-import org.junit.Assert;
-
-import junit.framework.TestCase;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.bean.BeanCollection;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.ResetBasicData;
-
-public class TestQueryCache extends TestCase {
-
-	@SuppressWarnings("unchecked")
-	public void test(){
-		
-		ResetBasicData.reset();
-		
-		List<Customer> list = Ebean.find(Customer.class)
-			.setUseQueryCache(true)
-			.setReadOnly(true)
-			.where().ilike("name", "Rob")
-			.findList();
-		
-		BeanCollection<Customer> bc = (BeanCollection<Customer>)list;
-		Assert.assertFalse(bc.isReadOnly());
-		Assert.assertFalse(bc.isEmpty());
-		Assert.assertTrue(list.size() > 0);
-		Assert.assertTrue(Ebean.getBeanState(list.get(0)).isReadOnly());
-		
-		
-		List<Customer> list2 = Ebean.find(Customer.class)
-			.setUseQueryCache(true)
-			.setReadOnly(true)
-			.where().ilike("name", "Rob")
-			.findList();
-
-		List<Customer> list2B = Ebean.find(Customer.class)
-			.setUseQueryCache(true)
-			//.setReadOnly(true)
-			.where().ilike("name", "Rob")
-			.findList();
-
-		
-//		Assert.assertTrue("same instance",list != list2);
-//		
-//		// readOnly defaults to true for query cache
-//		Assert.assertTrue("same instance",list != list2B);
-//
-//		List<Customer> list3 = Ebean.find(Customer.class)
-//			.setUseQueryCache(true)
-//			.setReadOnly(false)
-//			.where().ilike("name", "Rob")
-//			.findList();
-//
-//		Assert.assertTrue("diff instance",list != list3);
-//		BeanCollection<Customer> bc3 = (BeanCollection<Customer>)list3;
-//		Assert.assertFalse(bc3.isReadOnly());
-//		Assert.assertFalse(bc3.isEmpty());
-//		Assert.assertTrue(list3.size() > 0);
-//		Assert.assertFalse(Ebean.getBeanState(list3.get(0)).isReadOnly());
-
-
-	}
-	
-}
+package com.avaje.tests.cache;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.bean.BeanCollection;
+import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestQueryCache extends TestCase {
+
+	@SuppressWarnings("unchecked")
+	public void test(){
+		
+		ResetBasicData.reset();
+		
+		List<Customer> list = Ebean.find(Customer.class)
+			.setUseQueryCache(true)
+			.setReadOnly(true)
+			.where().ilike("name", "Rob")
+			.findList();
+		
+		BeanCollection<Customer> bc = (BeanCollection<Customer>)list;
+		Assert.assertFalse(bc.isReadOnly());
+		Assert.assertFalse(bc.isEmpty());
+		Assert.assertTrue(list.size() > 0);
+		Assert.assertTrue(Ebean.getBeanState(list.get(0)).isReadOnly());
+		
+		
+		List<Customer> list2 = Ebean.find(Customer.class)
+			.setUseQueryCache(true)
+			.setReadOnly(true)
+			.where().ilike("name", "Rob")
+			.findList();
+
+		List<Customer> list2B = Ebean.find(Customer.class)
+			.setUseQueryCache(true)
+			//.setReadOnly(true)
+			.where().ilike("name", "Rob")
+			.findList();
+
+		
+//		Assert.assertTrue("same instance",list != list2);
+//		
+//		// readOnly defaults to true for query cache
+//		Assert.assertTrue("same instance",list != list2B);
+//
+//		List<Customer> list3 = Ebean.find(Customer.class)
+//			.setUseQueryCache(true)
+//			.setReadOnly(false)
+//			.where().ilike("name", "Rob")
+//			.findList();
+//
+//		Assert.assertTrue("diff instance",list != list3);
+//		BeanCollection<Customer> bc3 = (BeanCollection<Customer>)list3;
+//		Assert.assertFalse(bc3.isReadOnly());
+//		Assert.assertFalse(bc3.isEmpty());
+//		Assert.assertTrue(list3.size() > 0);
+//		Assert.assertFalse(Ebean.getBeanState(list3.get(0)).isReadOnly());
+
+
+	}
+	
+}

src/test/java/com/avaje/tests/compositekeys/db/AuditInfo.java

@@ -1,59 +1,60 @@
-package com.avaje.tests.compositekeys.db;
-
-import javax.persistence.Embeddable;
-import java.util.Date;
-
-@Embeddable
-public class AuditInfo
-{
-	private Date lastUpdated;
-	private Date created;
-	private String updatedBy;
-	private String createdBy;
-
-	public AuditInfo()
-	{
-		created = new Date();
-		createdBy = "dummy";
-	}
-
-	public Date getLastUpdated()
-	{
-		return lastUpdated;
-	}
-
-	public void setLastUpdated(Date lastUpdated)
-	{
-		this.lastUpdated = lastUpdated;
-	}
-
-	public Date getCreated()
-	{
-		return created;
-	}
-
-	public void setCreated(Date created)
-	{
-		this.created = created;
-	}
-
-	public String getUpdatedBy()
-	{
-		return updatedBy;
-	}
-
-	public void setUpdatedBy(String updatedBy)
-	{
-		this.updatedBy = updatedBy;
-	}
-
-	public String getCreatedBy()
-	{
-		return createdBy;
-	}
-
-	public void setCreatedBy(String createdBy)
-	{
-		this.createdBy = createdBy;
-	}
-}
+package com.avaje.tests.compositekeys.db;
+
+import java.util.Date;
+
+import javax.persistence.Embeddable;
+
+@Embeddable
+public class AuditInfo
+{
+	private Date lastUpdated;
+	private Date created;
+	private String updatedBy;
+	private String createdBy;
+
+	public AuditInfo()
+	{
+		created = new Date();
+		createdBy = "dummy";
+	}
+
+	public Date getLastUpdated()
+	{
+		return lastUpdated;
+	}
+
+	public void setLastUpdated(Date lastUpdated)
+	{
+		this.lastUpdated = lastUpdated;
+	}
+
+	public Date getCreated()
+	{
+		return created;
+	}
+
+	public void setCreated(Date created)
+	{
+		this.created = created;
+	}
+
+	public String getUpdatedBy()
+	{
+		return updatedBy;
+	}
+
+	public void setUpdatedBy(String updatedBy)
+	{
+		this.updatedBy = updatedBy;
+	}
+
+	public String getCreatedBy()
+	{
+		return createdBy;
+	}
+
+	public void setCreatedBy(String createdBy)
+	{
+		this.createdBy = createdBy;
+	}
+}

src/test/java/com/avaje/tests/compositekeys/db/Item.java

@@ -1,118 +1,127 @@
-package com.avaje.tests.compositekeys.db;
-
-import javax.persistence.*;
-
-@Entity
-public class Item
-{
-    @Id
-    private ItemKey key;
-
-	private String description;
-
-    private String units;
-
-    private int type;
-
-    private int region;
-
-	@Embedded
-	@AttributeOverrides({
-		@AttributeOverride(name = "lastUpdated", column = @Column(name = "DATE_MODIFIED")),
-		@AttributeOverride(name = "created", column = @Column(name = "DATE_CREATED")),
-		@AttributeOverride(name = "updatedBy", column = @Column(name = "MODIFIED_BY")),
-		@AttributeOverride(name = "createdBy", column = @Column(name = "CREATED_BY"))
-	})
-	private AuditInfo auditInfo = new AuditInfo();
-
-    @Version
-    private Long version;
-
-    @ManyToOne
-    @JoinColumns({
-        @JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false),
-        @JoinColumn(name = "type", referencedColumnName = "type", insertable = false, updatable = false)
-    })
-    private Type eType;
-
-    @ManyToOne
-    @JoinColumns({
-        @JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false),
-        @JoinColumn(name = "region", referencedColumnName = "type", insertable = false, updatable = false)
-    })
-    private Region eRegion;          
-
-    public ItemKey getKey() {
-        return key;
-    }
-
-    public void setKey(ItemKey key) {
-        this.key = key;
-    }
-
-	public String getUnits()
-	{
-		return units;
-	}
-
-	public void setUnits(String units)
-	{
-		this.units = units;
-	}
-
-	public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public int getRegion() {
-        return region;
-    }
-
-    public void setRegion(int region) {
-        this.region = region;
-    }
-
-    public Long getVersion() {
-        return version;
-    }
-
-    public Type getEType() {
-        return eType;
-    }
-
-    public Region getERegion() {
-        return eRegion;
-    }
-
-    public void setVersion(Long version)
-    {
-        this.version = version;
-    }
-
-    public void setEType(Type eType)
-    {
-        this.eType = eType;
-    }
-
-    public void setERegion(Region eRegion)
-    {
-        this.eRegion = eRegion;
-    }
-
-	public AuditInfo getAuditInfo()
-	{
-		return auditInfo;
-	}
-}
+package com.avaje.tests.compositekeys.db;
+
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.ManyToOne;
+import javax.persistence.Version;
+
+@Entity
+public class Item
+{
+    @Id
+    private ItemKey key;
+
+	private String description;
+
+    private String units;
+
+    private int type;
+
+    private int region;
+
+	@Embedded
+	@AttributeOverrides({
+		@AttributeOverride(name = "lastUpdated", column = @Column(name = "DATE_MODIFIED")),
+		@AttributeOverride(name = "created", column = @Column(name = "DATE_CREATED")),
+		@AttributeOverride(name = "updatedBy", column = @Column(name = "MODIFIED_BY")),
+		@AttributeOverride(name = "createdBy", column = @Column(name = "CREATED_BY"))
+	})
+	private AuditInfo auditInfo = new AuditInfo();
+
+    @Version
+    private Long version;
+
+    @ManyToOne
+    @JoinColumns({
+        @JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false),
+        @JoinColumn(name = "type", referencedColumnName = "type", insertable = false, updatable = false)
+    })
+    private Type eType;
+
+    @ManyToOne
+    @JoinColumns({
+        @JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false),
+        @JoinColumn(name = "region", referencedColumnName = "type", insertable = false, updatable = false)
+    })
+    private Region eRegion;          
+
+    public ItemKey getKey() {
+        return key;
+    }
+
+    public void setKey(ItemKey key) {
+        this.key = key;
+    }
+
+	public String getUnits()
+	{
+		return units;
+	}
+
+	public void setUnits(String units)
+	{
+		this.units = units;
+	}
+
+	public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public int getRegion() {
+        return region;
+    }
+
+    public void setRegion(int region) {
+        this.region = region;
+    }
+
+    public Long getVersion() {
+        return version;
+    }
+
+    public Type getEType() {
+        return eType;
+    }
+
+    public Region getERegion() {
+        return eRegion;
+    }
+
+    public void setVersion(Long version)
+    {
+        this.version = version;
+    }
+
+    public void setEType(Type eType)
+    {
+        this.eType = eType;
+    }
+
+    public void setERegion(Region eRegion)
+    {
+        this.eRegion = eRegion;
+    }
+
+	public AuditInfo getAuditInfo()
+	{
+		return auditInfo;
+	}
+}

src/test/java/com/avaje/tests/compositekeys/db/ItemKey.java

@@ -1,63 +1,63 @@
-package com.avaje.tests.compositekeys.db;
-
-import javax.persistence.Embeddable;
-import javax.persistence.Column;
-
-@Embeddable
-public class ItemKey
-{
-    private int customer;
-
-    @Column(name = "itemNumber")
-    private String itemNumber;
-
-    public int getCustomer() {
-        return customer;
-    }
-
-    public void setCustomer(int customer) {
-        this.customer = customer;
-    }
-
-    public String getItemNumber() {
-        return itemNumber;
-    }
-
-    public void setItemNumber(String itemNumber) {
-        this.itemNumber = itemNumber;
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-        if (this == o)
-        {
-            return true;
-        }
-        if (!(o instanceof ItemKey))
-        {
-            return false;
-        }
-
-        ItemKey itemKey = (ItemKey) o;
-
-        if (customer != itemKey.customer)
-        {
-            return false;
-        }
-        if (!itemNumber.equals(itemKey.itemNumber))
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public int hashCode()
-    {
-        int result = customer;
-        result = 31 * result + itemNumber.hashCode();
-        return result;
-    }
-}
+package com.avaje.tests.compositekeys.db;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+
+@Embeddable
+public class ItemKey
+{
+    private int customer;
+
+    @Column(name = "itemNumber")
+    private String itemNumber;
+
+    public int getCustomer() {
+        return customer;
+    }
+
+    public void setCustomer(int customer) {
+        this.customer = customer;
+    }
+
+    public String getItemNumber() {
+        return itemNumber;
+    }
+
+    public void setItemNumber(String itemNumber) {
+        this.itemNumber = itemNumber;
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (!(o instanceof ItemKey))
+        {
+            return false;
+        }
+
+        ItemKey itemKey = (ItemKey) o;
+
+        if (customer != itemKey.customer)
+        {
+            return false;
+        }
+        if (!itemNumber.equals(itemKey.itemNumber))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        int result = customer;
+        result = 31 * result + itemNumber.hashCode();
+        return result;
+    }
+}

src/test/java/com/avaje/tests/compositekeys/db/Parcel.java

@@ -1,33 +1,35 @@
-package com.avaje.tests.compositekeys.db;
-
-import javax.persistence.*;
-
-@Entity
-public class Parcel
-{
-    @Id
-    @Column(name="parcelId")
-    private Long parcelId;
-
-    private String description;
-
-    public Long getParcelId()
-    {
-        return parcelId;
-    }
-
-    public void setParcelId(Long parcelId)
-    {
-        this.parcelId = parcelId;
-    }
-
-    public String getDescription()
-    {
-        return description;
-    }
-
-    public void setDescription(String description)
-    {
-        this.description = description;
-    }
+package com.avaje.tests.compositekeys.db;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class Parcel
+{
+    @Id
+    @Column(name="parcelId")
+    private Long parcelId;
+
+    private String description;
+
+    public Long getParcelId()
+    {
+        return parcelId;
+    }
+
+    public void setParcelId(Long parcelId)
+    {
+        this.parcelId = parcelId;
+    }
+
+    public String getDescription()
+    {
+        return description;
+    }
+
+    public void setDescription(String description)
+    {
+        this.description = description;
+    }
 }

src/test/java/com/avaje/tests/compositekeys/db/Region.java

@@ -1,51 +1,57 @@
-package com.avaje.tests.compositekeys.db;
-
-import javax.persistence.*;
-import java.util.List;
-
-@Entity
-public class Region
-{
-    @Id
-    private RegionKey key;
-
-    private String description;
-
-    @Version
-    private Long version;
-
-    @OneToMany
-    @JoinColumns({
-        @JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false),
-        @JoinColumn(name = "region", referencedColumnName = "type", insertable = false, updatable = false)
-    })
-    private List<Item> items;
-    
-    public RegionKey getKey() {
-        return key;
-    }
-
-    public void setKey(RegionKey key) {
-        this.key = key;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Long getVersion() {
-        return version;
-    }
-
-    public void setVersion(Long version) {
-        this.version = version;
-    }
-
-    public List<Item> getItems() {
-        return items;
-    }
+package com.avaje.tests.compositekeys.db;
+
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.OneToMany;
+import javax.persistence.Version;
+
+@Entity
+public class Region
+{
+    @Id
+    private RegionKey key;
+
+    private String description;
+
+    @Version
+    private Long version;
+
+    @OneToMany
+    @JoinColumns({
+        @JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false),
+        @JoinColumn(name = "region", referencedColumnName = "type", insertable = false, updatable = false)
+    })
+    private List<Item> items;
+    
+    public RegionKey getKey() {
+        return key;
+    }
+
+    public void setKey(RegionKey key) {
+        this.key = key;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Long getVersion() {
+        return version;
+    }
+
+    public void setVersion(Long version) {
+        this.version = version;
+    }
+
+    public List<Item> getItems() {
+        return items;
+    }
 }

src/test/java/com/avaje/tests/compositekeys/db/Type.java

@@ -1,62 +1,69 @@
-package com.avaje.tests.compositekeys.db;
-
-import javax.persistence.*;
-import java.util.List;
-
-@Entity
-public class Type
-{
-    @Id
-    private TypeKey key;
-
-    private String description;
-
-    @Version
-    private Long version;
-
-    @OneToMany
-    @JoinColumns({
-        @JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false),
-        @JoinColumn(name = "type", referencedColumnName = "type", insertable = false, updatable = false)
-    })
-    private List<Item> items;
-
-	@ManyToOne
-	private SubType subType;
-
-    public TypeKey getKey() {
-        return key;
-    }
-
-    public void setKey(TypeKey key) {
-        this.key = key;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Long getVersion() {
-        return version;
-    }
-
-    public void setVersion(Long version) {
-        this.version = version;
-    }
-
-    public List<Item> getItems() {
-        return items;
-    }
-
-	public SubType getSubType() {
-		return subType;
-	}
-
-	public void setSubType(SubType subType) {
-		this.subType = subType;
-	}
+package com.avaje.tests.compositekeys.db;
+
+import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinColumns;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Version;
+
+@Entity
+public class Type
+{
+    @Id
+    private TypeKey key;
+
+    private String description;
+
+    @Version
+    private Long version;
+
+    @OneToMany
+    @JoinColumns({
+        @JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false),
+        @JoinColumn(name = "type", referencedColumnName = "type", insertable = false, updatable = false)
+    })
+    private List<Item> items;
+
+	@ManyToOne
+	private SubType subType;
+
+    public TypeKey getKey() {
+        return key;
+    }
+
+    public void setKey(TypeKey key) {
+        this.key = key;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Long getVersion() {
+        return version;
+    }
+
+    public void setVersion(Long version) {
+        this.version = version;
+    }
+
+    public List<Item> getItems() {
+        return items;
+    }
+
+	public SubType getSubType() {
+		return subType;
+	}
+
+	public void setSubType(SubType subType) {
+		this.subType = subType;
+	}
 }

src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java

@@ -1,64 +1,64 @@
-package com.avaje.tests.ddd.iud;
-
-import java.util.Currency;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.config.GlobalProperties;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
-import com.avaje.ebeaninternal.server.el.ElPropertyValue;
-import com.avaje.tests.model.ddd.DPerson;
-import com.avaje.tests.model.ivo.CMoney;
-import com.avaje.tests.model.ivo.Money;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-public class TestDPersonEl extends TestCase {
-
-    public void test() {
-        
-        GlobalProperties.put("classes", DPerson.class.toString());
-        
-        Currency NZD = Currency.getInstance("NZD");
-        
-        DPerson p = new DPerson();
-        p.setFirstName("first");
-        p.setLastName("last");
-        p.setSalary(new Money("12200"));
-        p.setCmoney(new CMoney(new Money("12"), NZD));
-        
-        SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null);
-        
-        BeanDescriptor<DPerson> descriptor = server.getBeanDescriptor(DPerson.class);
-        
-        ElPropertyValue elCmoney = descriptor.getElGetValue("cmoney");
-        ElPropertyValue elCmoneyAmt = descriptor.getElGetValue("cmoney.amount");
-        ElPropertyValue elCmoneyCur = descriptor.getElGetValue("cmoney.currency");
-        
-        Object cmoney = elCmoney.elGetValue(p);
-        Object amt = elCmoneyAmt.elGetValue(p);
-        Object cur = elCmoneyCur.elGetValue(p);
-        
-        Assert.assertNotNull(cmoney);
-        Assert.assertEquals(new Money("12"), amt);
-        Assert.assertEquals(NZD, cur);
-        
-        p.setCmoney(null);
-        Assert.assertNull(p.getCmoney());
-        
-        // won't trigger CMoney build as not all properties
-        // have been set yet...
-        elCmoneyAmt.elSetValue(p, new Money("13"), true, false);
-        Assert.assertNull(p.getCmoney());
-
-        // will trigger the build and setting of CMoney
-        elCmoneyCur.elSetValue(p, NZD, true, false);
-        
-        // this time not null as all required properties for
-        // the compound object have been collected
-        Assert.assertNotNull(p.getCmoney());
-
-    }
-    
-}
+package com.avaje.tests.ddd.iud;
+
+import java.util.Currency;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.config.GlobalProperties;
+import com.avaje.ebeaninternal.api.SpiEbeanServer;
+import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
+import com.avaje.ebeaninternal.server.el.ElPropertyValue;
+import com.avaje.tests.model.ddd.DPerson;
+import com.avaje.tests.model.ivo.CMoney;
+import com.avaje.tests.model.ivo.Money;
+
+public class TestDPersonEl extends TestCase {
+
+    public void test() {
+        
+        GlobalProperties.put("classes", DPerson.class.toString());
+        
+        Currency NZD = Currency.getInstance("NZD");
+        
+        DPerson p = new DPerson();
+        p.setFirstName("first");
+        p.setLastName("last");
+        p.setSalary(new Money("12200"));
+        p.setCmoney(new CMoney(new Money("12"), NZD));
+        
+        SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null);
+        
+        BeanDescriptor<DPerson> descriptor = server.getBeanDescriptor(DPerson.class);
+        
+        ElPropertyValue elCmoney = descriptor.getElGetValue("cmoney");
+        ElPropertyValue elCmoneyAmt = descriptor.getElGetValue("cmoney.amount");
+        ElPropertyValue elCmoneyCur = descriptor.getElGetValue("cmoney.currency");
+        
+        Object cmoney = elCmoney.elGetValue(p);
+        Object amt = elCmoneyAmt.elGetValue(p);
+        Object cur = elCmoneyCur.elGetValue(p);
+        
+        Assert.assertNotNull(cmoney);
+        Assert.assertEquals(new Money("12"), amt);
+        Assert.assertEquals(NZD, cur);
+        
+        p.setCmoney(null);
+        Assert.assertNull(p.getCmoney());
+        
+        // won't trigger CMoney build as not all properties
+        // have been set yet...
+        elCmoneyAmt.elSetValue(p, new Money("13"), true, false);
+        Assert.assertNull(p.getCmoney());
+
+        // will trigger the build and setting of CMoney
+        elCmoneyCur.elSetValue(p, NZD, true, false);
+        
+        // this time not null as all required properties for
+        // the compound object have been collected
+        Assert.assertNotNull(p.getCmoney());
+
+    }
+    
+}

src/test/java/com/avaje/tests/genkey/TestSeqBatch.java

@@ -1,34 +1,34 @@
-package com.avaje.tests.genkey;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
-import com.avaje.tests.model.basic.TOne;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-public class TestSeqBatch extends TestCase {
-
-	public void test() {
-		
-		EbeanServer server = Ebean.getServer(null);
-		SpiEbeanServer spiServer = (SpiEbeanServer)server;
-		
-		boolean seqSupport = spiServer.getDatabasePlatform().getDbIdentity().isSupportsSequence();
-		
-		if (seqSupport){
-			BeanDescriptor<TOne> d = spiServer.getBeanDescriptor(TOne.class);
-	
-			Object id = d.nextId(null);
-			Assert.assertNotNull(id);
-			
-			for (int i = 0; i < 16; i++) {
-				Object id2 = d.nextId(null);
-				Assert.assertNotNull(id2);		
-			}
-		}
-	}
-	
-}
+package com.avaje.tests.genkey;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.EbeanServer;
+import com.avaje.ebeaninternal.api.SpiEbeanServer;
+import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
+import com.avaje.tests.model.basic.TOne;
+
+public class TestSeqBatch extends TestCase {
+
+	public void test() {
+		
+		EbeanServer server = Ebean.getServer(null);
+		SpiEbeanServer spiServer = (SpiEbeanServer)server;
+		
+		boolean seqSupport = spiServer.getDatabasePlatform().getDbIdentity().isSupportsSequence();
+		
+		if (seqSupport){
+			BeanDescriptor<TOne> d = spiServer.getBeanDescriptor(TOne.class);
+	
+			Object id = d.nextId(null);
+			Assert.assertNotNull(id);
+			
+			for (int i = 0; i < 16; i++) {
+				Object id2 = d.nextId(null);
+				Assert.assertNotNull(id2);		
+			}
+		}
+	}
+	
+}

src/test/java/com/avaje/tests/idkeys/TestSimpleIdInsert.java

@@ -1,56 +1,54 @@
-package com.avaje.tests.idkeys;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import com.avaje.ebean.Ebean;
-//import com.avaje.ebean.LogLevel;
-//import com.avaje.ebean.Transaction;
-import com.avaje.ebean.config.GlobalProperties;
-import com.avaje.tests.model.basic.ESimple;
-
-public class TestSimpleIdInsert extends TestCase {
-
-	public void test() {
-
-		GlobalProperties.put("datasource.default", "h2");
-		GlobalProperties.put("ebean.classes", ESimple.class.getName());
-
-		ESimple e = new ESimple();
-		e.setName("name");
-
-		Ebean.save(e);
-
-		Assert.assertNotNull(e.getId());
-
-	}
-
-//	// This test fails with jdbc drivers that don't
-//	// support batch insert with getGeneratedKeys
-//	public void testJdbcBatch() {
-//
-//		GlobalProperties.put("datasource.default", "hsqldb");
-//		GlobalProperties.put("ebean.classes", ESimple.class.getName());
-//
-//		Transaction transaction = Ebean.beginTransaction();
-//		try {
-//			transaction.setBatchMode(true);
-//			transaction.setLogLevel(LogLevel.SQL);
-//			ESimple e = new ESimple();
-//			e.setName("name");
-//			Ebean.save(e);
-//
-//			ESimple e2 = new ESimple();
-//			e2.setName("name2");
-//			Ebean.save(e2);
-//			transaction.commit();
-//
-//			Assert.assertNotNull(e.getId());
-//			Assert.assertNotNull(e2.getId());
-//
-//		} finally {
-//			Ebean.endTransaction();
-//		}
-//	}
-
-}
+package com.avaje.tests.idkeys;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.config.GlobalProperties;
+import com.avaje.tests.model.basic.ESimple;
+
+public class TestSimpleIdInsert extends TestCase {
+
+	public void test() {
+
+		GlobalProperties.put("datasource.default", "h2");
+		GlobalProperties.put("ebean.classes", ESimple.class.getName());
+
+		ESimple e = new ESimple();
+		e.setName("name");
+
+		Ebean.save(e);
+
+		Assert.assertNotNull(e.getId());
+
+	}
+
+//	// This test fails with jdbc drivers that don't
+//	// support batch insert with getGeneratedKeys
+//	public void testJdbcBatch() {
+//
+//		GlobalProperties.put("datasource.default", "hsqldb");
+//		GlobalProperties.put("ebean.classes", ESimple.class.getName());
+//
+//		Transaction transaction = Ebean.beginTransaction();
+//		try {
+//			transaction.setBatchMode(true);
+//			transaction.setLogLevel(LogLevel.SQL);
+//			ESimple e = new ESimple();
+//			e.setName("name");
+//			Ebean.save(e);
+//
+//			ESimple e2 = new ESimple();
+//			e2.setName("name2");
+//			Ebean.save(e2);
+//			transaction.commit();
+//
+//			Assert.assertNotNull(e.getId());
+//			Assert.assertNotNull(e2.getId());
+//
+//		} finally {
+//			Ebean.endTransaction();
+//		}
+//	}
+
+}

src/test/java/com/avaje/tests/inheritance/TestDuplcateKeyException.java

@@ -1,54 +1,54 @@
-package com.avaje.tests.inheritance;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.TxRunnable;
-import com.avaje.tests.model.basic.AttributeHolder;
-import com.avaje.tests.model.basic.ListAttribute;
-import com.avaje.tests.model.basic.ListAttributeValue;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-public class TestDuplcateKeyException extends TestCase {
-
-
-
-	/**
-	 * Test query.
-	 * <p>This test covers the BUG 276. Cascade was not propagating to the ListAttribute because
-	 * it was considered safe to skip as it didn't take into account any derived classes 
-	 * into account with e.g. collections and Cascade options </p>
-	 */
-	public void testQuery()
-	{
-		// Setup the data first
-		final ListAttributeValue value1 = new ListAttributeValue();
-		
-		Ebean.save(value1);
-		
-		final ListAttribute listAttribute = new ListAttribute();
-		listAttribute.add(value1);
-		Ebean.save(listAttribute);
-		
-		
-		
-		final AttributeHolder holder = new AttributeHolder();
-		holder.add(listAttribute);
-		
-		try {
-			Ebean.execute(new TxRunnable() {
-				public void run() {
-				    Ebean.currentTransaction().log("-- saving holder first time");
-				    // Alternatively turn off cascade Persist for this transaction
-				    //Ebean.currentTransaction().setPersistCascade(false);
-					Ebean.save(holder);
-                    Ebean.currentTransaction().log("-- saving holder second time");
-					// we don't get this far before failing
-					//Ebean.save(holder);
-				}
-			});
-		} catch (Exception e){
-			Assert.assertEquals(e.getMessage(), "test rollback");
-		}
-	}
-}
+package com.avaje.tests.inheritance;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.TxRunnable;
+import com.avaje.tests.model.basic.AttributeHolder;
+import com.avaje.tests.model.basic.ListAttribute;
+import com.avaje.tests.model.basic.ListAttributeValue;
+
+public class TestDuplcateKeyException extends TestCase {
+
+
+
+	/**
+	 * Test query.
+	 * <p>This test covers the BUG 276. Cascade was not propagating to the ListAttribute because
+	 * it was considered safe to skip as it didn't take into account any derived classes 
+	 * into account with e.g. collections and Cascade options </p>
+	 */
+	public void testQuery()
+	{
+		// Setup the data first
+		final ListAttributeValue value1 = new ListAttributeValue();
+		
+		Ebean.save(value1);
+		
+		final ListAttribute listAttribute = new ListAttribute();
+		listAttribute.add(value1);
+		Ebean.save(listAttribute);
+		
+		
+		
+		final AttributeHolder holder = new AttributeHolder();
+		holder.add(listAttribute);
+		
+		try {
+			Ebean.execute(new TxRunnable() {
+				public void run() {
+				    Ebean.currentTransaction().log("-- saving holder first time");
+				    // Alternatively turn off cascade Persist for this transaction
+				    //Ebean.currentTransaction().setPersistCascade(false);
+					Ebean.save(holder);
+                    Ebean.currentTransaction().log("-- saving holder second time");
+					// we don't get this far before failing
+					//Ebean.save(holder);
+				}
+			});
+		} catch (Exception e){
+			Assert.assertEquals(e.getMessage(), "test rollback");
+		}
+	}
+}

src/test/java/com/avaje/tests/inheritance/TestIntInherit.java

@@ -1,45 +1,45 @@
-package com.avaje.tests.inheritance;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.tests.model.basic.TIntChild;
-import com.avaje.tests.model.basic.TIntRoot;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-public class TestIntInherit extends TestCase {
-
-	public void testMe() {
-
-		TIntRoot r = new TIntRoot();
-		r.setName("root1");
-		
-		TIntRoot r2 = new TIntRoot();
-		r.setName("root2");
-		
-		TIntChild c1 = new TIntChild();
-		c1.setName("child1");
-		c1.setChildProperty("cp1");
-		
-		TIntChild c2 = new TIntChild();
-		c2.setName("child2");
-		c2.setChildProperty("cp2");
-		
-		
-		Ebean.save(r);
-		Ebean.save(r2);
-		Ebean.save(c1);
-		Ebean.save(c2);
-		
-		TIntRoot result1 = Ebean.find(TIntRoot.class, r.getId());
-		Assert.assertTrue(result1 instanceof TIntRoot);
-		
-		TIntRoot ref3 = Ebean.getReference(TIntRoot.class, c1.getId());
-		Assert.assertTrue(ref3 instanceof TIntChild);
-		
-		TIntRoot result3 = Ebean.find(TIntRoot.class, c1.getId());
-		Assert.assertTrue(result3 instanceof TIntChild);
-		
-	}
-	
-}
+package com.avaje.tests.inheritance;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.tests.model.basic.TIntChild;
+import com.avaje.tests.model.basic.TIntRoot;
+
+public class TestIntInherit extends TestCase {
+
+	public void testMe() {
+
+		TIntRoot r = new TIntRoot();
+		r.setName("root1");
+		
+		TIntRoot r2 = new TIntRoot();
+		r.setName("root2");
+		
+		TIntChild c1 = new TIntChild();
+		c1.setName("child1");
+		c1.setChildProperty("cp1");
+		
+		TIntChild c2 = new TIntChild();
+		c2.setName("child2");
+		c2.setChildProperty("cp2");
+		
+		
+		Ebean.save(r);
+		Ebean.save(r2);
+		Ebean.save(c1);
+		Ebean.save(c2);
+		
+		TIntRoot result1 = Ebean.find(TIntRoot.class, r.getId());
+		Assert.assertTrue(result1 instanceof TIntRoot);
+		
+		TIntRoot ref3 = Ebean.getReference(TIntRoot.class, c1.getId());
+		Assert.assertTrue(ref3 instanceof TIntChild);
+		
+		TIntRoot result3 = Ebean.find(TIntRoot.class, c1.getId());
+		Assert.assertTrue(result3 instanceof TIntChild);
+		
+	}
+	
+}

src/test/java/com/avaje/tests/inheritance/TestSkippable.java

@@ -1,67 +1,67 @@
-package com.avaje.tests.inheritance;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.tests.model.basic.AttributeHolder;
-import com.avaje.tests.model.basic.ListAttribute;
-import com.avaje.tests.model.basic.ListAttributeValue;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-public class TestSkippable extends TestCase {
-
-
-
-	/**
-	 * Test query.
-	 * <p>This test covers the BUG 276. Cascade was not propagating to the ListAttribute because
-	 * it was considered safe to skip as it didn't take into account any derived classes 
-	 * into account with e.g. collections and Cascade options </p>
-	 */
-	public void testQuery()
-	{
-		// Setup the data first
-		final ListAttributeValue value1 = new ListAttributeValue();
-		final ListAttributeValue value2 = new ListAttributeValue();
-		
-		Ebean.save(value1);
-		Ebean.save(value2);
-		
-		final ListAttribute listAttribute = new ListAttribute();
-		listAttribute.add(value1);
-		Ebean.save(listAttribute);
-		
-		final ListAttribute listAttributeDB = Ebean.find(ListAttribute.class, listAttribute.getId());
-		Assert.assertNotNull(listAttributeDB);
-
-		final ListAttributeValue value1_DB = listAttributeDB.getValues().iterator().next();
-		
-		
-		Assert.assertTrue(value1.getId().equals(value1_DB.getId()));
-		
-		
-		final AttributeHolder holder = new AttributeHolder();
-		holder.add(listAttributeDB);
-		
-		Ebean.save(holder);
-		
-		// Now change the M2M listAttribute.values and save the holder
-		// The save should cascade as follows 
-		// holder.attributes..ListAttribute.values
-		listAttributeDB.getValues().clear();
-		listAttributeDB.add(value2);
-		
-		// Save the holder - should cascade down to the listAtribute and save the values
-		Ebean.save(holder);
-		
-
-		final ListAttribute listAttributeDB_2 = Ebean.find(ListAttribute.class, listAttributeDB.getId());
-		Assert.assertNotNull(listAttributeDB_2);
-
-		final ListAttributeValue value2_DB_2 = listAttributeDB_2.getValues().iterator().next();
-		
-		
-		Assert.assertTrue("Cascade failed", value2.getId().equals(value2_DB_2.getId()));
-		
-	}
-}
+package com.avaje.tests.inheritance;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.tests.model.basic.AttributeHolder;
+import com.avaje.tests.model.basic.ListAttribute;
+import com.avaje.tests.model.basic.ListAttributeValue;
+
+public class TestSkippable extends TestCase {
+
+
+
+	/**
+	 * Test query.
+	 * <p>This test covers the BUG 276. Cascade was not propagating to the ListAttribute because
+	 * it was considered safe to skip as it didn't take into account any derived classes 
+	 * into account with e.g. collections and Cascade options </p>
+	 */
+	public void testQuery()
+	{
+		// Setup the data first
+		final ListAttributeValue value1 = new ListAttributeValue();
+		final ListAttributeValue value2 = new ListAttributeValue();
+		
+		Ebean.save(value1);
+		Ebean.save(value2);
+		
+		final ListAttribute listAttribute = new ListAttribute();
+		listAttribute.add(value1);
+		Ebean.save(listAttribute);
+		
+		final ListAttribute listAttributeDB = Ebean.find(ListAttribute.class, listAttribute.getId());
+		Assert.assertNotNull(listAttributeDB);
+
+		final ListAttributeValue value1_DB = listAttributeDB.getValues().iterator().next();
+		
+		
+		Assert.assertTrue(value1.getId().equals(value1_DB.getId()));
+		
+		
+		final AttributeHolder holder = new AttributeHolder();
+		holder.add(listAttributeDB);
+		
+		Ebean.save(holder);
+		
+		// Now change the M2M listAttribute.values and save the holder
+		// The save should cascade as follows 
+		// holder.attributes..ListAttribute.values
+		listAttributeDB.getValues().clear();
+		listAttributeDB.add(value2);
+		
+		// Save the holder - should cascade down to the listAtribute and save the values
+		Ebean.save(holder);
+		
+
+		final ListAttribute listAttributeDB_2 = Ebean.find(ListAttribute.class, listAttributeDB.getId());
+		Assert.assertNotNull(listAttributeDB_2);
+
+		final ListAttributeValue value2_DB_2 = listAttributeDB_2.getValues().iterator().next();
+		
+		
+		Assert.assertTrue("Cascade failed", value2.getId().equals(value2_DB_2.getId()));
+		
+	}
+}

src/test/java/com/avaje/tests/ldap/TestLDPersonDeploy.java

@@ -1,68 +1,68 @@
-package com.avaje.tests.ldap;
-
-import java.util.Set;
-
-import javax.naming.directory.Attribute;
-
-import junit.framework.Assert;
-
-import com.avaje.ebean.EbeanServer;
-import com.avaje.ebean.config.GlobalProperties;
-import com.avaje.ebeaninternal.api.SpiEbeanServer;
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
-import com.avaje.ebeaninternal.server.deploy.BeanProperty;
-import com.avaje.ebeaninternal.server.deploy.BeanPropertySimpleCollection;
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
-import com.avaje.ebeaninternal.server.type.ScalarType;
-import com.avaje.ebeaninternal.server.type.ScalarTypeLdapTimestamp;
-import com.avaje.tests.model.ldap.LDPerson;
-
-
-public class TestLDPersonDeploy extends BaseLdapTest {
-
-    public void test() {
-        
-        boolean b = true;
-        if (b){
-            // turn this test off for the moment
-            return;
-        }
-
-        
-        GlobalProperties.put("ebean.classes", LDPerson.class.toString());
-        
-        EbeanServer server = createServer();
-        SpiEbeanServer spiServer = (SpiEbeanServer)server;
-        
-        BeanDescriptor<LDPerson> descriptor = spiServer.getBeanDescriptor(LDPerson.class);
-        Assert.assertTrue(EntityType.LDAP.equals(descriptor.getEntityType()));
-        
-        BeanProperty beanProperty = descriptor.getBeanProperty("modifiedTime");
-        
-        Assert.assertEquals("modifiedTime", beanProperty.getName());
-        Assert.assertEquals("modifiedTime", beanProperty.getDbColumn());
-        
-        ScalarType<?> scalarType = beanProperty.getScalarType();
-        Assert.assertTrue(scalarType instanceof ScalarTypeLdapTimestamp<?>);
-        
-        BeanProperty accountsProp = descriptor.getBeanProperty("accounts");
-        Assert.assertTrue(accountsProp instanceof BeanPropertySimpleCollection<?>);
-        
-        LDPerson person = new LDPerson();
-        person.addAccount(1001);
-        person.addAccount(1002);
-        person.addAccount(1003);
-        
-        Attribute acctAttribute = accountsProp.createAttribute(person);
-        Assert.assertTrue(acctAttribute.size() == 3);
-
-        LDPerson newPerson = new LDPerson();
-
-        accountsProp.setAttributeValue(newPerson, acctAttribute);
-        Set<Long> accounts = newPerson.getAccounts();
-        
-        Assert.assertTrue(accounts.size() == 3);
-        
-    }
-    
-}
+package com.avaje.tests.ldap;
+
+import java.util.Set;
+
+import javax.naming.directory.Attribute;
+
+import junit.framework.Assert;
+
+import com.avaje.ebean.EbeanServer;
+import com.avaje.ebean.config.GlobalProperties;
+import com.avaje.ebeaninternal.api.SpiEbeanServer;
+import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
+import com.avaje.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
+import com.avaje.ebeaninternal.server.deploy.BeanProperty;
+import com.avaje.ebeaninternal.server.deploy.BeanPropertySimpleCollection;
+import com.avaje.ebeaninternal.server.type.ScalarType;
+import com.avaje.ebeaninternal.server.type.ScalarTypeLdapTimestamp;
+import com.avaje.tests.model.ldap.LDPerson;
+
+
+public class TestLDPersonDeploy extends BaseLdapTest {
+
+    public void test() {
+        
+        boolean b = true;
+        if (b){
+            // turn this test off for the moment
+            return;
+        }
+
+        
+        GlobalProperties.put("ebean.classes", LDPerson.class.toString());
+        
+        EbeanServer server = createServer();
+        SpiEbeanServer spiServer = (SpiEbeanServer)server;
+        
+        BeanDescriptor<LDPerson> descriptor = spiServer.getBeanDescriptor(LDPerson.class);
+        Assert.assertTrue(EntityType.LDAP.equals(descriptor.getEntityType()));
+        
+        BeanProperty beanProperty = descriptor.getBeanProperty("modifiedTime");
+        
+        Assert.assertEquals("modifiedTime", beanProperty.getName());
+        Assert.assertEquals("modifiedTime", beanProperty.getDbColumn());
+        
+        ScalarType<?> scalarType = beanProperty.getScalarType();
+        Assert.assertTrue(scalarType instanceof ScalarTypeLdapTimestamp<?>);
+        
+        BeanProperty accountsProp = descriptor.getBeanProperty("accounts");
+        Assert.assertTrue(accountsProp instanceof BeanPropertySimpleCollection<?>);
+        
+        LDPerson person = new LDPerson();
+        person.addAccount(1001);
+        person.addAccount(1002);
+        person.addAccount(1003);
+        
+        Attribute acctAttribute = accountsProp.createAttribute(person);
+        Assert.assertTrue(acctAttribute.size() == 3);
+
+        LDPerson newPerson = new LDPerson();
+
+        accountsProp.setAttributeValue(newPerson, acctAttribute);
+        Set<Long> accounts = newPerson.getAccounts();
+        
+        Assert.assertTrue(accounts.size() == 3);
+        
+    }
+    
+}

src/test/java/com/avaje/tests/model/basic/xtra/EdParent.java

@@ -1,48 +1,60 @@
-
-package com.avaje.tests.model.basic.xtra;
-
-
-import javax.persistence.*;
-import java.util.List;
-
-@Entity
-@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
-@DiscriminatorColumn(discriminatorType=DiscriminatorType.STRING , name="parent_type")
-@DiscriminatorValue("BASIC")
-@Table(name="td_parent")
-public class EdParent {
-    @Id
-    @Column(name="parent_id")
-    private int id;
-
-    @Column(name="parent_name")
-    private String name;
-
-    @OneToMany(fetch = FetchType.EAGER, mappedBy="parent", cascade=CascadeType.ALL)
-    List<EdChild> children;
-
-    public List<EdChild> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<EdChild> children) {
-        this.children = children;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-}
-
+
+package com.avaje.tests.model.basic.xtra;
+
+
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorType;
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
+@Entity
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
+@DiscriminatorColumn(discriminatorType=DiscriminatorType.STRING , name="parent_type")
+@DiscriminatorValue("BASIC")
+@Table(name="td_parent")
+public class EdParent {
+    @Id
+    @Column(name="parent_id")
+    private int id;
+
+    @Column(name="parent_name")
+    private String name;
+
+    @OneToMany(fetch = FetchType.EAGER, mappedBy="parent", cascade=CascadeType.ALL)
+    List<EdChild> children;
+
+    public List<EdChild> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<EdChild> children) {
+        this.children = children;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
+

src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java

@@ -1,83 +1,79 @@
-package com.avaje.tests.query;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import com.avaje.ebean.AdminAutofetch;
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.Query;
-import com.avaje.ebean.bean.ObjectGraphNode;
-import com.avaje.ebean.bean.ObjectGraphOrigin;
-import com.avaje.ebean.meta.MetaAutoFetchStatistic;
-import com.avaje.ebean.meta.MetaAutoFetchStatistic.NodeUsageStats;
-import com.avaje.ebean.meta.MetaAutoFetchStatistic.QueryStats;
-import com.avaje.ebeaninternal.api.SpiQuery;
-import com.avaje.ebeaninternal.server.querydefn.DefaultOrmQuery;
-import com.avaje.tests.model.basic.Address;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.ResetBasicData;
-
-public class TestAutofetchTuneWithJoin extends TestCase {
-
-    public void test() {
-        runQuery();
-        collectUsage();
-    }
-
-    private void runQuery() {
-
-        ResetBasicData.reset();
-
-        Query<Order> q = Ebean.find(Order.class)
-            .setAutofetch(true)
-            .fetch("customer")
-            .fetch("customer.contacts")
-            .where().lt("id", 3)
-            .query();
-
-        List<Order> list = q.findList();
-
-        for (int i = 0; i < list.size(); i++) {
-            Order order = list.get(i);
-            order.getOrderDate();
-            order.getShipDate();
-            // order.setShipDate(new Date(System.currentTimeMillis()));
-            Customer customer = order.getCustomer();
-            customer.getName();
-            Address shippingAddress = customer.getShippingAddress();
-            if (shippingAddress != null) {
-                shippingAddress.getLine1();
-                shippingAddress.getCity();
-            }
-            // customer.getContacts()
-        }
-
-        SpiQuery<?> sq = (SpiQuery<?>) q;
-        ObjectGraphNode parentNode = sq.getParentNode();
-        ObjectGraphOrigin origin = parentNode.getOriginQueryPoint();
-
-        System.out.println("Origin:" + origin.getKey());
-
-//        MetaAutoFetchStatistic metaAutoFetchStatistic = ((DefaultOrmQuery<?>)q).getMetaAutoFetchStatistic();
-//        if (metaAutoFetchStatistic != null) {
-//            List<NodeUsageStats> nodeUsageStats = metaAutoFetchStatistic.getNodeUsageStats();
-//            System.out.println(nodeUsageStats);
-//            List<QueryStats> queryStats = metaAutoFetchStatistic.getQueryStats();
-//            System.out.println(queryStats);
-//        }
-
-        if (q.isAutofetchTuned()) {
-            System.out.println("TUNED...");
-        }
-    }
-
-    private static void collectUsage() {
-
-        AdminAutofetch adminAutofetch = Ebean.getServer(null).getAdminAutofetch();
-        adminAutofetch.collectUsageViaGC();
-
-    }
-
-}
+package com.avaje.tests.query;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import com.avaje.ebean.AdminAutofetch;
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.Query;
+import com.avaje.ebean.bean.ObjectGraphNode;
+import com.avaje.ebean.bean.ObjectGraphOrigin;
+import com.avaje.ebeaninternal.api.SpiQuery;
+import com.avaje.tests.model.basic.Address;
+import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.Order;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestAutofetchTuneWithJoin extends TestCase {
+
+    public void test() {
+        runQuery();
+        collectUsage();
+    }
+
+    private void runQuery() {
+
+        ResetBasicData.reset();
+
+        Query<Order> q = Ebean.find(Order.class)
+            .setAutofetch(true)
+            .fetch("customer")
+            .fetch("customer.contacts")
+            .where().lt("id", 3)
+            .query();
+
+        List<Order> list = q.findList();
+
+        for (int i = 0; i < list.size(); i++) {
+            Order order = list.get(i);
+            order.getOrderDate();
+            order.getShipDate();
+            // order.setShipDate(new Date(System.currentTimeMillis()));
+            Customer customer = order.getCustomer();
+            customer.getName();
+            Address shippingAddress = customer.getShippingAddress();
+            if (shippingAddress != null) {
+                shippingAddress.getLine1();
+                shippingAddress.getCity();
+            }
+            // customer.getContacts()
+        }
+
+        SpiQuery<?> sq = (SpiQuery<?>) q;
+        ObjectGraphNode parentNode = sq.getParentNode();
+        ObjectGraphOrigin origin = parentNode.getOriginQueryPoint();
+
+        System.out.println("Origin:" + origin.getKey());
+
+//        MetaAutoFetchStatistic metaAutoFetchStatistic = ((DefaultOrmQuery<?>)q).getMetaAutoFetchStatistic();
+//        if (metaAutoFetchStatistic != null) {
+//            List<NodeUsageStats> nodeUsageStats = metaAutoFetchStatistic.getNodeUsageStats();
+//            System.out.println(nodeUsageStats);
+//            List<QueryStats> queryStats = metaAutoFetchStatistic.getQueryStats();
+//            System.out.println(queryStats);
+//        }
+
+        if (q.isAutofetchTuned()) {
+            System.out.println("TUNED...");
+        }
+    }
+
+    private static void collectUsage() {
+
+        AdminAutofetch adminAutofetch = Ebean.getServer(null).getAdminAutofetch();
+        adminAutofetch.collectUsageViaGC();
+
+    }
+
+}

src/test/java/com/avaje/tests/query/TestLimitQuery.java

@@ -1,31 +1,32 @@
-package com.avaje.tests.query;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.Expr;
-import com.avaje.ebean.Junction;
-import com.avaje.ebean.Query;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.ResetBasicData;
-import junit.framework.TestCase;
-
-import java.util.List;
-
-public class TestLimitQuery extends TestCase {
-
-	public void testHasManyWithLimit()
-	{
-		ResetBasicData.reset();
-
-		Query<Customer> query = Ebean.find(Customer.class);
-		query.setAutofetch(false);
-		query.setFirstRow(0);
-		query.setMaxRows(10);
-
-		Junction<Customer> junc = Expr.disjunction(query);
-		junc.add(Expr.like("name", "%A%"));
-		query.where(junc);
-
-		List<Customer> customer = query.findList();
-		assertTrue(customer.size() > 0); // should at least find the "Cust NoAddress" customer
-	}
+package com.avaje.tests.query;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.Expr;
+import com.avaje.ebean.Junction;
+import com.avaje.ebean.Query;
+import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestLimitQuery extends TestCase {
+
+	public void testHasManyWithLimit()
+	{
+		ResetBasicData.reset();
+
+		Query<Customer> query = Ebean.find(Customer.class);
+		query.setAutofetch(false);
+		query.setFirstRow(0);
+		query.setMaxRows(10);
+
+		Junction<Customer> junc = Expr.disjunction(query);
+		junc.add(Expr.like("name", "%A%"));
+		query.where(junc);
+
+		List<Customer> customer = query.findList();
+		assertTrue(customer.size() > 0); // should at least find the "Cust NoAddress" customer
+	}
 }

src/test/java/com/avaje/tests/query/TestSubQuery.java

@@ -1,206 +1,207 @@
-package com.avaje.tests.query;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.Query;
-import com.avaje.tests.model.basic.CKeyParent;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.ResetBasicData;
-import com.avaje.tests.model.basic.Vehicle;
-import com.avaje.tests.model.basic.VehicleDriver;
-import junit.framework.TestCase;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TestSubQuery extends TestCase {
-
-    public void testId() {
-        
-        ResetBasicData.reset();
-
-        List<Integer> productIds = new ArrayList<Integer>();
-        productIds.add(3);
-        
-        Query<Order> sq = Ebean.createQuery(Order.class)
-            .select("id")
-            .where().in("details.product.id", productIds)
-            .query();
-        
-        List<Order> list = Ebean.find(Order.class)
-            .where().in("id", sq)
-            .findList();
-        
-        System.out.println(list);
-        // FIXME: need to clear out old orders..
-        //Assert.assertEquals(2,list.size());
-        
-        String oq = " find order (id, status) where id in "
-            +"(select a.id from o_order a join o_order_detail ad on ad.order_id = a.id where ad.product_id in (:prods)) ";
-
-        List<Order> list2 = Ebean.createQuery(Order.class, oq)
-            .setParameter("prods", productIds)
-            .findList();
-
-        System.out.println(list2);
-        //Assert.assertEquals(2,list2.size());
-
-    }
-
-	
-	public void testCompositeKey()
-	{
-		ResetBasicData.reset();
-
-		Query<CKeyParent> sq = Ebean.createQuery(CKeyParent.class)
-			.select("id.oneKey")
-			.setAutofetch(false)
-			.where()
-			.query();
-
-		Query<CKeyParent> pq = Ebean.find(CKeyParent.class)
-			.where().in("id.oneKey", sq)
-			.query();
-
-		pq.findList();
-		
-		String sql = pq.getGeneratedSql();
-
-		String golden = "(t0.one_key) in (select t0.one_key  from ckey_parent t0) ";
-		
-		if (sql.indexOf(golden) < 0)
-		{
-		    System.out.println("failed sql:"+sql);
-			fail("golden string not found");
-		}
-	}
-
-	/**
-	 * show that ebean is not using the correct table name in the subquery (sq)
-	 *
-	public void testInheritance1()
-	{
-		ResetBasicData.reset();
-
-		Query<Vehicle> sq = Ebean.createQuery(Vehicle.class)
-			.select("id")
-			.setAutofetch(false)
-			.where()
-			.query();
-
-		Query<VehicleDriver> pq = Ebean.find(VehicleDriver.class)
-			.where().in("vehicle.id", sq)
-			.query();
-
-		pq.findList();
-
-		String sql = pq.getGeneratedSql();
-		System.err.println(sql);
-
-		String golden = "(t0.vehicle_id) in (select t0.id from t0.vehicle t0)";
-		if (sql.indexOf(golden) < 0)
-		{
-			System.out.println("failed sql:"+sql);
-			fail("golden string not found");
-		}
-
-	}
-	 */
-
-	/**
-	 * show that ebean is adding the discriminator to the list of columns in the subquery
-	 */
-	public void testInheritance2()
-	{
-		ResetBasicData.reset();
-
-		Query<VehicleDriver> sq = Ebean.createQuery(VehicleDriver.class)
-			.select("vehicle")
-			.setAutofetch(false)
-			.where()
-			.query();
-
-		Query<Vehicle> pq = Ebean.find(Vehicle.class)
-			.where().in("id", sq)
-			.query();
-
-		pq.findList();
-
-		String sql = pq.getGeneratedSql();
-		System.err.println(sql);
-
-		// TODO: If, after bugfixing, the system still join against vehicle I do not know now, in our case, it is not necessary if not
-		// using it in the where clause
-		String golden = "(t0.id) in (select t0.vehicle_id  from vehicle_driver t0 left outer join vehicle t1 on t1.id = t0.vehicle_id )";
-		if (sql.indexOf(golden) < 0)
-		{
-			System.out.println("failed sql:"+sql);
-			fail("golden string not found");
-		}
-
-	}
-
-	/**
-	 * show that ebean is adding the discriminator to the list of columns in the subquery.
-	 * Second test to make sure that joining is still possible after bugfixing testInheritance2.
-	 */
-	public void testInheritance3()
-	{
-		ResetBasicData.reset();
-
-		Query<VehicleDriver> sq = Ebean.createQuery(VehicleDriver.class)
-			.select("vehicle")
-			.setAutofetch(false)
-			.where()
-			.eq("vehicle.licenseNumber", "abc")
-			.query();
-
-		Query<Vehicle> pq = Ebean.find(Vehicle.class)
-			.where().in("id", sq)
-			.query();
-
-		pq.findList();
-
-		String sql = pq.getGeneratedSql();
-		System.err.println(sql);
-
-		String golden = "(t0.id) in (select t0.vehicle_id  from vehicle_driver t0 left outer join vehicle t1 on t1.id = t0.vehicle_id   where t1.license_number = ? )";
-		if (sql.indexOf(golden) < 0)
-		{
-			System.out.println("failed sql:"+sql);
-			fail("golden string not found");
-		}
-	}
-
-	/**
-	 * show that ebean is using the wrong column (from the vehicle_driver table instead of vehicle) for the selected column in the subquery.
-	 * In contrast to testInheritance2+3 this test forces ebean to "drill down" to the key of the relation.
-	 */
-	public void testInheritance4()
-	{
-		ResetBasicData.reset();
-
-		Query<VehicleDriver> sq = Ebean.createQuery(VehicleDriver.class)
-			.select("vehicle.id")
-			.setAutofetch(false)
-			.where()
-			.query();
-
-		Query<Vehicle> pq = Ebean.find(Vehicle.class)
-			.where().in("id", sq)
-			.query();
-
-		pq.findList();
-
-		String sql = pq.getGeneratedSql();
-		System.err.println(sql);
-
-		String golden = "(t0.id) in (select t0.vehicle_id  from vehicle_driver t0 left outer join vehicle t1 on t1.id = t0.vehicle_id )";
-		// OR without join
-		// String golden = "(t0.id) in (select t0.vehicle_id  from vehicle_driver t0)";
-		if (sql.indexOf(golden) < 0)
-		{
-			System.out.println("failed sql:"+sql);
-			fail("golden string not found");
-		}
-	}
-}
+package com.avaje.tests.query;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.Query;
+import com.avaje.tests.model.basic.CKeyParent;
+import com.avaje.tests.model.basic.Order;
+import com.avaje.tests.model.basic.ResetBasicData;
+import com.avaje.tests.model.basic.Vehicle;
+import com.avaje.tests.model.basic.VehicleDriver;
+
+public class TestSubQuery extends TestCase {
+
+    public void testId() {
+        
+        ResetBasicData.reset();
+
+        List<Integer> productIds = new ArrayList<Integer>();
+        productIds.add(3);
+        
+        Query<Order> sq = Ebean.createQuery(Order.class)
+            .select("id")
+            .where().in("details.product.id", productIds)
+            .query();
+        
+        List<Order> list = Ebean.find(Order.class)
+            .where().in("id", sq)
+            .findList();
+        
+        System.out.println(list);
+        // FIXME: need to clear out old orders..
+        //Assert.assertEquals(2,list.size());
+        
+        String oq = " find order (id, status) where id in "
+            +"(select a.id from o_order a join o_order_detail ad on ad.order_id = a.id where ad.product_id in (:prods)) ";
+
+        List<Order> list2 = Ebean.createQuery(Order.class, oq)
+            .setParameter("prods", productIds)
+            .findList();
+
+        System.out.println(list2);
+        //Assert.assertEquals(2,list2.size());
+
+    }
+
+	
+	public void testCompositeKey()
+	{
+		ResetBasicData.reset();
+
+		Query<CKeyParent> sq = Ebean.createQuery(CKeyParent.class)
+			.select("id.oneKey")
+			.setAutofetch(false)
+			.where()
+			.query();
+
+		Query<CKeyParent> pq = Ebean.find(CKeyParent.class)
+			.where().in("id.oneKey", sq)
+			.query();
+
+		pq.findList();
+		
+		String sql = pq.getGeneratedSql();
+
+		String golden = "(t0.one_key) in (select t0.one_key  from ckey_parent t0) ";
+		
+		if (sql.indexOf(golden) < 0)
+		{
+		    System.out.println("failed sql:"+sql);
+			fail("golden string not found");
+		}
+	}
+
+	/**
+	 * show that ebean is not using the correct table name in the subquery (sq)
+	 *
+	public void testInheritance1()
+	{
+		ResetBasicData.reset();
+
+		Query<Vehicle> sq = Ebean.createQuery(Vehicle.class)
+			.select("id")
+			.setAutofetch(false)
+			.where()
+			.query();
+
+		Query<VehicleDriver> pq = Ebean.find(VehicleDriver.class)
+			.where().in("vehicle.id", sq)
+			.query();
+
+		pq.findList();
+
+		String sql = pq.getGeneratedSql();
+		System.err.println(sql);
+
+		String golden = "(t0.vehicle_id) in (select t0.id from t0.vehicle t0)";
+		if (sql.indexOf(golden) < 0)
+		{
+			System.out.println("failed sql:"+sql);
+			fail("golden string not found");
+		}
+
+	}
+	 */
+
+	/**
+	 * show that ebean is adding the discriminator to the list of columns in the subquery
+	 */
+	public void testInheritance2()
+	{
+		ResetBasicData.reset();
+
+		Query<VehicleDriver> sq = Ebean.createQuery(VehicleDriver.class)
+			.select("vehicle")
+			.setAutofetch(false)
+			.where()
+			.query();
+
+		Query<Vehicle> pq = Ebean.find(Vehicle.class)
+			.where().in("id", sq)
+			.query();
+
+		pq.findList();
+
+		String sql = pq.getGeneratedSql();
+		System.err.println(sql);
+
+		// TODO: If, after bugfixing, the system still join against vehicle I do not know now, in our case, it is not necessary if not
+		// using it in the where clause
+		String golden = "(t0.id) in (select t0.vehicle_id  from vehicle_driver t0 left outer join vehicle t1 on t1.id = t0.vehicle_id )";
+		if (sql.indexOf(golden) < 0)
+		{
+			System.out.println("failed sql:"+sql);
+			fail("golden string not found");
+		}
+
+	}
+
+	/**
+	 * show that ebean is adding the discriminator to the list of columns in the subquery.
+	 * Second test to make sure that joining is still possible after bugfixing testInheritance2.
+	 */
+	public void testInheritance3()
+	{
+		ResetBasicData.reset();
+
+		Query<VehicleDriver> sq = Ebean.createQuery(VehicleDriver.class)
+			.select("vehicle")
+			.setAutofetch(false)
+			.where()
+			.eq("vehicle.licenseNumber", "abc")
+			.query();
+
+		Query<Vehicle> pq = Ebean.find(Vehicle.class)
+			.where().in("id", sq)
+			.query();
+
+		pq.findList();
+
+		String sql = pq.getGeneratedSql();
+		System.err.println(sql);
+
+		String golden = "(t0.id) in (select t0.vehicle_id  from vehicle_driver t0 left outer join vehicle t1 on t1.id = t0.vehicle_id   where t1.license_number = ? )";
+		if (sql.indexOf(golden) < 0)
+		{
+			System.out.println("failed sql:"+sql);
+			fail("golden string not found");
+		}
+	}
+
+	/**
+	 * show that ebean is using the wrong column (from the vehicle_driver table instead of vehicle) for the selected column in the subquery.
+	 * In contrast to testInheritance2+3 this test forces ebean to "drill down" to the key of the relation.
+	 */
+	public void testInheritance4()
+	{
+		ResetBasicData.reset();
+
+		Query<VehicleDriver> sq = Ebean.createQuery(VehicleDriver.class)
+			.select("vehicle.id")
+			.setAutofetch(false)
+			.where()
+			.query();
+
+		Query<Vehicle> pq = Ebean.find(Vehicle.class)
+			.where().in("id", sq)
+			.query();
+
+		pq.findList();
+
+		String sql = pq.getGeneratedSql();
+		System.err.println(sql);
+
+		String golden = "(t0.id) in (select t0.vehicle_id  from vehicle_driver t0 left outer join vehicle t1 on t1.id = t0.vehicle_id )";
+		// OR without join
+		// String golden = "(t0.id) in (select t0.vehicle_id  from vehicle_driver t0)";
+		if (sql.indexOf(golden) < 0)
+		{
+			System.out.println("failed sql:"+sql);
+			fail("golden string not found");
+		}
+	}
+}

src/test/java/com/avaje/tests/query/TestWhereRawClause.java

@@ -1,24 +1,24 @@
-package com.avaje.tests.query;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.Expr;
-import com.avaje.tests.model.basic.OrderDetail;
-import com.avaje.tests.model.basic.ResetBasicData;
-
-import junit.framework.TestCase;
-
-public class TestWhereRawClause extends TestCase {
-
-  public void testRawClause() {
-    
-    ResetBasicData.reset();
-    
-    
-    Ebean.find(OrderDetail.class)
-      .where()
-        .not(Expr.eq("id", 1))
-        .raw("orderQty < shipQty")
-        .findList();
-    
-  }
-}
+package com.avaje.tests.query;
+
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.Expr;
+import com.avaje.tests.model.basic.OrderDetail;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestWhereRawClause extends TestCase {
+
+  public void testRawClause() {
+    
+    ResetBasicData.reset();
+    
+    
+    Ebean.find(OrderDetail.class)
+      .where()
+        .not(Expr.eq("id", 1))
+        .raw("orderQty < shipQty")
+        .findList();
+    
+  }
+}

src/test/java/com/avaje/tests/rawsql/TestInsertSqlLogging.java

@@ -1,24 +1,24 @@
-package com.avaje.tests.rawsql;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.SqlUpdate;
-
-import junit.framework.TestCase;
-
-public class TestInsertSqlLogging extends TestCase {
-
-    public void test() {
-        
-        //Ebean.getServer(null);
-        
-        String sql = "insert into audit_log (id, description, modified_description) values (?,?,?)";
-        SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql);
-        sqlUpdate.setParameter(1, 10000);
-        sqlUpdate.setParameter(2, "hello");
-        sqlUpdate.setParameter(3, "rob");
-        
-        sqlUpdate.execute();
-        
-  
-    }
-}
+package com.avaje.tests.rawsql;
+
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.SqlUpdate;
+
+public class TestInsertSqlLogging extends TestCase {
+
+    public void test() {
+        
+        //Ebean.getServer(null);
+        
+        String sql = "insert into audit_log (id, description, modified_description) values (?,?,?)";
+        SqlUpdate sqlUpdate = Ebean.createSqlUpdate(sql);
+        sqlUpdate.setParameter(1, 10000);
+        sqlUpdate.setParameter(2, "hello");
+        sqlUpdate.setParameter(3, "rob");
+        
+        sqlUpdate.execute();
+        
+  
+    }
+}

src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper.java

@@ -1,80 +1,80 @@
-package com.avaje.tests.rawsql;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.Query;
-import com.avaje.ebean.RawSql;
-import com.avaje.ebean.RawSqlBuilder;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.OrderAggregate;
-import com.avaje.tests.model.basic.ResetBasicData;
-import com.avaje.tests.model.basic.Order.Status;
-
-public class TestRawSqlOrmWrapper extends TestCase {
-
-    public void test() {
-        
-        ResetBasicData.reset();
-                
-        String sql 
-            = " select order_id, o.status, c.id, c.name, sum(d.order_qty*d.unit_price) as totalAmount"
-            + " from o_order o" 
-            + " join o_customer c on c.id = o.kcustomer_id "
-            + " join o_order_detail d on d.order_id = o.id "
-            + " group by order_id, o.status, c.id, c.name ";
-        
-        RawSql rawSql = 
-            RawSqlBuilder
-                .parse(sql)
-                .columnMapping("order_id",  "order.id")
-                .columnMapping("o.status",  "order.status")
-                .columnMapping("c.id",      "order.customer.id")
-                .columnMapping("c.name",    "order.customer.name")
-                //.columnMapping("sum(d.order_qty*d.unit_price)", "totalAmount")
-                .create();
-
-        
-        Query<OrderAggregate> query = Ebean.find(OrderAggregate.class);
-            query.setRawSql(rawSql)        
-            //.fetch("order.details", new FetchConfig().query())
-            .where().gt("order.id", 0)
-            .having().gt("totalAmount", 20);
-        
-        List<OrderAggregate> list = query.findList();
-        assertNotNull(list);
-
-        output(list);
-        
-        List<OrderAggregate> list2 = Ebean.find(OrderAggregate.class)
-            .setRawSql(rawSql)        
-            //.fetch("order.details", new FetchConfig().query())
-            .where().gt("order.id", 2)
-            .having().gt("totalAmount", 10)
-            .findList();
-    
-        output(list2);
-
-    }
-    
-    private void output(List<OrderAggregate> list) {
-    
-        for (OrderAggregate oa : list) {
-            Double totalAmount = oa.getTotalAmount();
-            Order order = oa.getOrder();
-            Integer id = order.getId();
-            Status status = order.getStatus();
-            System.out.println("Order: "+id+" "+status+" total:"+totalAmount);
-            
-            Customer c = order.getCustomer();
-            System.out.println("   -> customer: "+c.getId()+" "+c.getName());
-            
-            // invoke lazy loading as this property
-            // has not populated originally
-            //order.getOrderDate();
-        }
-    }
-}
+package com.avaje.tests.rawsql;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.Query;
+import com.avaje.ebean.RawSql;
+import com.avaje.ebean.RawSqlBuilder;
+import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.Order;
+import com.avaje.tests.model.basic.Order.Status;
+import com.avaje.tests.model.basic.OrderAggregate;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestRawSqlOrmWrapper extends TestCase {
+
+    public void test() {
+        
+        ResetBasicData.reset();
+                
+        String sql 
+            = " select order_id, o.status, c.id, c.name, sum(d.order_qty*d.unit_price) as totalAmount"
+            + " from o_order o" 
+            + " join o_customer c on c.id = o.kcustomer_id "
+            + " join o_order_detail d on d.order_id = o.id "
+            + " group by order_id, o.status, c.id, c.name ";
+        
+        RawSql rawSql = 
+            RawSqlBuilder
+                .parse(sql)
+                .columnMapping("order_id",  "order.id")
+                .columnMapping("o.status",  "order.status")
+                .columnMapping("c.id",      "order.customer.id")
+                .columnMapping("c.name",    "order.customer.name")
+                //.columnMapping("sum(d.order_qty*d.unit_price)", "totalAmount")
+                .create();
+
+        
+        Query<OrderAggregate> query = Ebean.find(OrderAggregate.class);
+            query.setRawSql(rawSql)        
+            //.fetch("order.details", new FetchConfig().query())
+            .where().gt("order.id", 0)
+            .having().gt("totalAmount", 20);
+        
+        List<OrderAggregate> list = query.findList();
+        assertNotNull(list);
+
+        output(list);
+        
+        List<OrderAggregate> list2 = Ebean.find(OrderAggregate.class)
+            .setRawSql(rawSql)        
+            //.fetch("order.details", new FetchConfig().query())
+            .where().gt("order.id", 2)
+            .having().gt("totalAmount", 10)
+            .findList();
+    
+        output(list2);
+
+    }
+    
+    private void output(List<OrderAggregate> list) {
+    
+        for (OrderAggregate oa : list) {
+            Double totalAmount = oa.getTotalAmount();
+            Order order = oa.getOrder();
+            Integer id = order.getId();
+            Status status = order.getStatus();
+            System.out.println("Order: "+id+" "+status+" total:"+totalAmount);
+            
+            Customer c = order.getCustomer();
+            System.out.println("   -> customer: "+c.getId()+" "+c.getName());
+            
+            // invoke lazy loading as this property
+            // has not populated originally
+            //order.getOrderDate();
+        }
+    }
+}

src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper3.java

@@ -1,71 +1,71 @@
-package com.avaje.tests.rawsql;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.FetchConfig;
-import com.avaje.ebean.RawSql;
-import com.avaje.ebean.RawSqlBuilder;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.Order;
-import com.avaje.tests.model.basic.OrderAggregate;
-import com.avaje.tests.model.basic.ResetBasicData;
-import com.avaje.tests.model.basic.Order.Status;
-
-public class TestRawSqlOrmWrapper3 extends TestCase {
-
-    public void test() {
-        
-        ResetBasicData.reset();
-                
-        String sql 
-            = " select order_id, o.status, c.id, c.name, sum(d.order_qty*d.unit_price) as totalAmount"
-            + " from o_order o" 
-            + " join o_customer c on c.id = o.kcustomer_id "
-            + " join o_order_detail d on d.order_id = o.id "
-            + " group by order_id, o.status, c.id, c.name ";
-        
-        RawSql rawSql = 
-            RawSqlBuilder
-                .parse(sql)
-                .columnMapping("order_id",  "order.id")
-                .columnMapping("o.status",  "order.status")
-                .columnMapping("c.id",      "order.customer.id")
-                .columnMapping("c.name",    "order.customer.name")
-                //.columnMapping("sum(d.order_qty*d.unit_price)", "totalAmount")
-                .create();
-
-        
-        List<OrderAggregate> list2 = Ebean.find(OrderAggregate.class)
-            .setRawSql(rawSql)        
-            .fetch("order", new FetchConfig().query())
-            .fetch("order.details", new FetchConfig().query())
-            .where().gt("order.id", 2)
-            .having().gt("totalAmount", 10)
-            .filterMany("order.details").gt("unitPrice", 2d)
-            .findList();
-    
-        output(list2);
-
-    }
-    
-    private void output(List<OrderAggregate> list) {
-    
-        for (OrderAggregate oa : list) {
-            Double totalAmount = oa.getTotalAmount();
-            Order order = oa.getOrder();
-            Integer id = order.getId();
-            Status status = order.getStatus();
-            System.out.println("Order: "+id+" "+status+" total:"+totalAmount);
-            
-            Customer c = order.getCustomer();
-            System.out.println("   -> customer: "+c.getId()+" "+c.getName());
-            
-            // invoke lazy loading as this property
-            // has not populated originally
-            //order.getOrderDate();
-        }
-    }
-}
+package com.avaje.tests.rawsql;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.FetchConfig;
+import com.avaje.ebean.RawSql;
+import com.avaje.ebean.RawSqlBuilder;
+import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.Order;
+import com.avaje.tests.model.basic.Order.Status;
+import com.avaje.tests.model.basic.OrderAggregate;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestRawSqlOrmWrapper3 extends TestCase {
+
+    public void test() {
+        
+        ResetBasicData.reset();
+                
+        String sql 
+            = " select order_id, o.status, c.id, c.name, sum(d.order_qty*d.unit_price) as totalAmount"
+            + " from o_order o" 
+            + " join o_customer c on c.id = o.kcustomer_id "
+            + " join o_order_detail d on d.order_id = o.id "
+            + " group by order_id, o.status, c.id, c.name ";
+        
+        RawSql rawSql = 
+            RawSqlBuilder
+                .parse(sql)
+                .columnMapping("order_id",  "order.id")
+                .columnMapping("o.status",  "order.status")
+                .columnMapping("c.id",      "order.customer.id")
+                .columnMapping("c.name",    "order.customer.name")
+                //.columnMapping("sum(d.order_qty*d.unit_price)", "totalAmount")
+                .create();
+
+        
+        List<OrderAggregate> list2 = Ebean.find(OrderAggregate.class)
+            .setRawSql(rawSql)        
+            .fetch("order", new FetchConfig().query())
+            .fetch("order.details", new FetchConfig().query())
+            .where().gt("order.id", 2)
+            .having().gt("totalAmount", 10)
+            .filterMany("order.details").gt("unitPrice", 2d)
+            .findList();
+    
+        output(list2);
+
+    }
+    
+    private void output(List<OrderAggregate> list) {
+    
+        for (OrderAggregate oa : list) {
+            Double totalAmount = oa.getTotalAmount();
+            Order order = oa.getOrder();
+            Integer id = order.getId();
+            Status status = order.getStatus();
+            System.out.println("Order: "+id+" "+status+" total:"+totalAmount);
+            
+            Customer c = order.getCustomer();
+            System.out.println("   -> customer: "+c.getId()+" "+c.getName());
+            
+            // invoke lazy loading as this property
+            // has not populated originally
+            //order.getOrderDate();
+        }
+    }
+}

src/test/java/com/avaje/tests/rawsql/named/TestRawSqlNamedQuery.java

@@ -1,23 +1,23 @@
-package com.avaje.tests.rawsql.named;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.FetchConfig;
-import com.avaje.ebean.Query;
-import com.avaje.tests.model.basic.OrderAggregate;
-import com.avaje.tests.model.basic.ResetBasicData;
-
-import junit.framework.TestCase;
-
-public class TestRawSqlNamedQuery extends TestCase {
-
-    public void test(){
-        
-        ResetBasicData.reset();
-        
-        Query<OrderAggregate> q = Ebean.createNamedQuery(OrderAggregate.class, "total.amount");
-        q.fetch("order", new FetchConfig().query());
-        
-        q.findList();
-    }
-    
-}
+package com.avaje.tests.rawsql.named;
+
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.FetchConfig;
+import com.avaje.ebean.Query;
+import com.avaje.tests.model.basic.OrderAggregate;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestRawSqlNamedQuery extends TestCase {
+
+    public void test(){
+        
+        ResetBasicData.reset();
+        
+        Query<OrderAggregate> q = Ebean.createNamedQuery(OrderAggregate.class, "total.amount");
+        q.fetch("order", new FetchConfig().query());
+        
+        q.findList();
+    }
+    
+}

src/test/java/com/avaje/tests/singleTableInheritance/TestInheritQuery.java

@@ -1,39 +1,40 @@
-package com.avaje.tests.singleTableInheritance;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.tests.singleTableInheritance.model.PalletLocation;
-import com.avaje.tests.singleTableInheritance.model.PalletLocationExternal;
-import com.avaje.tests.singleTableInheritance.model.Zone;
-import com.avaje.tests.singleTableInheritance.model.ZoneExternal;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import java.util.List;
-
-public class TestInheritQuery extends TestCase {
-
-	public void test() {
-
-		ZoneExternal zone = new ZoneExternal();
-		zone.setAttribute("ABC");
-		Ebean.save(zone);
-
-		PalletLocationExternal location = new PalletLocationExternal();
-		location.setZone(zone);
-		location.setAttribute("123");
-		Ebean.save(location);
-
-
-		// This line should work too:
-		 List<PalletLocation> locations = Ebean.find(PalletLocation.class).where().eq("zone", zone).findList();
-//		List<PalletLocation> locations = Ebean.find(PalletLocation.class).where().eq("zone.id", zone.getId()).findList();
-
-		Assert.assertNotNull(locations);
-		Assert.assertEquals(1, locations.size());
-		PalletLocation rereadLoc = locations.get(0);
-		Assert.assertTrue(rereadLoc instanceof PalletLocation);
-		Zone rereadZone = rereadLoc.getZone();
-		Assert.assertNotNull(rereadZone);
-		Assert.assertTrue(rereadZone instanceof ZoneExternal);
-	}
+package com.avaje.tests.singleTableInheritance;
+
+import java.util.List;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.tests.singleTableInheritance.model.PalletLocation;
+import com.avaje.tests.singleTableInheritance.model.PalletLocationExternal;
+import com.avaje.tests.singleTableInheritance.model.Zone;
+import com.avaje.tests.singleTableInheritance.model.ZoneExternal;
+
+public class TestInheritQuery extends TestCase {
+
+	public void test() {
+
+		ZoneExternal zone = new ZoneExternal();
+		zone.setAttribute("ABC");
+		Ebean.save(zone);
+
+		PalletLocationExternal location = new PalletLocationExternal();
+		location.setZone(zone);
+		location.setAttribute("123");
+		Ebean.save(location);
+
+
+		// This line should work too:
+		 List<PalletLocation> locations = Ebean.find(PalletLocation.class).where().eq("zone", zone).findList();
+//		List<PalletLocation> locations = Ebean.find(PalletLocation.class).where().eq("zone.id", zone.getId()).findList();
+
+		Assert.assertNotNull(locations);
+		Assert.assertEquals(1, locations.size());
+		PalletLocation rereadLoc = locations.get(0);
+		Assert.assertTrue(rereadLoc instanceof PalletLocation);
+		Zone rereadZone = rereadLoc.getZone();
+		Assert.assertNotNull(rereadZone);
+		Assert.assertTrue(rereadZone instanceof ZoneExternal);
+	}
 }

src/test/java/com/avaje/tests/singleTableInheritance/model/PalletLocationExternal.java

@@ -1,21 +1,21 @@
-package com.avaje.tests.singleTableInheritance.model;
-
-import javax.persistence.Entity;
-import javax.persistence.DiscriminatorValue;
-
-@Entity
-@DiscriminatorValue("EXT")
-public class PalletLocationExternal extends PalletLocation
-{
-	private String attribute;
-
-	public String getAttribute()
-	{
-		return attribute;
-	}
-
-	public void setAttribute(String attribute)
-	{
-		this.attribute = attribute;
-	}
-}
+package com.avaje.tests.singleTableInheritance.model;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+
+@Entity
+@DiscriminatorValue("EXT")
+public class PalletLocationExternal extends PalletLocation
+{
+	private String attribute;
+
+	public String getAttribute()
+	{
+		return attribute;
+	}
+
+	public void setAttribute(String attribute)
+	{
+		this.attribute = attribute;
+	}
+}

src/test/java/com/avaje/tests/sp/TestManyToManySaveTwice.java

@@ -3,13 +3,13 @@ package com.avaje.tests.sp;
 import java.util.LinkedList;
 import java.util.List;
 
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
 import com.avaje.ebean.Ebean;
 import com.avaje.tests.sp.model.car.Car;
 import com.avaje.tests.sp.model.car.Wheel;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
 public class TestManyToManySaveTwice extends TestCase {
 
 	public void testNothing() {

src/test/java/com/avaje/tests/sp/model/car/Car.java

@@ -4,8 +4,8 @@ import java.util.List;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
-import javax.persistence.JoinTable;
 import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 

src/test/java/com/avaje/tests/text/csv/TestCsvReader.java

@@ -1,47 +1,48 @@
-package com.avaje.tests.text.csv;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.text.csv.CsvReader;
-import com.avaje.tests.model.basic.Customer;
-import com.avaje.tests.model.basic.ResetBasicData;
-import junit.framework.TestCase;
-
-import java.io.File;
-import java.io.FileReader;
-import java.util.Locale;
-
-public class TestCsvReader extends TestCase {
-
-	public void test() {
-
-		ResetBasicData.reset();
-		
-		try {
-			File f = new File("src/test/resources/test1.csv");
-
-			FileReader reader = new FileReader(f);
-
-			
-			CsvReader<Customer> csvReader = Ebean.createCsvReader(Customer.class);
-
-			csvReader.setPersistBatchSize(2);
-			
-			csvReader.addIgnore();
-			//csvReader.addProperty("id");
-			csvReader.addProperty("status");
-			csvReader.addProperty("name");
-			csvReader.addDateTime("anniversary", "dd-MMM-yyyy", Locale.GERMAN);
-			csvReader.addProperty("billingAddress.line1");
-			csvReader.addProperty("billingAddress.city");
-			csvReader.addReference("billingAddress.country.code");
-
-			
-			csvReader.process(reader);
-			
-			
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-}
+package com.avaje.tests.text.csv;
+
+import java.io.File;
+import java.io.FileReader;
+import java.util.Locale;
+
+import junit.framework.TestCase;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.text.csv.CsvReader;
+import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.ResetBasicData;
+
+public class TestCsvReader extends TestCase {
+
+	public void test() {
+
+		ResetBasicData.reset();
+		
+		try {
+			File f = new File("src/test/resources/test1.csv");
+
+			FileReader reader = new FileReader(f);
+
+			
+			CsvReader<Customer> csvReader = Ebean.createCsvReader(Customer.class);
+
+			csvReader.setPersistBatchSize(2);
+			
+			csvReader.addIgnore();
+			//csvReader.addProperty("id");
+			csvReader.addProperty("status");
+			csvReader.addProperty("name");
+			csvReader.addDateTime("anniversary", "dd-MMM-yyyy", Locale.GERMAN);
+			csvReader.addProperty("billingAddress.line1");
+			csvReader.addProperty("billingAddress.city");
+			csvReader.addReference("billingAddress.country.code");
+
+			
+			csvReader.process(reader);
+			
+			
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+}

src/test/java/com/avaje/tests/text/json/TestTextJsonUtilDateFormat.java

@@ -1,66 +1,66 @@
-package com.avaje.tests.text.json;
-
-import java.sql.Date;
-import java.sql.Timestamp;
-
-import org.junit.Assert;
-
-import junit.framework.TestCase;
-
-import com.avaje.ebean.Ebean;
-import com.avaje.ebean.config.GlobalProperties;
-import com.avaje.ebean.text.json.JsonContext;
-import com.avaje.ebean.text.json.JsonValueAdapter;
-import com.avaje.ebean.text.json.JsonWriteOptions;
-import com.avaje.ebeaninternal.server.text.json.DefaultJsonValueAdapter;
-import com.avaje.tests.model.basic.Car;
-import com.avaje.tests.model.basic.Vehicle;
-
-public class TestTextJsonUtilDateFormat extends TestCase {
-
-    public void test() {
-        
-        GlobalProperties.put("ebean.ddl.generate", "false");
-        GlobalProperties.put("ebean.ddl.run", "false");
-        
-        Vehicle v = new Car();
-        v.setId(100);
-        v.setRegistrationDate(new java.util.Date());
-        v.setUpdtime(new Timestamp(System.currentTimeMillis()));
-        
-        JsonContext context = Ebean.createJsonContext();
-        JsonWriteOptions o = new JsonWriteOptions();
-        o.setValueAdapter(new CustomDateFormatAdapter());
-        
-        String jsonString = context.toJsonString(v, true, o);
-        System.out.println(jsonString);
-        
-        Assert.assertTrue(jsonString.contains("\"registrationDate\":'"));
-    }
-    
-    class CustomDateFormatAdapter implements JsonValueAdapter {
-
-        DefaultJsonValueAdapter defaultImplementation = new DefaultJsonValueAdapter();
-        
-        public String jsonFromDate(Date date) {
-            // TODO
-            return null;
-        }
-
-        public String jsonFromTimestamp(Timestamp date) {
-            // add some single quotes around the timestamp value
-            return "'"+defaultImplementation.jsonFromTimestamp(date)+"'";
-        }
-
-        public Date jsonToDate(String jsonDate) {
-            // TODO 
-            return null;
-        }
-
-        public Timestamp jsonToTimestamp(String jsonDateTime) {
-            // TODO 
-            return null;
-        }
-        
-    }
-}
+package com.avaje.tests.text.json;
+
+import java.sql.Date;
+import java.sql.Timestamp;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.config.GlobalProperties;
+import com.avaje.ebean.text.json.JsonContext;
+import com.avaje.ebean.text.json.JsonValueAdapter;
+import com.avaje.ebean.text.json.JsonWriteOptions;
+import com.avaje.ebeaninternal.server.text.json.DefaultJsonValueAdapter;
+import com.avaje.tests.model.basic.Car;
+import com.avaje.tests.model.basic.Vehicle;
+
+public class TestTextJsonUtilDateFormat extends TestCase {
+
+    public void test() {
+        
+        GlobalProperties.put("ebean.ddl.generate", "false");
+        GlobalProperties.put("ebean.ddl.run", "false");
+        
+        Vehicle v = new Car();
+        v.setId(100);
+        v.setRegistrationDate(new java.util.Date());
+        v.setUpdtime(new Timestamp(System.currentTimeMillis()));
+        
+        JsonContext context = Ebean.createJsonContext();
+        JsonWriteOptions o = new JsonWriteOptions();
+        o.setValueAdapter(new CustomDateFormatAdapter());
+        
+        String jsonString = context.toJsonString(v, true, o);
+        System.out.println(jsonString);
+        
+        Assert.assertTrue(jsonString.contains("\"registrationDate\":'"));
+    }
+    
+    class CustomDateFormatAdapter implements JsonValueAdapter {
+
+        DefaultJsonValueAdapter defaultImplementation = new DefaultJsonValueAdapter();
+        
+        public String jsonFromDate(Date date) {
+            // TODO
+            return null;
+        }
+
+        public String jsonFromTimestamp(Timestamp date) {
+            // add some single quotes around the timestamp value
+            return "'"+defaultImplementation.jsonFromTimestamp(date)+"'";
+        }
+
+        public Date jsonToDate(String jsonDate) {
+            // TODO 
+            return null;
+        }
+
+        public Timestamp jsonToTimestamp(String jsonDateTime) {
+            // TODO 
+            return null;
+        }
+        
+    }
+}

src/test/java/com/avaje/tests/unitinternal/TestGlobalPropsEval.java

@@ -1,28 +1,28 @@
-package com.avaje.tests.unitinternal;
-
-import com.avaje.ebean.config.GlobalProperties;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-public class TestGlobalPropsEval extends TestCase {
-
-    public void test() {
-        
-        GlobalProperties.put("unitevaltest.1", "one");
-        Assert.assertEquals("one", GlobalProperties.get("unitevaltest.1",""));
-        GlobalProperties.put("unitevaltest.2", "a${unitevaltest.1}b");
-        Assert.assertEquals("aoneb", GlobalProperties.get("unitevaltest.2",""));
-        
-        GlobalProperties.put("unitevaltest.3", "a${unitevaltest.4}b");
-        Assert.assertEquals("a${unitevaltest.4}b", GlobalProperties.get("unitevaltest.3",""));
-
-        GlobalProperties.put("unitevaltest.4", "four");
-        Assert.assertEquals("four", GlobalProperties.get("unitevaltest.4",""));
-        Assert.assertEquals("a${unitevaltest.4}b", GlobalProperties.get("unitevaltest.3",""));
-
-        GlobalProperties.evaluateExpressions();
-        Assert.assertEquals("afourb", GlobalProperties.get("unitevaltest.3",""));
-
-    }
-}
+package com.avaje.tests.unitinternal;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebean.config.GlobalProperties;
+
+public class TestGlobalPropsEval extends TestCase {
+
+    public void test() {
+        
+        GlobalProperties.put("unitevaltest.1", "one");
+        Assert.assertEquals("one", GlobalProperties.get("unitevaltest.1",""));
+        GlobalProperties.put("unitevaltest.2", "a${unitevaltest.1}b");
+        Assert.assertEquals("aoneb", GlobalProperties.get("unitevaltest.2",""));
+        
+        GlobalProperties.put("unitevaltest.3", "a${unitevaltest.4}b");
+        Assert.assertEquals("a${unitevaltest.4}b", GlobalProperties.get("unitevaltest.3",""));
+
+        GlobalProperties.put("unitevaltest.4", "four");
+        Assert.assertEquals("four", GlobalProperties.get("unitevaltest.4",""));
+        Assert.assertEquals("a${unitevaltest.4}b", GlobalProperties.get("unitevaltest.3",""));
+
+        GlobalProperties.evaluateExpressions();
+        Assert.assertEquals("afourb", GlobalProperties.get("unitevaltest.3",""));
+
+    }
+}

src/test/java/com/avaje/tests/unitinternal/TestLocaleParse.java

@@ -1,50 +1,50 @@
-package com.avaje.tests.unitinternal;
-
-import java.util.Locale;
-
-import com.avaje.ebeaninternal.server.type.ScalarTypeLocale;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-public class TestLocaleParse extends TestCase {
-
-    public void test() {
-     
-        //Examples: "en", "de_DE", "_GB", "en_US_WIN", "de__POSIX", "fr__MAC"
-        
-        Locale l = parse("en");
-        Assert.assertEquals("en", l.getLanguage());
-
-        l = parse("de_DE");
-        Assert.assertEquals("de", l.getLanguage());
-        Assert.assertEquals("DE", l.getCountry());
-
-        l = parse("en_US_WIN");
-        Assert.assertEquals("en", l.getLanguage());
-        Assert.assertEquals("US", l.getCountry());
-        Assert.assertEquals("WIN", l.getVariant());
-        
-        l = parse("_GB");
-        Assert.assertEquals("", l.getLanguage());
-        Assert.assertEquals("GB", l.getCountry());
-        Assert.assertEquals("", l.getVariant());
-
-        l = parse("fr__MAC");
-        Assert.assertEquals("fr", l.getLanguage());
-        Assert.assertEquals("", l.getCountry());
-        Assert.assertEquals("MAC", l.getVariant());
-        
-        l = parse("de__POSIX");
-        Assert.assertEquals("de", l.getLanguage());
-        Assert.assertEquals("", l.getCountry());
-        Assert.assertEquals("POSIX", l.getVariant());
-    }
-    
-    
-    private Locale parse(String value){
-        
-        ScalarTypeLocale st = new ScalarTypeLocale();
-        return (Locale)st.parse(value);        
-    }
-}
+package com.avaje.tests.unitinternal;
+
+import java.util.Locale;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.avaje.ebeaninternal.server.type.ScalarTypeLocale;
+
+public class TestLocaleParse extends TestCase {
+
+    public void test() {
+     
+        //Examples: "en", "de_DE", "_GB", "en_US_WIN", "de__POSIX", "fr__MAC"
+        
+        Locale l = parse("en");
+        Assert.assertEquals("en", l.getLanguage());
+
+        l = parse("de_DE");
+        Assert.assertEquals("de", l.getLanguage());
+        Assert.assertEquals("DE", l.getCountry());
+
+        l = parse("en_US_WIN");
+        Assert.assertEquals("en", l.getLanguage());
+        Assert.assertEquals("US", l.getCountry());
+        Assert.assertEquals("WIN", l.getVariant());
+        
+        l = parse("_GB");
+        Assert.assertEquals("", l.getLanguage());
+        Assert.assertEquals("GB", l.getCountry());
+        Assert.assertEquals("", l.getVariant());
+
+        l = parse("fr__MAC");
+        Assert.assertEquals("fr", l.getLanguage());
+        Assert.assertEquals("", l.getCountry());
+        Assert.assertEquals("MAC", l.getVariant());
+        
+        l = parse("de__POSIX");
+        Assert.assertEquals("de", l.getLanguage());
+        Assert.assertEquals("", l.getCountry());
+        Assert.assertEquals("POSIX", l.getVariant());
+    }
+    
+    
+    private Locale parse(String value){
+        
+        ScalarTypeLocale st = new ScalarTypeLocale();
+        return (Locale)st.parse(value);        
+    }
+}

src/test/java/com/avaje/tests/xml/build/XbNode.java

@@ -6,11 +6,11 @@ import java.util.List;
 import java.util.Map;
 
 import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
+import com.avaje.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
 import com.avaje.ebeaninternal.server.deploy.BeanProperty;
 import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssoc;
 import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne;
-import com.avaje.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
 import com.avaje.ebeaninternal.server.el.ElPropertyValue;
 import com.avaje.tests.xml.oxm.OxmNode;
 import com.avaje.tests.xml.runtime.XoiAttribute;