diff --git a/src/test/java/com/avaje/ebean/BaseTestCase.java b/src/test/java/com/avaje/ebean/BaseTestCase.java index 6e0a5cc64..c85bd477a 100644 --- a/src/test/java/com/avaje/ebean/BaseTestCase.java +++ b/src/test/java/com/avaje/ebean/BaseTestCase.java @@ -10,12 +10,12 @@ import org.slf4j.LoggerFactory; import java.sql.Types; public class BaseTestCase { - + protected static Logger logger = LoggerFactory.getLogger(BaseTestCase.class); - + static { logger.debug("... preStart"); - if (!AgentLoader.loadAgentFromClasspath("ebean-agent","debug=1;packages=com.avaje.tests,org.avaje.test")) { + if (!AgentLoader.loadAgentFromClasspath("ebean-agent", "debug=1;packages=com.avaje.tests,org.avaje.test")) { logger.info("avaje-ebeanorm-agent not found in classpath - not dynamically loaded"); } } @@ -101,7 +101,7 @@ public class BaseTestCase { protected void loadCountryCache() { Ebean.find(Country.class) - .setLoadBeanCache(true) - .findList(); + .setLoadBeanCache(true) + .findList(); } } diff --git a/src/test/java/com/avaje/ebean/ColumnTest.java b/src/test/java/com/avaje/ebean/ColumnTest.java index d8c9f7d19..191b33b51 100644 --- a/src/test/java/com/avaje/ebean/ColumnTest.java +++ b/src/test/java/com/avaje/ebean/ColumnTest.java @@ -13,36 +13,37 @@ public class ColumnTest { @Test public void equals_when_same() { - assertSame(col(1, "name", null),col(1, "name", null)); + assertSame(col(1, "name", null), col(1, "name", null)); } @Test public void equals_when_same_withAlias() { - assertSame(col(1, "t0.name", "t0"),col(1, "t0.name", "t0")); + assertSame(col(1, "t0.name", "t0"), col(1, "t0.name", "t0")); } @Test public void equals_when_diffIndex() { - assertDifferent(col(1, "name", null),col(2, "name", null)); + assertDifferent(col(1, "name", null), col(2, "name", null)); } @Test public void equals_when_diffProperty() { - assertDifferent(col(1, "name", null),col(1, "diffName", null)); + assertDifferent(col(1, "name", null), col(1, "diffName", null)); } @Test public void equals_when_diffAlias() { - assertDifferent(col(1, "t1.name", "t1"),col(1, "t1.name", "t0")); + assertDifferent(col(1, "t1.name", "t1"), col(1, "t1.name", "t0")); } @Test public void equals_when_diffAliasNullLast() { - assertDifferent(col(1, "t1.name", "t1"),col(1, "t1.name", null)); + assertDifferent(col(1, "t1.name", "t1"), col(1, "t1.name", null)); } + @Test public void equals_when_diffAliasNullFirst() { - assertDifferent(col(1, "t1.name", null),col(1, "t1.name", "t1")); + assertDifferent(col(1, "t1.name", null), col(1, "t1.name", "t1")); } @@ -55,4 +56,4 @@ public class ColumnTest { assertThat(key).isNotEqualTo(key1); assertThat(key.hashCode()).isNotEqualTo(key1.hashCode()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/EbeanServer_eqlTest.java b/src/test/java/com/avaje/ebean/EbeanServer_eqlTest.java index 5113cd7c7..aa16871c9 100644 --- a/src/test/java/com/avaje/ebean/EbeanServer_eqlTest.java +++ b/src/test/java/com/avaje/ebean/EbeanServer_eqlTest.java @@ -97,8 +97,8 @@ public class EbeanServer_eqlTest extends BaseTestCase { ResetBasicData.reset(); Query query = server() - .createNamedQuery(Customer.class, "withContacts") - .setParameter("id", 1); + .createNamedQuery(Customer.class, "withContacts") + .setParameter("id", 1); query.setUseCache(false); query.findUnique(); @@ -112,12 +112,12 @@ public class EbeanServer_eqlTest extends BaseTestCase { ResetBasicData.reset(); Query query = server() - .createNamedQuery(Customer.class, "withContactsById") - .setParameter("id", 1); + .createNamedQuery(Customer.class, "withContactsById") + .setParameter("id", 1); query.setUseCache(false); query.findUnique(); assertThat(query.getGeneratedSql()).contains("from o_customer t0 left join contact t1 on t1.customer_id = t0.id "); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/EbeanServer_refresh.java b/src/test/java/com/avaje/ebean/EbeanServer_refresh.java index 19306f73d..d04eb0a05 100644 --- a/src/test/java/com/avaje/ebean/EbeanServer_refresh.java +++ b/src/test/java/com/avaje/ebean/EbeanServer_refresh.java @@ -2,7 +2,6 @@ package com.avaje.ebean; import com.avaje.tests.model.basic.EBasic; import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.OrderDetail; import com.avaje.tests.model.basic.ResetBasicData; import org.junit.Test; @@ -22,7 +21,7 @@ public class EbeanServer_refresh { server.save(basic); int rows = - server.update(EBasic.class) + server.update(EBasic.class) .set("status", EBasic.Status.ACTIVE) .where().idEq(basic.getId()) .update(); diff --git a/src/test/java/com/avaje/ebean/EbeanServer_saveAllTest.java b/src/test/java/com/avaje/ebean/EbeanServer_saveAllTest.java index 4bf49df0a..e08f91f08 100644 --- a/src/test/java/com/avaje/ebean/EbeanServer_saveAllTest.java +++ b/src/test/java/com/avaje/ebean/EbeanServer_saveAllTest.java @@ -29,7 +29,7 @@ public class EbeanServer_saveAllTest extends BaseTestCase { } for (EBasicVer someBean : someBeans) { - someBean.setName(someBean.getName()+"-mod"); + someBean.setName(someBean.getName() + "-mod"); } // act @@ -113,11 +113,10 @@ public class EbeanServer_saveAllTest extends BaseTestCase { } - private List beans(int count) { List beans = new ArrayList<>(); - for (int i = 0; i changedProps = beanState.getChangedProps(); Assert.assertEquals(1, changedProps.size()); Assert.assertTrue(changedProps.contains("name")); - + Map dirtyValues = beanState.getDirtyValues(); Assert.assertEquals(1, dirtyValues.size()); Assert.assertTrue(dirtyValues.keySet().contains("name")); - + ValuePair valuePair = dirtyValues.get("name"); Assert.assertNotNull(valuePair); - Assert.assertEquals("changedFoo",valuePair.getNewValue()); - Assert.assertEquals("foo",valuePair.getOldValue()); - + Assert.assertEquals("changedFoo", valuePair.getNewValue()); + Assert.assertEquals("foo", valuePair.getOldValue()); + Eembeddable embeddableRead = emain.getEmbeddable(); embeddableRead.setDescription("embChanged"); - + Set changedProps2 = beanState.getChangedProps(); Assert.assertEquals(2, changedProps2.size()); Assert.assertTrue(changedProps2.contains("name")); Assert.assertTrue(changedProps2.contains("embeddable.description")); - + Map dirtyValues2 = beanState.getDirtyValues(); Assert.assertEquals(2, dirtyValues2.size()); Assert.assertTrue(dirtyValues2.keySet().contains("name")); Assert.assertTrue(dirtyValues2.keySet().contains("embeddable.description")); - - ValuePair valuePair2 = dirtyValues2.get("embeddable.description"); - Assert.assertEquals("embChanged",valuePair2.getNewValue()); - Assert.assertEquals("bar",valuePair2.getOldValue()); - } + ValuePair valuePair2 = dirtyValues2.get("embeddable.description"); + Assert.assertEquals("embChanged", valuePair2.getNewValue()); + Assert.assertEquals("bar", valuePair2.getOldValue()); + } @Test public void testEmbeddedUpdateSetNewBean() { - + EMain emain = new EMain(); - EntityBean eb = (EntityBean)emain; + EntityBean eb = (EntityBean) emain; EntityBeanIntercept ebi = eb._ebean_getIntercept(); emain.setId(1); emain.setName("foo"); Eembeddable embeddable = setEmbeddedBean(emain, "bar"); setEmbeddedLoaded(embeddable); - + // sets loaded state so follow setters are deemed as changes to the bean ebi.setLoaded(); - + emain.setName("changedFoo"); Assert.assertSame(embeddable, emain.getEmbeddable()); @@ -90,48 +88,48 @@ public class TestDirtyProperties extends BaseTestCase { Eembeddable embeddable2 = setEmbeddedBean(emain, "changeEmbeddedInstance"); Assert.assertSame(embeddable2, emain.getEmbeddable()); Assert.assertNotSame(embeddable, emain.getEmbeddable()); - - + + DefaultBeanState beanState = new DefaultBeanState(eb); - + Set changedProps2 = beanState.getChangedProps(); Assert.assertEquals(2, changedProps2.size()); Assert.assertTrue(changedProps2.contains("name")); - + Assert.assertTrue("The whole bean instance has changed", changedProps2.contains("embeddable")); - + Map dirtyValues2 = beanState.getDirtyValues(); Assert.assertEquals(2, dirtyValues2.size()); Assert.assertTrue(dirtyValues2.keySet().contains("name")); Assert.assertTrue(dirtyValues2.keySet().contains("embeddable")); - - + + ValuePair valuePair2 = dirtyValues2.get("embeddable"); Assert.assertSame(embeddable2, valuePair2.getNewValue()); Assert.assertSame(embeddable, valuePair2.getOldValue()); - + } private void setEmbeddedLoaded(Eembeddable embeddable) { - ((EntityBean)embeddable)._ebean_getIntercept().setLoaded(); + ((EntityBean) embeddable)._ebean_getIntercept().setLoaded(); } - + private Eembeddable setEmbeddedBean(EMain emain, String description) { - + Eembeddable embeddable = new Eembeddable(); embeddable.setDescription(description); - + emain.setEmbeddable(embeddable); - - EntityBean owner = (EntityBean)emain; - EntityBeanIntercept ebi= owner._ebean_getIntercept(); - + + EntityBean owner = (EntityBean) emain; + EntityBeanIntercept ebi = owner._ebean_getIntercept(); + // hooks the embeddable bean back to the owner int embeddablePropertyIndex = ebi.findProperty("embeddable"); Assert.assertTrue(embeddablePropertyIndex > -1); - ((EntityBean)embeddable)._ebean_getIntercept().setEmbeddedOwner(owner, embeddablePropertyIndex); + ((EntityBean) embeddable)._ebean_getIntercept().setEmbeddedOwner(owner, embeddablePropertyIndex); return embeddable; } } diff --git a/src/test/java/com/avaje/ebean/TestFilterWithEnum.java b/src/test/java/com/avaje/ebean/TestFilterWithEnum.java index 252cfec2b..39881f4b9 100644 --- a/src/test/java/com/avaje/ebean/TestFilterWithEnum.java +++ b/src/test/java/com/avaje/ebean/TestFilterWithEnum.java @@ -1,12 +1,11 @@ package com.avaje.ebean; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestFilterWithEnum extends BaseTestCase { diff --git a/src/test/java/com/avaje/ebean/TestPropertyChangeListener.java b/src/test/java/com/avaje/ebean/TestPropertyChangeListener.java index d43b928c4..49c7a23e5 100644 --- a/src/test/java/com/avaje/ebean/TestPropertyChangeListener.java +++ b/src/test/java/com/avaje/ebean/TestPropertyChangeListener.java @@ -1,50 +1,49 @@ package com.avaje.ebean; +import com.avaje.tests.model.basic.Customer; +import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; -import org.junit.Assert; -import org.junit.Test; - -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; - public class TestPropertyChangeListener extends BaseTestCase { @Test public void test() { - + ResetBasicData.reset(); - + List list = Ebean.find(Customer.class).findList(); - + Listener listener = new Listener(); - + Customer customer = list.get(0); Ebean.getBeanState(customer).addPropertyChangeListener(listener); - + customer.setName("modName"); customer.setSmallnote("modSmallNote"); - + Assert.assertEquals(2, listener.events.size()); Assert.assertEquals("modName", listener.events.get(0).getNewValue()); Assert.assertEquals("name", listener.events.get(0).getPropertyName()); Assert.assertEquals("modSmallNote", listener.events.get(1).getNewValue()); Assert.assertEquals("smallnote", listener.events.get(1).getPropertyName()); - + } - + class Listener implements PropertyChangeListener { List events = new ArrayList<>(); - + @Override public void propertyChange(PropertyChangeEvent evt) { events.add(evt); } } - + } diff --git a/src/test/java/com/avaje/ebean/TestRawSqlBuilder.java b/src/test/java/com/avaje/ebean/TestRawSqlBuilder.java index 7b44f9592..01171720d 100644 --- a/src/test/java/com/avaje/ebean/TestRawSqlBuilder.java +++ b/src/test/java/com/avaje/ebean/TestRawSqlBuilder.java @@ -1,12 +1,11 @@ package com.avaje.ebean; +import com.avaje.ebean.RawSql.Sql; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; import com.avaje.tests.model.rawsql.ERawSqlAggBean; import org.junit.Test; -import com.avaje.ebean.RawSql.Sql; - import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -50,8 +49,8 @@ public class TestRawSqlBuilder extends BaseTestCase { RawSql rawSql = r.create(); Ebean.find(Customer.class) - .setRawSql(rawSql) - .findList(); + .setRawSql(rawSql) + .findList(); } @Test @@ -84,7 +83,7 @@ public class TestRawSqlBuilder extends BaseTestCase { assertEquals("id desc", sql.getOrderBy()); r = RawSqlBuilder - .parse("select id, sum(x) from t_cust where id > ? group by id order by id desc"); + .parse("select id, sum(x) from t_cust where id > ? group by id order by id desc"); sql = r.getSql(); assertEquals("id, sum(x)", sql.getPreFrom()); assertEquals("from t_cust where id > ?", sql.getPreWhere()); @@ -96,7 +95,7 @@ public class TestRawSqlBuilder extends BaseTestCase { public void testWithHaving() { RawSqlBuilder r = RawSqlBuilder - .parse("select id, sum(x) from t_cust where id > ? group by id having sum(x) > ? order by id desc"); + .parse("select id, sum(x) from t_cust where id > ? group by id having sum(x) > ? order by id desc"); Sql sql = r.getSql(); assertEquals("id, sum(x)", sql.getPreFrom()); assertEquals("from t_cust where id > ?", sql.getPreWhere()); @@ -106,7 +105,7 @@ public class TestRawSqlBuilder extends BaseTestCase { // no where r = RawSqlBuilder - .parse("select id, sum(x) from t_cust group by id having sum(x) > ? order by id desc"); + .parse("select id, sum(x) from t_cust group by id having sum(x) > ? order by id desc"); sql = r.getSql(); assertEquals("id, sum(x)", sql.getPreFrom()); assertEquals("from t_cust", sql.getPreWhere()); @@ -125,7 +124,7 @@ public class TestRawSqlBuilder extends BaseTestCase { // no order by r = RawSqlBuilder - .parse("select id, sum(x) from t_cust where id > ? group by id having sum(x) > ?"); + .parse("select id, sum(x) from t_cust where id > ? group by id having sum(x) > ?"); sql = r.getSql(); assertEquals("id, sum(x)", sql.getPreFrom()); assertEquals("from t_cust where id > ?", sql.getPreWhere()); @@ -140,7 +139,7 @@ public class TestRawSqlBuilder extends BaseTestCase { @Test public void testWithOrderSiblingsByName() { - String s = "SELECT ID, DESCRIPTION, NAME, PARENT_ID FROM SOME_TABLE WHERE lower(NAME) like :name START WITH ID = :parentId CONNECT BY PRIOR ID = PARENT_ID order siblings by NAME"; + String s = "SELECT ID, DESCRIPTION, NAME, PARENT_ID FROM SOME_TABLE WHERE lower(NAME) like :name START WITH ID = :parentId CONNECT BY PRIOR ID = PARENT_ID order siblings by NAME"; RawSql rawSql = RawSqlBuilder.parse(s).create(); @@ -153,24 +152,23 @@ public class TestRawSqlBuilder extends BaseTestCase { } - @Test public void testWithAlias() { - String rs = "select o.id, o.status, c.id, c.name, "+ - " d.id, d.order_qty, p.id, p.name " + - "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 " + - "join o_product p on p.id = d.product_id " + - "where o.id <= :maxOrderId and p.id = :productId "+ - "order by o.id, d.id asc"; + String rs = "select o.id, o.status, c.id, c.name, " + + " d.id, d.order_qty, p.id, p.name " + + "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 " + + "join o_product p on p.id = d.product_id " + + "where o.id <= :maxOrderId and p.id = :productId " + + "order by o.id, d.id asc"; RawSql rawSql = RawSqlBuilder.parse(rs) - .tableAliasMapping("c", "customer") - .tableAliasMapping("d", "details") - .tableAliasMapping("p", "details.product") - .create(); + .tableAliasMapping("c", "customer") + .tableAliasMapping("d", "details") + .tableAliasMapping("p", "details.product") + .create(); RawSql.ColumnMapping columnMapping = rawSql.getColumnMapping(); assertEquals(0, columnMapping.getIndexPosition("id")); @@ -187,12 +185,12 @@ public class TestRawSqlBuilder extends BaseTestCase { @Test public void testWithCoalesceFunction() { - String rs = "select id, coalesce(status,'E') as status, "+ - " budgets.amount as budget," + - " COALESCE(month_sums.sum,0.0) as transaction_sum, " + - " COALESCE(month_balances.balance,0.0) as balance, " + - " COALESCE(month_sums.end_date,date_trunc('month',budgets.month),month_balances.end_date) as data_month"+ - " from o_order order by id asc"; + String rs = "select id, coalesce(status,'E') as status, " + + " budgets.amount as budget," + + " COALESCE(month_sums.sum,0.0) as transaction_sum, " + + " COALESCE(month_balances.balance,0.0) as balance, " + + " COALESCE(month_sums.end_date,date_trunc('month',budgets.month),month_balances.end_date) as data_month" + + " from o_order order by id asc"; RawSqlBuilder builder = RawSqlBuilder.parse(rs); @@ -217,11 +215,11 @@ public class TestRawSqlBuilder extends BaseTestCase { ResetBasicData.reset(); String sql = "select DATE_TRUNC('DAY', d.order_date) as day," + - " count(*) as total," + - " sum(case when d.status = 0 then 2 else 3 end) as scheduled," + - " sum(case when d.status = 1 then 1 else 0 end) as completed" + - " from o_order d" + - " group by DATE_TRUNC('DAY', d.order_date)"; + " count(*) as total," + + " sum(case when d.status = 0 then 2 else 3 end) as scheduled," + + " sum(case when d.status = 1 then 1 else 0 end) as completed" + + " from o_order d" + + " group by DATE_TRUNC('DAY', d.order_date)"; RawSql rawSql = RawSqlBuilder.parse(sql).create(); @@ -233,9 +231,9 @@ public class TestRawSqlBuilder extends BaseTestCase { assertEquals(3, columnMapping.getIndexPosition("completed")); Query query = Ebean.find(ERawSqlAggBean.class) - .setRawSql(rawSql) - .having().gt("total", 2) - .query(); + .setRawSql(rawSql) + .having().gt("total", 2) + .query(); query.findList(); diff --git a/src/test/java/com/avaje/ebean/TestRawSqlBuilderDistinct.java b/src/test/java/com/avaje/ebean/TestRawSqlBuilderDistinct.java index 93ec4ed87..292e41050 100644 --- a/src/test/java/com/avaje/ebean/TestRawSqlBuilderDistinct.java +++ b/src/test/java/com/avaje/ebean/TestRawSqlBuilderDistinct.java @@ -1,10 +1,8 @@ package com.avaje.ebean; -import junit.framework.TestCase; - -import org.junit.Assert; - import com.avaje.ebean.RawSql.Sql; +import junit.framework.TestCase; +import org.junit.Assert; public class TestRawSqlBuilderDistinct extends TestCase { diff --git a/src/test/java/com/avaje/ebean/TestRawSqlColumnParsing.java b/src/test/java/com/avaje/ebean/TestRawSqlColumnParsing.java index 51f89e364..a7824456e 100644 --- a/src/test/java/com/avaje/ebean/TestRawSqlColumnParsing.java +++ b/src/test/java/com/avaje/ebean/TestRawSqlColumnParsing.java @@ -1,164 +1,163 @@ 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; +import junit.framework.TestCase; + +import java.util.Map; public class TestRawSqlColumnParsing extends TestCase { - public void test_simple() { - - ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a,b,c"); - Map mapping = columnMapping.mapping(); - Column c = mapping.get("a"); - - assertEquals("a",c.getDbColumn()); - assertEquals(0, c.getIndexPos()); - assertEquals("a",c.getPropertyName()); + public void test_simple() { - c = mapping.get("b"); - assertEquals("b",c.getDbColumn()); - assertEquals(1, c.getIndexPos()); - assertEquals("b",c.getPropertyName()); + ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a,b,c"); + Map mapping = columnMapping.mapping(); + Column c = mapping.get("a"); - c = mapping.get("c"); - assertEquals("c",c.getDbColumn()); - assertEquals(2, c.getIndexPos()); - assertEquals("c",c.getPropertyName()); + 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()); - public void test_simpleWithSpacing() { - - ColumnMapping columnMapping = DRawSqlColumnsParser.parse(" a , b , c "); - Map mapping = columnMapping.mapping(); - Column c = mapping.get("a"); - - assertEquals("a",c.getDbColumn()); - assertEquals(0, c.getIndexPos()); - assertEquals("a", c.getPropertyName()); + c = mapping.get("c"); + assertEquals("c", c.getDbColumn()); + assertEquals(2, c.getIndexPos()); + assertEquals("c", 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() { - } - - public void test_withAlias() { - - ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a a0,b b1, c c2 , d d3 , e e4 "); - Map mapping = columnMapping.mapping(); - - assertEquals(5, mapping.size()); - - Column c = mapping.get("a0"); - - assertEquals("a",c.getDbColumn()); - assertEquals(0, c.getIndexPos()); - assertEquals("a0",c.getPropertyName()); + ColumnMapping columnMapping = DRawSqlColumnsParser.parse(" a , b , c "); + Map mapping = columnMapping.mapping(); + Column c = mapping.get("a"); - c = mapping.get("b1"); - assertEquals("b",c.getDbColumn()); - assertEquals(1, c.getIndexPos()); - assertEquals("b1",c.getPropertyName()); + assertEquals("a", c.getDbColumn()); + assertEquals(0, c.getIndexPos()); + assertEquals("a", c.getPropertyName()); - c = mapping.get("c2"); - assertEquals("c",c.getDbColumn()); - assertEquals(2, c.getIndexPos()); - assertEquals("c2",c.getPropertyName()); + c = mapping.get("b"); + assertEquals("b", c.getDbColumn()); + assertEquals(1, c.getIndexPos()); + assertEquals("b", c.getPropertyName()); - c = mapping.get("d3"); - assertEquals("d",c.getDbColumn()); - assertEquals(3, c.getIndexPos()); - assertEquals("d3",c.getPropertyName()); + c = mapping.get("c"); + assertEquals("c", c.getDbColumn()); + assertEquals(2, c.getIndexPos()); + assertEquals("c", c.getPropertyName()); - - c = mapping.get("e4"); - assertEquals("e",c.getDbColumn()); - assertEquals(4, c.getIndexPos()); - assertEquals("e4",c.getPropertyName()); + } - } + public void test_withAlias() { - public void test_withDatabaseFunction() { + ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a a0,b b1, c c2 , d d3 , e e4 "); + Map mapping = columnMapping.mapping(); - ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a a0,b b1, MONTH(MAKEDATE(2015, 241)) m2 , d d3 , e e4 "); - Map mapping = columnMapping.mapping(); + assertEquals(5, mapping.size()); - assertEquals(5, mapping.size()); + Column c = mapping.get("a0"); - Column c = mapping.get("a0"); + assertEquals("a", c.getDbColumn()); + assertEquals(0, c.getIndexPos()); + assertEquals("a0", c.getPropertyName()); - assertEquals("a",c.getDbColumn()); - assertEquals(0, c.getIndexPos()); - assertEquals("a0",c.getPropertyName()); + c = mapping.get("b1"); + assertEquals("b", c.getDbColumn()); + assertEquals(1, c.getIndexPos()); + assertEquals("b1", c.getPropertyName()); - c = mapping.get("b1"); - assertEquals("b",c.getDbColumn()); - assertEquals(1, c.getIndexPos()); - assertEquals("b1",c.getPropertyName()); + c = mapping.get("c2"); + assertEquals("c", c.getDbColumn()); + assertEquals(2, c.getIndexPos()); + assertEquals("c2", c.getPropertyName()); - c = mapping.get("m2"); - assertEquals("MONTH(MAKEDATE(2015, 241))",c.getDbColumn()); - assertEquals(2, c.getIndexPos()); - assertEquals("m2",c.getPropertyName()); - - c = mapping.get("d3"); - assertEquals("d",c.getDbColumn()); - assertEquals(3, c.getIndexPos()); - assertEquals("d3",c.getPropertyName()); + c = mapping.get("d3"); + assertEquals("d", c.getDbColumn()); + assertEquals(3, c.getIndexPos()); + assertEquals("d3", c.getPropertyName()); - c = mapping.get("e4"); - assertEquals("e",c.getDbColumn()); - assertEquals(4, c.getIndexPos()); - assertEquals("e4",c.getPropertyName()); + c = mapping.get("e4"); + 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 mapping = columnMapping.mapping(); - - assertEquals(5, mapping.size()); - - Column c = mapping.get("a0"); - - assertEquals("a",c.getDbColumn()); - assertEquals(0, c.getIndexPos()); - assertEquals("a0",c.getPropertyName()); + public void test_withDatabaseFunction() { - c = mapping.get("b1"); - assertEquals("'b'",c.getDbColumn()); - assertEquals(1, c.getIndexPos()); - assertEquals("b1",c.getPropertyName()); + ColumnMapping columnMapping = DRawSqlColumnsParser.parse("a a0,b b1, MONTH(MAKEDATE(2015, 241)) m2 , d d3 , e e4 "); + Map mapping = columnMapping.mapping(); - c = mapping.get("c2"); - assertEquals("\"c(blah)\"",c.getDbColumn()); - assertEquals(2, c.getIndexPos()); - assertEquals("c2",c.getPropertyName()); + assertEquals(5, mapping.size()); - c = mapping.get("d3"); - assertEquals("d",c.getDbColumn()); - assertEquals(3, c.getIndexPos()); - assertEquals("d3",c.getPropertyName()); + Column c = mapping.get("a0"); - - c = mapping.get("e4"); - assertEquals("e",c.getDbColumn()); - assertEquals(4, c.getIndexPos()); - assertEquals("e4",c.getPropertyName()); + assertEquals("a", c.getDbColumn()); + assertEquals(0, c.getIndexPos()); + assertEquals("a0", c.getPropertyName()); - } + c = mapping.get("b1"); + assertEquals("b", c.getDbColumn()); + assertEquals(1, c.getIndexPos()); + assertEquals("b1", c.getPropertyName()); + + c = mapping.get("m2"); + assertEquals("MONTH(MAKEDATE(2015, 241))", c.getDbColumn()); + assertEquals(2, c.getIndexPos()); + assertEquals("m2", c.getPropertyName()); + + c = mapping.get("d3"); + assertEquals("d", c.getDbColumn()); + assertEquals(3, c.getIndexPos()); + assertEquals("d3", c.getPropertyName()); + + + c = mapping.get("e4"); + 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 mapping = columnMapping.mapping(); + + assertEquals(5, mapping.size()); + + Column c = mapping.get("a0"); + + assertEquals("a", c.getDbColumn()); + assertEquals(0, c.getIndexPos()); + assertEquals("a0", c.getPropertyName()); + + c = mapping.get("b1"); + assertEquals("'b'", c.getDbColumn()); + assertEquals(1, c.getIndexPos()); + assertEquals("b1", c.getPropertyName()); + + c = mapping.get("c2"); + assertEquals("\"c(blah)\"", c.getDbColumn()); + assertEquals(2, c.getIndexPos()); + assertEquals("c2", c.getPropertyName()); + + c = mapping.get("d3"); + assertEquals("d", c.getDbColumn()); + assertEquals(3, c.getIndexPos()); + assertEquals("d3", c.getPropertyName()); + + + c = mapping.get("e4"); + assertEquals("e", c.getDbColumn()); + assertEquals(4, c.getIndexPos()); + assertEquals("e4", c.getPropertyName()); + + } } diff --git a/src/test/java/com/avaje/ebean/TestUnsetLoadedProperties.java b/src/test/java/com/avaje/ebean/TestUnsetLoadedProperties.java index fa6937e69..50d055848 100644 --- a/src/test/java/com/avaje/ebean/TestUnsetLoadedProperties.java +++ b/src/test/java/com/avaje/ebean/TestUnsetLoadedProperties.java @@ -57,7 +57,7 @@ public class TestUnsetLoadedProperties extends BaseTestCase { assertThat(beanState.getLoadedProps()).containsExactly("id", "name", "email"); // unset the loaded state for email - ((EntityBean)user)._ebean_getIntercept().setPropertyLoaded("email", false); + ((EntityBean) user)._ebean_getIntercept().setPropertyLoaded("email", false); assertThat(beanState.getLoadedProps()).containsExactly("id", "name"); } diff --git a/src/test/java/com/avaje/ebean/TextExpressionListTest.java b/src/test/java/com/avaje/ebean/TextExpressionListTest.java index d13c0df39..50d096b46 100644 --- a/src/test/java/com/avaje/ebean/TextExpressionListTest.java +++ b/src/test/java/com/avaje/ebean/TextExpressionListTest.java @@ -12,51 +12,51 @@ public class TextExpressionListTest { public void syntax() { Ebean.find(Order.class) - .text().match("name", "rob"); + .text().match("name", "rob"); Ebean.find(Order.class) - .text().should() - .match("name", "rob") - .match("note", "war and peace"); + .text().should() + .match("name", "rob") + .match("note", "war and peace"); Ebean.find(Order.class) - .text() - .should() - .match("title", "war and peace") - .match("author", "leo tolstoy") - .should() - .match("translator", "Constance Garnett") - .match("translator", "Louise Maude"); + .text() + .should() + .match("title", "war and peace") + .match("author", "leo tolstoy") + .should() + .match("translator", "Constance Garnett") + .match("translator", "Louise Maude"); Ebean.find(Order.class) - .text() - .should() - .match("title", "war and peace") - .match("author", "leo tolstoy") - .should() - .match("translator", "Constance Garnett", new Match().opAnd().boost(2).minShouldMatch("75%")) - .match("translator", "Louise Maude") - .where() - .gt("reviewDate", 12345); + .text() + .should() + .match("title", "war and peace") + .match("author", "leo tolstoy") + .should() + .match("translator", "Constance Garnett", new Match().opAnd().boost(2).minShouldMatch("75%")) + .match("translator", "Louise Maude") + .where() + .gt("reviewDate", 12345); Ebean.find(Order.class) - .text() - .must() - .match("title", "quick") - .endJunction() - .should() - .match("title", "brown") - .match("title", "dog") - .endJunction() - .mustNot() - .match("title", "lazy") - .endJunction() - .where() - .gt("reviewDate", 12345); + .text() + .must() + .match("title", "quick") + .endJunction() + .should() + .match("title", "brown") + .match("title", "dog") + .endJunction() + .mustNot() + .match("title", "lazy") + .endJunction() + .where() + .gt("reviewDate", 12345); } @@ -65,16 +65,16 @@ public class TextExpressionListTest { public void syntax_multiMatch() { Ebean.find(Order.class) - .text() - .multiMatch("Will Smith", "title", "*name"); + .text() + .multiMatch("Will Smith", "title", "*name"); MultiMatch match = MultiMatch.fields("title", "*name") - .opAnd() - .type(MultiMatch.Type.PHRASE_PREFIX); + .opAnd() + .type(MultiMatch.Type.PHRASE_PREFIX); Ebean.find(Order.class) - .text() - .multiMatch("Will Smith", match); + .text() + .multiMatch("Will Smith", match); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/TxScopeTest.java b/src/test/java/com/avaje/ebean/TxScopeTest.java index 5c3a4245b..046c5b1e9 100644 --- a/src/test/java/com/avaje/ebean/TxScopeTest.java +++ b/src/test/java/com/avaje/ebean/TxScopeTest.java @@ -3,7 +3,8 @@ package com.avaje.ebean; import com.avaje.ebean.config.PersistBatch; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; public class TxScopeTest { @@ -64,4 +65,4 @@ public class TxScopeTest { assertNull(scope.getBatch()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/UpdateQueryTest.java b/src/test/java/com/avaje/ebean/UpdateQueryTest.java index 4f52d1866..74cb6f878 100644 --- a/src/test/java/com/avaje/ebean/UpdateQueryTest.java +++ b/src/test/java/com/avaje/ebean/UpdateQueryTest.java @@ -17,12 +17,12 @@ public class UpdateQueryTest extends BaseTestCase { EbeanServer server = server(); UpdateQuery update = server.update(Customer.class); Query query = update - .set("status", Customer.Status.ACTIVE) - .set("updtime", new Timestamp(System.currentTimeMillis())) - .where() - .eq("status", Customer.Status.NEW) - .gt("id", 1000) - .query(); + .set("status", Customer.Status.ACTIVE) + .set("updtime", new Timestamp(System.currentTimeMillis())) + .where() + .eq("status", Customer.Status.NEW) + .gt("id", 1000) + .query(); query.update(); @@ -42,14 +42,14 @@ public class UpdateQueryTest extends BaseTestCase { UpdateQuery update = server.update(Customer.class); Query query = update - .set("status", Customer.Status.ACTIVE) - .set("updtime", new Timestamp(System.currentTimeMillis())) - .where() - .eq("status", Customer.Status.NEW) - .eq("billingAddress.country", nz) - //.isEmpty("contacts") - .gt("id", 1000) - .query(); + .set("status", Customer.Status.ACTIVE) + .set("updtime", new Timestamp(System.currentTimeMillis())) + .where() + .eq("status", Customer.Status.NEW) + .eq("billingAddress.country", nz) + //.isEmpty("contacts") + .gt("id", 1000) + .query(); query.update(); @@ -62,12 +62,12 @@ public class UpdateQueryTest extends BaseTestCase { EbeanServer server = server(); Query updateQuery = server - .update(Customer.class) - .set("status", Customer.Status.ACTIVE) - .where() - .isEmpty("contacts") - .gt("id", 1000) - .query(); + .update(Customer.class) + .set("status", Customer.Status.ACTIVE) + .where() + .isEmpty("contacts") + .gt("id", 1000) + .query(); updateQuery.update(); @@ -80,11 +80,11 @@ public class UpdateQueryTest extends BaseTestCase { EbeanServer server = server(); Query updateQuery = server - .update(Customer.class) - .setNull("status") - .where() - .gt("id", 1000) - .query(); + .update(Customer.class) + .setNull("status") + .where() + .gt("id", 1000) + .query(); updateQuery.update(); @@ -97,11 +97,11 @@ public class UpdateQueryTest extends BaseTestCase { EbeanServer server = server(); Query updateQuery = server - .update(Customer.class) - .set("status", null) - .where() - .gt("id", 1000) - .query(); + .update(Customer.class) + .set("status", null) + .where() + .gt("id", 1000) + .query(); updateQuery.update(); @@ -114,11 +114,11 @@ public class UpdateQueryTest extends BaseTestCase { EbeanServer server = server(); Query updateQuery = server - .update(Customer.class) - .setRaw("status = coalesce(status, 'A')") - .where() - .gt("id", 1000) - .query(); + .update(Customer.class) + .setRaw("status = coalesce(status, 'A')") + .where() + .gt("id", 1000) + .query(); updateQuery.update(); @@ -131,11 +131,11 @@ public class UpdateQueryTest extends BaseTestCase { EbeanServer server = server(); Query updateQuery = server - .update(Customer.class) - .setRaw("status = coalesce(status, ?)", Customer.Status.ACTIVE) - .where() - .gt("id", 1000) - .query(); + .update(Customer.class) + .setRaw("status = coalesce(status, ?)", Customer.Status.ACTIVE) + .where() + .gt("id", 1000) + .query(); updateQuery.update(); @@ -148,11 +148,11 @@ public class UpdateQueryTest extends BaseTestCase { EbeanServer server = server(); int rows = server - .update(Customer.class) - .setRaw("status = coalesce(status, ?)", Customer.Status.ACTIVE) - .where() - .gt("id", 10000) - .update(); + .update(Customer.class) + .setRaw("status = coalesce(status, ?)", Customer.Status.ACTIVE) + .where() + .gt("id", 10000) + .update(); assertThat(rows).isEqualTo(0); } @@ -161,11 +161,11 @@ public class UpdateQueryTest extends BaseTestCase { public void useViaEbean() { int rows = Ebean.update(Customer.class) - .setRaw("status = coalesce(status, ?)", Customer.Status.ACTIVE) - .where() - .gt("id", 10000) - .update(); + .setRaw("status = coalesce(status, ?)", Customer.Status.ACTIVE) + .where() + .gt("id", 10000) + .update(); assertThat(rows).isEqualTo(0); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/bean/EntityBeanInterceptTest.java b/src/test/java/com/avaje/ebean/bean/EntityBeanInterceptTest.java index c4db21e0b..16fb3b063 100644 --- a/src/test/java/com/avaje/ebean/bean/EntityBeanInterceptTest.java +++ b/src/test/java/com/avaje/ebean/bean/EntityBeanInterceptTest.java @@ -32,7 +32,7 @@ public class EntityBeanInterceptTest extends BaseTestCase { Customer customer = list.get(0); - EntityBeanIntercept ebi = ((EntityBean)customer)._ebean_getIntercept(); + EntityBeanIntercept ebi = ((EntityBean) customer)._ebean_getIntercept(); assertFalse(ebi.hasDirtyProperty(propertyNames)); @@ -76,4 +76,4 @@ public class EntityBeanInterceptTest extends BaseTestCase { assertThat(ebi.isPartial()).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/common/BeanListTest.java b/src/test/java/com/avaje/ebean/common/BeanListTest.java index 6dca3d9ec..cd7225b3b 100644 --- a/src/test/java/com/avaje/ebean/common/BeanListTest.java +++ b/src/test/java/com/avaje/ebean/common/BeanListTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import java.util.ArrayList; import java.util.List; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; public class BeanListTest { @@ -270,7 +270,7 @@ public class BeanListTest { return true; } if (other instanceof SomeBean) { - return this.val.equals(((SomeBean)other).val); + return this.val.equals(((SomeBean) other).val); } else { return false; } diff --git a/src/test/java/com/avaje/ebean/common/BeanMapTest.java b/src/test/java/com/avaje/ebean/common/BeanMapTest.java index a5683bab8..c10195ccc 100644 --- a/src/test/java/com/avaje/ebean/common/BeanMapTest.java +++ b/src/test/java/com/avaje/ebean/common/BeanMapTest.java @@ -36,7 +36,7 @@ public class BeanMapTest { @Test public void testAdd() throws Exception { - BeanMap map = new BeanMap<>(); + BeanMap map = new BeanMap<>(); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); map.put("1", object1); map.put("4", null); @@ -59,7 +59,7 @@ public class BeanMapTest { @Test public void testAddAll_given_emptyStart() throws Exception { - BeanMap set = new BeanMap<>(); + BeanMap set = new BeanMap<>(); set.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -72,7 +72,7 @@ public class BeanMapTest { @Test public void testAdd_given_someAlreadyIn() throws Exception { - BeanMap map = new BeanMap<>(some()); + BeanMap map = new BeanMap<>(some()); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -88,7 +88,7 @@ public class BeanMapTest { @Test public void testAddSome_given_someAlreadyIn() throws Exception { - BeanMap map = new BeanMap<>(some()); + BeanMap map = new BeanMap<>(some()); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -101,7 +101,7 @@ public class BeanMapTest { @Test public void testRemove_given_beansInAdditions() throws Exception { - BeanMap map = new BeanMap<>(); + BeanMap map = new BeanMap<>(); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); map.putAll(all()); assertThat(map.getModifyAdditions()).containsExactly(object1, object2, object3); @@ -117,7 +117,7 @@ public class BeanMapTest { @Test public void testRemoveAll_given_beansInAdditions() throws Exception { - BeanMap map = new BeanMap<>(); + BeanMap map = new BeanMap<>(); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); map.putAll(all()); assertThat(map.getModifyAdditions()).containsExactly(object1, object2, object3); @@ -133,7 +133,7 @@ public class BeanMapTest { @Test public void testRemove_given_beansNotInAdditions() throws Exception { - BeanMap map = new BeanMap<>(all()); + BeanMap map = new BeanMap<>(all()); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -148,7 +148,7 @@ public class BeanMapTest { @Test public void testRemoveAll_given_beansNotInAdditions() throws Exception { - BeanMap map = new BeanMap<>(all()); + BeanMap map = new BeanMap<>(all()); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -163,7 +163,7 @@ public class BeanMapTest { @Test public void testClear() throws Exception { - BeanMap map = new BeanMap<>(all()); + BeanMap map = new BeanMap<>(all()); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); // act @@ -177,8 +177,8 @@ public class BeanMapTest { @Test public void testClear_given_someBeansInAdditions() throws Exception { - BeanMap map = new BeanMap<>(); - map.put("1",object1); + BeanMap map = new BeanMap<>(); + map.put("1", object1); map.setModifyListening(BeanCollection.ModifyListenMode.ALL); map.put("2", object2); map.put("3", object3); @@ -191,4 +191,4 @@ public class BeanMapTest { assertThat(map.getModifyAdditions()).isEmpty(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/config/DbMigrationConfigTest.java b/src/test/java/com/avaje/ebean/config/DbMigrationConfigTest.java index e86f92be3..b99c28fa9 100644 --- a/src/test/java/com/avaje/ebean/config/DbMigrationConfigTest.java +++ b/src/test/java/com/avaje/ebean/config/DbMigrationConfigTest.java @@ -2,7 +2,7 @@ package com.avaje.ebean.config; import org.junit.Test; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; public class DbMigrationConfigTest { @@ -20,4 +20,4 @@ public class DbMigrationConfigTest { assertThat(migrationConfig.getMigrationPath()).isEqualTo("dbmigration/myapp"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/config/PropertiesWrapperTest.java b/src/test/java/com/avaje/ebean/config/PropertiesWrapperTest.java index 6337548ac..c1ad49dc6 100644 --- a/src/test/java/com/avaje/ebean/config/PropertiesWrapperTest.java +++ b/src/test/java/com/avaje/ebean/config/PropertiesWrapperTest.java @@ -21,7 +21,7 @@ public class PropertiesWrapperTest { public void testGetEnum() { Properties properties = new Properties(); - properties.put("platform","postgres"); + properties.put("platform", "postgres"); PropertiesWrapper pw = new PropertiesWrapper("pref", "myserver", properties); assertEquals(Platform.POSTGRES, pw.getEnum(Platform.class, "platform", Platform.H2)); @@ -33,17 +33,17 @@ public class PropertiesWrapperTest { public void testTrimPropertyValues() { Properties properties = new Properties(); - properties.put("someBasic"," hello "); - properties.put("someInt"," 42 "); - properties.put("noTrimReqr","jim"); - properties.put("includeSpaces"," jim bob "); + properties.put("someBasic", " hello "); + properties.put("someInt", " 42 "); + properties.put("noTrimReqr", "jim"); + properties.put("includeSpaces", " jim bob "); PropertiesWrapper pw = new PropertiesWrapper("pref", "myserver", properties); - assertEquals("hello",pw.get("someBasic")); + assertEquals("hello", pw.get("someBasic")); assertEquals(42, pw.getInt("someInt", 1)); assertNull(pw.get("doesNotExist", null)); - assertEquals("jim",pw.get("noTrimReqr")); - assertEquals("jim bob",pw.get("includeSpaces")); + assertEquals("jim", pw.get("noTrimReqr")); + assertEquals("jim bob", pw.get("includeSpaces")); } @Test @@ -53,9 +53,9 @@ public class PropertiesWrapperTest { String tmpDir = System.getProperty("java.io.tmpdir"); Properties properties = new Properties(); - properties.put("someBasic","hello"); - properties.put("someInt","42"); - properties.put("someDouble","5.5"); + properties.put("someBasic", "hello"); + properties.put("someInt", "42"); + properties.put("someDouble", "5.5"); properties.put("somePath", "${HOME}/hello"); properties.put("someSystemProp", "/aaa/${java.io.tmpdir}/bbb"); @@ -63,28 +63,28 @@ public class PropertiesWrapperTest { assertEquals(42, pw.getInt("someInt", 99)); assertEquals(Double.valueOf(5.5D), (Double.valueOf(pw.getDouble("someDouble", 99.9D)))); - assertEquals(home+"/hello", pw.get("somePath", null)); - assertEquals(tmpDir, "/aaa/"+tmpDir+"/bbb", pw.get("someSystemProp")); + assertEquals(home + "/hello", pw.get("somePath", null)); + assertEquals(tmpDir, "/aaa/" + tmpDir + "/bbb", pw.get("someSystemProp")); Properties properties1 = pw.asPropertiesLowerCase(); assertEquals("hello", properties1.getProperty("somebasic")); assertEquals("42", properties1.getProperty("someint")); - assertEquals(home+"/hello", properties1.get("somepath")); - assertEquals(tmpDir, "/aaa/"+tmpDir+"/bbb", properties1.get("somesystemprop")); + assertEquals(home + "/hello", properties1.get("somepath")); + assertEquals(tmpDir, "/aaa/" + tmpDir + "/bbb", properties1.get("somesystemprop")); pw = new PropertiesWrapper(properties); assertEquals(42, pw.getInt("someInt", 99)); assertEquals(Double.valueOf(5.5D), (Double.valueOf(pw.getDouble("someDouble", 99.9D)))); - assertEquals(home+"/hello", pw.get("somePath", null)); - assertEquals(tmpDir, "/aaa/"+tmpDir+"/bbb", pw.get("someSystemProp")); + assertEquals(home + "/hello", pw.get("somePath", null)); + assertEquals(tmpDir, "/aaa/" + tmpDir + "/bbb", pw.get("someSystemProp")); properties1 = pw.asPropertiesLowerCase(); assertEquals("hello", properties1.getProperty("somebasic")); assertEquals("42", properties1.getProperty("someint")); - assertEquals(home+"/hello", properties1.get("somepath")); - assertEquals(tmpDir, "/aaa/"+tmpDir+"/bbb", properties1.get("somesystemprop")); + assertEquals(home + "/hello", properties1.get("somepath")); + assertEquals(tmpDir, "/aaa/" + tmpDir + "/bbb", properties1.get("somesystemprop")); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/config/ServerConfigTest.java b/src/test/java/com/avaje/ebean/config/ServerConfigTest.java index 9b95de0e7..63435d9f5 100644 --- a/src/test/java/com/avaje/ebean/config/ServerConfigTest.java +++ b/src/test/java/com/avaje/ebean/config/ServerConfigTest.java @@ -28,7 +28,7 @@ public class ServerConfigTest { Properties props = new Properties(); props.setProperty("persistBatch", "INSERT"); props.setProperty("persistBatchOnCascade", "INSERT"); - props.setProperty("dbuuid","binary"); + props.setProperty("dbuuid", "binary"); props.setProperty("jdbcFetchSizeFindEach", "42"); props.setProperty("jdbcFetchSizeFindList", "43"); props.setProperty("backgroundExecutorShutdownSecs", "98"); diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java b/src/test/java/com/avaje/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java index b61391bb1..413f48b6c 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java +++ b/src/test/java/com/avaje/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java @@ -13,7 +13,7 @@ public class BasicSqlLimitOffsetTest { String query = "select * from mytab order by id"; String sql = limiter.limit(query, 0, 10); - assertThat(sql).isEqualTo(query+" limit 10"); + assertThat(sql).isEqualTo(query + " limit 10"); } @Test @@ -21,7 +21,7 @@ public class BasicSqlLimitOffsetTest { String query = "select * from mytab order by id"; String sql = limiter.limit(query, 5, 10); - assertThat(sql).isEqualTo(query+" limit 10 offset 5"); + assertThat(sql).isEqualTo(query + " limit 10 offset 5"); } @Test @@ -31,4 +31,4 @@ public class BasicSqlLimitOffsetTest { String sql = limiter.limit(query, 0, 0); assertThat(sql).isEqualTo(query); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java b/src/test/java/com/avaje/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java index e1723b1ab..66298d7c3 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java +++ b/src/test/java/com/avaje/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java @@ -13,7 +13,7 @@ public class BasicSqlStandardLimiterTest { String query = "select * from mytab order by id"; String sql = limiter.limit(query, 0, 10); - assertThat(sql).isEqualTo(query+" fetch next 10 rows only"); + assertThat(sql).isEqualTo(query + " fetch next 10 rows only"); } @Test @@ -21,7 +21,7 @@ public class BasicSqlStandardLimiterTest { String query = "select * from mytab order by id"; String sql = limiter.limit(query, 5, 10); - assertThat(sql).isEqualTo(query+" offset 5 rows fetch next 10 rows only"); + assertThat(sql).isEqualTo(query + " offset 5 rows fetch next 10 rows only"); } @Test @@ -32,4 +32,4 @@ public class BasicSqlStandardLimiterTest { assertThat(sql).isEqualTo(query); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeLookupTest.java b/src/test/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeLookupTest.java index fd306c2be..a20752ebc 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeLookupTest.java +++ b/src/test/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeLookupTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import java.sql.Types; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class DbPlatformTypeLookupTest { @@ -50,4 +50,4 @@ public class DbPlatformTypeLookupTest { assertEquals(lookup.byId(ExtraDbTypes.JSONVarchar), DbType.JSONVARCHAR); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeParserTest.java b/src/test/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeParserTest.java index 45e5ceb18..66e3d60c2 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeParserTest.java +++ b/src/test/java/com/avaje/ebean/config/dbplatform/DbPlatformTypeParserTest.java @@ -2,7 +2,7 @@ package com.avaje.ebean.config.dbplatform; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class DbPlatformTypeParserTest { @@ -64,4 +64,4 @@ public class DbPlatformTypeParserTest { assertEquals(type.getDefaultScale(), 0); assertEquals(type.renderType(0, 0), "something(asd"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/DbTypeMapTest.java b/src/test/java/com/avaje/ebean/config/dbplatform/DbTypeMapTest.java index cb5e6598f..be909c483 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/DbTypeMapTest.java +++ b/src/test/java/com/avaje/ebean/config/dbplatform/DbTypeMapTest.java @@ -2,7 +2,7 @@ package com.avaje.ebean.config.dbplatform; import org.junit.Test; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; public class DbTypeMapTest { @@ -13,16 +13,16 @@ public class DbTypeMapTest { PostgresPlatform pg = new PostgresPlatform(); DbPlatformTypeMapping dbTypeMap = pg.getDbTypeMap(); - assertThat(dbTypeMap.lookup("clob", false).renderType(0,0)).isEqualTo("text"); + assertThat(dbTypeMap.lookup("clob", false).renderType(0, 0)).isEqualTo("text"); assertThat(dbTypeMap.lookup("CLOB", false).renderType(0, 0)).isEqualTo("text"); - assertThat(dbTypeMap.lookup("varchar", true).renderType(20,0)).isEqualTo("varchar(20)"); + assertThat(dbTypeMap.lookup("varchar", true).renderType(20, 0)).isEqualTo("varchar(20)"); - assertThat(dbTypeMap.lookup("json", false).renderType(0,0)).isEqualTo("json"); - assertThat(dbTypeMap.lookup("jsonb", false).renderType(0,0)).isEqualTo("jsonb"); - assertThat(dbTypeMap.lookup("jsonclob", false).renderType(0,0)).isEqualTo("text"); - assertThat(dbTypeMap.lookup("jsonblob", false).renderType(0,0)).isEqualTo("bytea"); - assertThat(dbTypeMap.lookup("jsonvarchar", false).renderType(200,0)).isEqualTo("varchar(200)"); + assertThat(dbTypeMap.lookup("json", false).renderType(0, 0)).isEqualTo("json"); + assertThat(dbTypeMap.lookup("jsonb", false).renderType(0, 0)).isEqualTo("jsonb"); + assertThat(dbTypeMap.lookup("jsonclob", false).renderType(0, 0)).isEqualTo("text"); + assertThat(dbTypeMap.lookup("jsonblob", false).renderType(0, 0)).isEqualTo("bytea"); + assertThat(dbTypeMap.lookup("jsonvarchar", false).renderType(200, 0)).isEqualTo("varchar(200)"); } @@ -35,4 +35,4 @@ public class DbTypeMapTest { assertThat(dbType).isSameAs(json); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/MySqlHistorySupportTest.java b/src/test/java/com/avaje/ebean/config/dbplatform/MySqlHistorySupportTest.java index 53f03710d..deae7ebab 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/MySqlHistorySupportTest.java +++ b/src/test/java/com/avaje/ebean/config/dbplatform/MySqlHistorySupportTest.java @@ -8,7 +8,7 @@ import static org.junit.Assert.assertEquals; public class MySqlHistorySupportTest { private MySqlHistorySupport support = new MySqlHistorySupport(); - + @Test public void getAsOfPredicate() { @@ -29,4 +29,4 @@ public class MySqlHistorySupportTest { String upper = support.getSysPeriodUpper("t0", "sys_period"); assertEquals(upper, "t0.sys_period_end"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/PostgresHistorySupportTest.java b/src/test/java/com/avaje/ebean/config/dbplatform/PostgresHistorySupportTest.java index 79a87069f..5f022f3db 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/PostgresHistorySupportTest.java +++ b/src/test/java/com/avaje/ebean/config/dbplatform/PostgresHistorySupportTest.java @@ -2,7 +2,7 @@ package com.avaje.ebean.config.dbplatform; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class PostgresHistorySupportTest { @@ -35,4 +35,4 @@ public class PostgresHistorySupportTest { assertEquals(upper, "upper(t0.sys_period)"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/config/dbplatform/PostgresPlatformTest.java b/src/test/java/com/avaje/ebean/config/dbplatform/PostgresPlatformTest.java index 9078e53f2..1f73168cf 100644 --- a/src/test/java/com/avaje/ebean/config/dbplatform/PostgresPlatformTest.java +++ b/src/test/java/com/avaje/ebean/config/dbplatform/PostgresPlatformTest.java @@ -9,7 +9,6 @@ import static org.assertj.core.api.Assertions.assertThat; public class PostgresPlatformTest { - @Test public void testTypeConversion() { diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/Helper.java b/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/Helper.java index 5c0b307fc..acd195dcf 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/Helper.java +++ b/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/Helper.java @@ -62,7 +62,7 @@ public class Helper { public static String asText(Object instance, String relativePath) throws IOException { InputStream is = instance.getClass().getResourceAsStream(relativePath); if (is == null) { - throw new IllegalArgumentException("resource "+relativePath+" not found"); + throw new IllegalArgumentException("resource " + relativePath + " not found"); } return asText(is); } diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java b/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java index 641e67ce1..9c267aa12 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java @@ -17,7 +17,7 @@ public class H2HistoryDdlTest { @Test public void testRegenerateHistoryTriggers() throws Exception { - SpiEbeanServer ebeanServer = (SpiEbeanServer)Ebean.getDefaultServer(); + SpiEbeanServer ebeanServer = (SpiEbeanServer) Ebean.getDefaultServer(); HistoryTableUpdate update = new HistoryTableUpdate("c_user"); update.add(HistoryTableUpdate.Change.ADD, "one"); @@ -38,4 +38,4 @@ public class H2HistoryDdlTest { assertThat(write.dropAll().isEmpty()).isTrue(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/IndexSetTest.java b/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/IndexSetTest.java index 8b1dc4573..67e88740e 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/IndexSetTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/IndexSetTest.java @@ -3,7 +3,8 @@ package com.avaje.ebean.dbmigration.ddlgeneration.platform; import com.avaje.ebean.dbmigration.ddlgeneration.platform.util.IndexSet; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class IndexSetTest { @@ -18,9 +19,9 @@ public class IndexSetTest { assertFalse(set.add(new String[]{"one_column"})); assertTrue(set.add(new String[]{"a", "b"})); - assertTrue(set.add(new String[]{"b","c"})); + assertTrue(set.add(new String[]{"b", "c"})); assertTrue(set.add(new String[]{"a"})); assertFalse(set.add(new String[]{"a", "b"})); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java b/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java index 2767cf2c7..712e660ee 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/util/VowelRemoverTest.java @@ -2,7 +2,7 @@ package com.avaje.ebean.dbmigration.ddlgeneration.platform.util; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class VowelRemoverTest { @@ -10,8 +10,8 @@ public class VowelRemoverTest { public void testTrim() throws Exception { - assertEquals("fk_abcd",VowelRemover.trim("fk_abcde",4)); + assertEquals("fk_abcd", VowelRemover.trim("fk_abcde", 4)); assertEquals("fk_a", VowelRemover.trim("fk_aaaaaa", 4)); assertEquals("ab_avrylngtblnm", VowelRemover.trim("ab_averylongtablename", 4)); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java b/src/test/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java index 4a555e4dc..5da4f95b3 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java @@ -16,14 +16,14 @@ public class MigrationXmlWriterTest { assertThat(migration.getChangeSet()).hasSize(1); assertThat(migration.getChangeSet().get(0).getChangeSetChildren()).hasSize(3); - File temp = File.createTempFile("migrationWrite",".xml"); + File temp = File.createTempFile("migrationWrite", ".xml"); new MigrationXmlWriter("THIS IS A GENERATED FILE - DO NOT MODIFY").write(migration, temp); Migration migrationRead = MigrationXmlReader.read(temp); assertThat(migrationRead.getChangeSet()).hasSize(1); assertThat(migrationRead.getChangeSet().get(0).getChangeSetChildren()).hasSize(3); - temp = File.createTempFile("migrationWrite",".xml"); + temp = File.createTempFile("migrationWrite", ".xml"); new MigrationXmlWriter(null).write(migration, temp); Migration migrationRead2 = MigrationXmlReader.read(temp); @@ -31,4 +31,4 @@ public class MigrationXmlWriterTest { assertThat(migrationRead2.getChangeSet()).hasSize(1); assertThat(migrationRead.getChangeSet().get(0).getChangeSetChildren()).hasSize(3); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/EntryTest.java b/src/test/java/com/avaje/ebean/dbmigration/model/EntryTest.java index 46f7eeb57..1ca6d29c8 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/EntryTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/model/EntryTest.java @@ -91,7 +91,7 @@ public class EntryTest { PendingDrops.Entry entry = createEntry(pending); - assertThat(entry.removeDrops(changeSet("one","two"))).isTrue(); + assertThat(entry.removeDrops(changeSet("one", "two"))).isTrue(); assertThat(entry.list).asList().doesNotContain(pending); } @@ -117,7 +117,7 @@ public class EntryTest { PendingDrops.Entry entry = createEntry(pending); - assertThat(entry.removeDrops(changeSet("one","two"))).isFalse(); + assertThat(entry.removeDrops(changeSet("one", "two"))).isFalse(); assertThat(entry.list).asList().contains(pending); assertThat(pending.getChangeSetChildren()).asList().hasSize(2); @@ -143,9 +143,9 @@ public class EntryTest { static PendingDrops.Entry createEntry(ChangeSet... pending) { PendingDrops.Entry entry = new PendingDrops.Entry(MigrationVersion.parse("1.1")); - for (ChangeSet changeSet: pending) { + for (ChangeSet changeSet : pending) { entry.add(changeSet); } return entry; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/MColumnTest.java b/src/test/java/com/avaje/ebean/dbmigration/model/MColumnTest.java index 0bcdf6e5e..d722ffb17 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/MColumnTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/model/MColumnTest.java @@ -4,7 +4,7 @@ import com.avaje.ebean.dbmigration.migration.AlterColumn; import org.jetbrains.annotations.NotNull; import org.junit.Test; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; public class MColumnTest { @@ -319,4 +319,4 @@ public class MColumnTest { assertThat(diff.getApplyChanges()).hasSize(1); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/MTableTest.java b/src/test/java/com/avaje/ebean/dbmigration/model/MTableTest.java index 794461e46..3686b8847 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/MTableTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/model/MTableTest.java @@ -10,35 +10,35 @@ import org.junit.Test; import java.util.List; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; public class MTableTest { static MTable base() { MTable table = new MTable("tab"); - table.addColumn(new MColumn("id","bigint")); - table.addColumn(new MColumn("name","varchar(20)")); - table.addColumn(new MColumn("status","varchar(3)")); + table.addColumn(new MColumn("id", "bigint")); + table.addColumn(new MColumn("name", "varchar(20)")); + table.addColumn(new MColumn("status", "varchar(3)")); return table; } static MTable newTable() { MTable table = new MTable("tab"); - table.addColumn(new MColumn("id","bigint")); - table.addColumn(new MColumn("name","varchar(20)")); - table.addColumn(new MColumn("comment","varchar(1000)")); + table.addColumn(new MColumn("id", "bigint")); + table.addColumn(new MColumn("name", "varchar(20)")); + table.addColumn(new MColumn("comment", "varchar(1000)")); return table; } static MTable newTableAdd2Columns() { MTable table = new MTable("tab"); - table.addColumn(new MColumn("id","bigint")); - table.addColumn(new MColumn("name","varchar(20)")); - table.addColumn(new MColumn("status","varchar(3)")); - table.addColumn(new MColumn("comment","varchar(1000)")); - table.addColumn(new MColumn("note","varchar(2000)")); + table.addColumn(new MColumn("id", "bigint")); + table.addColumn(new MColumn("name", "varchar(20)")); + table.addColumn(new MColumn("status", "varchar(3)")); + table.addColumn(new MColumn("comment", "varchar(1000)")); + table.addColumn(new MColumn("note", "varchar(2000)")); return table; } @@ -48,8 +48,8 @@ public class MTableTest { MTable table = new MTable("tab"); table.addColumn(modCol); - table.addColumn(new MColumn("id","bigint")); - table.addColumn(new MColumn("status","varchar(3)")); + table.addColumn(new MColumn("id", "bigint")); + table.addColumn(new MColumn("status", "varchar(3)")); return table; } @@ -60,8 +60,8 @@ public class MTableTest { base.registerPendingDropColumn("fullName"); base.registerPendingDropColumn("last"); - assertThat(base.allHistoryColumns(false)).containsExactly("id","name","status"); - assertThat(base.allHistoryColumns(true)).containsExactly("id","name","status","fullName","last"); + assertThat(base.allHistoryColumns(false)).containsExactly("id", "name", "status"); + assertThat(base.allHistoryColumns(true)).containsExactly("id", "name", "status", "fullName", "last"); } @Test @@ -80,14 +80,14 @@ public class MTableTest { List createChanges = diff.getApplyChanges(); assertThat(createChanges).hasSize(1); - AddColumn addColumn = (AddColumn)createChanges.get(0); + AddColumn addColumn = (AddColumn) createChanges.get(0); assertThat(addColumn.getColumn()).extracting("name").contains("comment"); assertThat(addColumn.getColumn()).extracting("type").contains("varchar(1000)"); List dropChanges = diff.getDropChanges(); assertThat(dropChanges).hasSize(1); - DropColumn dropColumn = (DropColumn)dropChanges.get(0); + DropColumn dropColumn = (DropColumn) dropChanges.get(0); assertThat(dropColumn.getColumnName()).isEqualTo("status"); assertThat(dropColumn.getTableName()).isEqualTo("tab"); } @@ -101,9 +101,9 @@ public class MTableTest { List createChanges = diff.getApplyChanges(); assertThat(createChanges).hasSize(1); - AddColumn addColumn = (AddColumn)createChanges.get(0); - assertThat(addColumn.getColumn()).extracting("name").contains("comment","note"); - assertThat(addColumn.getColumn()).extracting("type").contains("varchar(1000)","varchar(2000)"); + AddColumn addColumn = (AddColumn) createChanges.get(0); + assertThat(addColumn.getColumn()).extracting("name").contains("comment", "note"); + assertThat(addColumn.getColumn()).extracting("type").contains("varchar(1000)", "varchar(2000)"); assertThat(diff.getDropChanges()).hasSize(0); @@ -118,7 +118,7 @@ public class MTableTest { List createChanges = diff.getApplyChanges(); assertThat(createChanges).hasSize(1); - AlterColumn alterColumn = (AlterColumn)createChanges.get(0); + AlterColumn alterColumn = (AlterColumn) createChanges.get(0); assertThat(alterColumn.getColumnName()).isEqualTo("name"); assertThat(alterColumn.getType()).isEqualTo("varchar(30)"); assertThat(alterColumn.isNotnull()).isEqualTo(true); @@ -224,4 +224,4 @@ public class MTableTest { assertThat(diff.getDropChanges().get(0)).isInstanceOf(DropHistoryTable.class); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/MigrationVersionTest.java b/src/test/java/com/avaje/ebean/dbmigration/model/MigrationVersionTest.java index 1ce65cd6e..76f33f4cf 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/MigrationVersionTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/model/MigrationVersionTest.java @@ -14,7 +14,7 @@ public class MigrationVersionTest { @Test public void sort() { - List list= new ArrayList<>(); + List list = new ArrayList<>(); list.add(MigrationVersion.parse("1.1__point")); list.add(MigrationVersion.parse("3.0__three")); list.add(MigrationVersion.parse("1.0__init")); @@ -166,4 +166,4 @@ public class MigrationVersionTest { assertThat(v1.compareTo(v3)).isEqualTo(-1); assertThat(v1.compareTo(v4)).isEqualTo(-1); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/ModelContainerTest.java b/src/test/java/com/avaje/ebean/dbmigration/model/ModelContainerTest.java index a56df0111..d669edc95 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/ModelContainerTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/model/ModelContainerTest.java @@ -63,8 +63,8 @@ public class ModelContainerTest { List normalColumns = base.getTable("document").allHistoryColumns(false); List historyColumns = base.getTable("document").allHistoryColumns(true); - assertThat(historyColumns).contains("zong","boom","baz","bar"); - assertThat(normalColumns).doesNotContain("zing","zong","boom","baz","bar"); + assertThat(historyColumns).contains("zong", "boom", "baz", "bar"); + assertThat(normalColumns).doesNotContain("zing", "zong", "boom", "baz", "bar"); } @NotNull @@ -90,4 +90,4 @@ public class ModelContainerTest { private Migration mig(String path) { return MigrationXmlReader.read(ModelContainerTest.class.getResourceAsStream(path)); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/PendingDropsTest.java b/src/test/java/com/avaje/ebean/dbmigration/model/PendingDropsTest.java index f0762a9fe..235e258b4 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/PendingDropsTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/model/PendingDropsTest.java @@ -31,8 +31,8 @@ public class PendingDropsTest { DropColumn one = col("one"); DropColumn two = col("two"); - pendingDrops.add(V1_1, changeSet(one,two)); - pendingDrops.add(V1_1, changeSet("three","four")); + pendingDrops.add(V1_1, changeSet(one, two)); + pendingDrops.add(V1_1, changeSet("three", "four")); assertThat(pendingDrops.testGetEntryFor(V1_1).list).asList().hasSize(2); ChangeSet applied = changeSet("two"); @@ -50,11 +50,11 @@ public class PendingDropsTest { DropColumn one = col("one"); DropColumn two = col("two"); - pendingDrops.add(V1_1, changeSet(one,two)); - pendingDrops.add(V1_1, changeSet("three","four")); + pendingDrops.add(V1_1, changeSet(one, two)); + pendingDrops.add(V1_1, changeSet("three", "four")); assertThat(pendingDrops.testGetEntryFor(V1_1).list).asList().hasSize(2); - ChangeSet applied = changeSet("two","one"); + ChangeSet applied = changeSet("two", "one"); applied.setDropsFor("1.1"); assertThat(pendingDrops.appliedDropsFor(applied)).isFalse(); @@ -243,4 +243,4 @@ public class PendingDropsTest { return EntryTest.col(colName); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/build/ModelBuildBeanVisitorTest.java b/src/test/java/com/avaje/ebean/dbmigration/model/build/ModelBuildBeanVisitorTest.java index 6dcdbc8a8..23c3c7f76 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/build/ModelBuildBeanVisitorTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/model/build/ModelBuildBeanVisitorTest.java @@ -5,10 +5,10 @@ import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.config.DbConstraintNaming; import com.avaje.ebean.dbmigration.ddlgeneration.platform.DefaultConstraintMaxLength; -import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.ebean.dbmigration.model.MTable; import com.avaje.ebean.dbmigration.model.ModelContainer; import com.avaje.ebean.dbmigration.model.visitor.VisitAllUsing; +import com.avaje.ebeaninternal.api.SpiEbeanServer; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -18,7 +18,7 @@ public class ModelBuildBeanVisitorTest extends BaseTestCase { @Test public void test() { - SpiEbeanServer defaultServer = (SpiEbeanServer)Ebean.getDefaultServer(); + SpiEbeanServer defaultServer = (SpiEbeanServer) Ebean.getDefaultServer(); ModelContainer model = new ModelContainer(); @@ -39,4 +39,4 @@ public class ModelBuildBeanVisitorTest extends BaseTestCase { MTable customer = model.getTable("o_customer"); assertThat(customer).isNotNull(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/event/BeanFindControllerTest.java b/src/test/java/com/avaje/ebean/event/BeanFindControllerTest.java index 2128c8b2a..3100b9e47 100644 --- a/src/test/java/com/avaje/ebean/event/BeanFindControllerTest.java +++ b/src/test/java/com/avaje/ebean/event/BeanFindControllerTest.java @@ -13,10 +13,7 @@ import org.junit.Test; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class BeanFindControllerTest extends BaseTestCase { @@ -93,7 +90,7 @@ public class BeanFindControllerTest extends BaseTestCase { @SuppressWarnings("unchecked") @Override public T find(BeanQueryRequest request) { - return (T)createBean(); + return (T) createBean(); } @Override @@ -107,7 +104,7 @@ public class BeanFindControllerTest extends BaseTestCase { public BeanCollection findMany(BeanQueryRequest request) { BeanList list = new BeanList<>(); - list.add((T)createBean()); + list.add((T) createBean()); return list; } } @@ -118,4 +115,4 @@ public class BeanFindControllerTest extends BaseTestCase { b.setName("47"); return b; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/event/BeanPostLoadTest.java b/src/test/java/com/avaje/ebean/event/BeanPostLoadTest.java index 7cbe11ee0..3acb39469 100644 --- a/src/test/java/com/avaje/ebean/event/BeanPostLoadTest.java +++ b/src/test/java/com/avaje/ebean/event/BeanPostLoadTest.java @@ -31,9 +31,9 @@ public class BeanPostLoadTest extends BaseTestCase { ebeanServer.save(bean); EBasicVer found = ebeanServer.find(EBasicVer.class) - .select("name, other") - .setId(bean.getId()) - .findUnique(); + .select("name, other") + .setId(bean.getId()) + .findUnique(); assertThat(postLoad.methodsCalled).hasSize(1); assertThat(postLoad.methodsCalled).containsExactly("postLoad"); @@ -61,7 +61,7 @@ public class BeanPostLoadTest extends BaseTestCase { config.getClasses().add(EBasicVer.class); config.add(postLoad); - + return EbeanServerFactory.create(config); } @@ -97,4 +97,4 @@ public class BeanPostLoadTest extends BaseTestCase { } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/json/EJsonTests.java b/src/test/java/com/avaje/ebean/json/EJsonTests.java index 598d4fdeb..faa299305 100644 --- a/src/test/java/com/avaje/ebean/json/EJsonTests.java +++ b/src/test/java/com/avaje/ebean/json/EJsonTests.java @@ -14,30 +14,26 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class EJsonTests { @Test public void test_map_simple() throws IOException { - + JsonFactory factory = new JsonFactory(); - + String jsonInput = "{\"name\":\"rob\",\"age\":12}"; JsonParser jsonParser = factory.createParser(jsonInput); Object result = EJson.parse(jsonParser); - + assertTrue(result instanceof Map); - Map map = (Map)result; + Map map = (Map) result; assertEquals("rob", map.get("name")); assertEquals(12L, map.get("age")); - + String jsonOutput = EJson.write(result); assertEquals(jsonInput, jsonOutput); } @@ -51,7 +47,7 @@ public class EJsonTests { JsonParser jsonParser = factory.createParser(jsonInput); - Map map = EJson.parseObject(jsonParser); + Map map = EJson.parseObject(jsonParser); assertNotNull(map); assertEquals("rob", map.get("name")); @@ -85,16 +81,16 @@ public class EJsonTests { Object result = EJson.parse(jsonInput); assertTrue(result instanceof Map); - Map map = (Map)result; + Map map = (Map) result; assertEquals(4, map.size()); assertEquals("rob", map.get("name")); assertEquals(12L, map.get("age")); - Map org = (Map)map.get("org"); + Map org = (Map) map.get("org"); assertEquals("superorg", org.get("name")); assertEquals(4L, org.get("rating")); - List nums = (List)map.get("nums"); + List nums = (List) map.get("nums"); assertEquals(3, nums.size()); assertEquals(1L, nums.get(0)); assertEquals(2L, nums.get(1)); @@ -111,7 +107,7 @@ public class EJsonTests { Object result = EJson.parse(jsonInput); assertTrue(result instanceof Map); - Map map = (Map)result; + Map map = (Map) result; assertEquals("rob", map.get("name")); assertNull(map.get("age")); @@ -181,7 +177,7 @@ public class EJsonTests { assertTrue(result instanceof List); - List> list = (List>)result; + List> list = (List>) result; assertEquals(2, list.size()); assertEquals("rob", list.get(0).get("name")); assertEquals(12L, list.get(0).get("age")); @@ -201,11 +197,11 @@ public class EJsonTests { Object result = EJson.parse(reader); assertTrue(result instanceof Map); - Map map = (Map)result; + Map map = (Map) result; assertEquals("rob", map.get("name")); assertNull(map.get("age")); - Map friend = (Map)map.get("friend"); + Map friend = (Map) map.get("friend"); assertEquals("mike", friend.get("name")); assertEquals(13L, friend.get("age")); } @@ -215,7 +211,7 @@ public class EJsonTests { public void test_map_nested_modifyAware() throws IOException { String jsonInput = "{\"name\":\"rob\",\"age\":12,\"org\":{\"name\":\"superorg\",\"rating\":4},\"nums\":[1,2,3]}"; - ModifyAwareMap map = (ModifyAwareMap) EJson.parseObject(jsonInput, true); + ModifyAwareMap map = (ModifyAwareMap) EJson.parseObject(jsonInput, true); assertFalse(map.isMarkedDirty()); assertEquals(4, map.size()); @@ -229,7 +225,7 @@ public class EJsonTests { public void test_map_nested_modifyAwareNestedList() throws IOException { String jsonInput = "{\"name\":\"rob\",\"age\":12,\"org\":{\"name\":\"superorg\",\"rating\":4},\"nums\":[1,2,3]}"; - ModifyAwareMap map = (ModifyAwareMap) EJson.parseObject(jsonInput, true); + ModifyAwareMap map = (ModifyAwareMap) EJson.parseObject(jsonInput, true); assertFalse(map.isMarkedDirty()); List nums = (List) map.get("nums"); @@ -242,11 +238,11 @@ public class EJsonTests { public void test_map_nested_modifyAwareNestedObject() throws IOException { String jsonInput = "{\"name\":\"rob\",\"age\":12,\"org\":{\"name\":\"superorg\",\"rating\":4},\"nums\":[1,2,3]}"; - ModifyAwareMap map = (ModifyAwareMap) EJson.parseObject(jsonInput, true); + ModifyAwareMap map = (ModifyAwareMap) EJson.parseObject(jsonInput, true); assertFalse(map.isMarkedDirty()); - Map org = (Map) map.get("org"); - org.put("extra","foo"); + Map org = (Map) map.get("org"); + org.put("extra", "foo"); assertTrue(map.isMarkedDirty()); } @@ -272,13 +268,13 @@ public class EJsonTests { Set set = EJson.parseSet(jsonInput, true); - ModifyAwareOwner modAware = (ModifyAwareOwner)set; + ModifyAwareOwner modAware = (ModifyAwareOwner) set; assertFalse(modAware.isMarkedDirty()); Iterator iterator = set.iterator(); if (iterator.hasNext()) { - Map map = (Map)iterator.next(); - map.put("name","stu"); + Map map = (Map) iterator.next(); + map.put("name", "stu"); assertTrue(modAware.isMarkedDirty()); } } diff --git a/src/test/java/com/avaje/ebean/plugin/BeanTypeTest.java b/src/test/java/com/avaje/ebean/plugin/BeanTypeTest.java index 1ca3b45db..730a04285 100644 --- a/src/test/java/com/avaje/ebean/plugin/BeanTypeTest.java +++ b/src/test/java/com/avaje/ebean/plugin/BeanTypeTest.java @@ -18,9 +18,7 @@ import com.avaje.tests.model.basic.Vehicle; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class BeanTypeTest { @@ -123,7 +121,7 @@ public class BeanTypeTest { BeanDocType orderDocType = beanType(Order.class).docStore(); FetchPath customer = orderDocType.getEmbedded("customer"); assertThat(customer).isNotNull(); - assertThat(customer.getProperties(null)).contains("id","name"); + assertThat(customer.getProperties(null)).contains("id", "name"); } @Test @@ -173,12 +171,12 @@ public class BeanTypeTest { @Test public void docStoreApplyPath() throws Exception { - SpiQuery orderQuery = (SpiQuery)server.find(Order.class); + SpiQuery orderQuery = (SpiQuery) server.find(Order.class); beanType(Order.class).docStore().applyPath(orderQuery); OrmQueryDetail detail = orderQuery.getDetail(); assertThat(detail.getChunk("customer", false).getSelectProperties()) - .containsExactly("id", "name"); + .containsExactly("id", "name"); } @@ -214,12 +212,12 @@ public class BeanTypeTest { @Test public void getDiscColumn_when_default() { - assertEquals(beanType(Car.class).getDiscColumn(),"dtype"); + assertEquals(beanType(Car.class).getDiscColumn(), "dtype"); } @Test public void getDiscColumn_when_set() { - assertEquals(beanType(Stockforecast.class).getDiscColumn(),"type"); + assertEquals(beanType(Stockforecast.class).getDiscColumn(), "type"); } @Test @@ -231,13 +229,13 @@ public class BeanTypeTest { @Test public void addInheritanceWhere_when_leaf() { Query query = server.find(Vehicle.class); - beanType(Car.class).addInheritanceWhere((SpiQuery)query); + beanType(Car.class).addInheritanceWhere((SpiQuery) query); } @Test public void addInheritanceWhere_when_root() { Query query = server.find(Vehicle.class); - beanType(Vehicle.class).addInheritanceWhere((SpiQuery)query); + beanType(Vehicle.class).addInheritanceWhere((SpiQuery) query); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/plugin/ExpressionPathTest.java b/src/test/java/com/avaje/ebean/plugin/ExpressionPathTest.java index e920074e1..7654fc6b9 100644 --- a/src/test/java/com/avaje/ebean/plugin/ExpressionPathTest.java +++ b/src/test/java/com/avaje/ebean/plugin/ExpressionPathTest.java @@ -82,37 +82,37 @@ public class ExpressionPathTest { BeanType customerBeanType = beanType(Customer.class); BeanType orderBeanType = beanType(Order.class); - - + + Customer customer = new Customer(); customer.setName("foo"); server.save(customer); - + customer = server.find(Customer.class, customer.getId()); assertThat(customer.getName()).isEqualTo("foo"); - + customerBeanType.getExpressionPath("name").pathSet(customer, "bar"); server.save(customer); - + customer = server.find(Customer.class, customer.getId()); assertThat(customer.getName()).isEqualTo("bar"); - - + + Order order = new Order(); order.setCustomer(customer); - + server.save(order); - + order = server.find(Order.class, order.getId()); - + ExpressionPath customerNamePath = orderBeanType.getExpressionPath("customer.name"); assertThat(customerNamePath.pathGet(order)).isEqualTo("bar"); - + customerNamePath.pathSet(order, "baz"); server.save(order); - + order = server.find(Order.class, order.getId()); assertThat(order.getCustomer().getName()).isEqualTo("baz"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/plugin/SpiServerTest.java b/src/test/java/com/avaje/ebean/plugin/SpiServerTest.java index 7f41b08e3..f79f27cd9 100644 --- a/src/test/java/com/avaje/ebean/plugin/SpiServerTest.java +++ b/src/test/java/com/avaje/ebean/plugin/SpiServerTest.java @@ -7,12 +7,7 @@ import org.junit.Test; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class SpiServerTest { @@ -51,4 +46,4 @@ public class SpiServerTest { assertTrue(!allTypes.isEmpty()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/server/type/MyDayOfWeek.java b/src/test/java/com/avaje/ebean/server/type/MyDayOfWeek.java index 453c2b25d..b7710be00 100644 --- a/src/test/java/com/avaje/ebean/server/type/MyDayOfWeek.java +++ b/src/test/java/com/avaje/ebean/server/type/MyDayOfWeek.java @@ -7,11 +7,11 @@ import com.avaje.ebean.annotation.EnumValue; */ public enum MyDayOfWeek { - @EnumValue("MONDAY ") MONDAY, - @EnumValue("TUESDAY ") TUESDAY, - @EnumValue("WEDNESDAY") WEDNESDAY, - @EnumValue("THURSDAY ") THURSDAY, - @EnumValue("FRIDAY ") FRIDAY, - @EnumValue("SATURDAY ") SATURDAY, - @EnumValue("SUNDAY ") SUNDAY + @EnumValue("MONDAY ")MONDAY, + @EnumValue("TUESDAY ")TUESDAY, + @EnumValue("WEDNESDAY")WEDNESDAY, + @EnumValue("THURSDAY ")THURSDAY, + @EnumValue("FRIDAY ")FRIDAY, + @EnumValue("SATURDAY ")SATURDAY, + @EnumValue("SUNDAY ")SUNDAY } diff --git a/src/test/java/com/avaje/ebean/server/type/TestTypeManager.java b/src/test/java/com/avaje/ebean/server/type/TestTypeManager.java index 6f3ce1442..7334947df 100644 --- a/src/test/java/com/avaje/ebean/server/type/TestTypeManager.java +++ b/src/test/java/com/avaje/ebean/server/type/TestTypeManager.java @@ -83,7 +83,7 @@ public class TestTypeManager extends BaseTestCase { Assert.assertTrue(checkImmutable.isImmutable()); ScalarDataReader dataReader = typeManager - .recursiveCreateScalarDataReader(ExhangeCMoneyRate.class); + .recursiveCreateScalarDataReader(ExhangeCMoneyRate.class); Assert.assertTrue(dataReader instanceof CtCompoundType); dataReader = typeManager.recursiveCreateScalarDataReader(CMoney.class); diff --git a/src/test/java/com/avaje/ebean/text/PathPropertiesTests.java b/src/test/java/com/avaje/ebean/text/PathPropertiesTests.java index 90aba639c..81f94a5c7 100644 --- a/src/test/java/com/avaje/ebean/text/PathPropertiesTests.java +++ b/src/test/java/com/avaje/ebean/text/PathPropertiesTests.java @@ -4,9 +4,7 @@ import com.avaje.ebean.FetchPath; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class PathPropertiesTests { diff --git a/src/test/java/com/avaje/ebean/text/json/JsonContextTest.java b/src/test/java/com/avaje/ebean/text/json/JsonContextTest.java index affad9527..738f42650 100644 --- a/src/test/java/com/avaje/ebean/text/json/JsonContextTest.java +++ b/src/test/java/com/avaje/ebean/text/json/JsonContextTest.java @@ -16,11 +16,7 @@ import java.util.List; import java.util.Map; import static org.assertj.core.api.StrictAssertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class JsonContextTest { @@ -40,9 +36,9 @@ public class JsonContextTest { ResetBasicData.reset(); List orders = Ebean.find(Order.class) - .fetch("customer", "id, name") - .where().eq("customer.id", 1) - .findList(); + .fetch("customer", "id, name") + .where().eq("customer.id", 1) + .findList(); String json = Ebean.json().toJson(orders); @@ -65,9 +61,9 @@ public class JsonContextTest { ResetBasicData.reset(); List orders = Ebean.find(Order.class) - .select("status") - .fetch("customer", "id, name") - .findList(); + .select("status") + .fetch("customer", "id, name") + .findList(); String json = Ebean.json().toJson(orders); @@ -220,4 +216,4 @@ public class JsonContextTest { assertEquals("START[{\"count\":12}]END", writer.toString()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebean/text/json/JsonWriteOptionsTests.java b/src/test/java/com/avaje/ebean/text/json/JsonWriteOptionsTests.java index 7ef2f9775..d8dfd8842 100644 --- a/src/test/java/com/avaje/ebean/text/json/JsonWriteOptionsTests.java +++ b/src/test/java/com/avaje/ebean/text/json/JsonWriteOptionsTests.java @@ -12,10 +12,10 @@ public class JsonWriteOptionsTests { @Test public void test_parse() { - + JsonWriteOptions options = JsonWriteOptions.parsePath("id,status,name"); FetchPath pathProps = options.getPathProperties(); - + //Assert.assertEquals(1, pathProps.getPaths().size()); assertTrue(pathProps.getProperties(null).contains("id")); assertTrue(pathProps.getProperties(null).contains("name")); @@ -57,5 +57,4 @@ public class JsonWriteOptionsTests { } - } diff --git a/src/test/java/com/avaje/ebean/util/CamelCaseHelperTest.java b/src/test/java/com/avaje/ebean/util/CamelCaseHelperTest.java index b8f30baf1..77997fe58 100644 --- a/src/test/java/com/avaje/ebean/util/CamelCaseHelperTest.java +++ b/src/test/java/com/avaje/ebean/util/CamelCaseHelperTest.java @@ -2,7 +2,7 @@ package com.avaje.ebean.util; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class CamelCaseHelperTest { @@ -28,4 +28,4 @@ public class CamelCaseHelperTest { assertEquals(CamelCaseHelper.toCamelFromUnderscore("HELLO"), "HELLO"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/api/HashQueryPlanBuilderTest.java b/src/test/java/com/avaje/ebeaninternal/api/HashQueryPlanBuilderTest.java index bcefc1289..20473c058 100644 --- a/src/test/java/com/avaje/ebeaninternal/api/HashQueryPlanBuilderTest.java +++ b/src/test/java/com/avaje/ebeaninternal/api/HashQueryPlanBuilderTest.java @@ -13,27 +13,27 @@ public class HashQueryPlanBuilderTest { @Test public void test_pair_0_1() { - assertThat(combine(0, 31)).isNotEqualTo(combine(1,0)); + assertThat(combine(0, 31)).isNotEqualTo(combine(1, 0)); } @Test public void test_pair_0_10_adjust_0() { - assertThat(combine(0, 310)).isNotEqualTo(combine(10,0)); + assertThat(combine(0, 310)).isNotEqualTo(combine(10, 0)); } @Test public void test_pair_0_10_adjust_10() { - assertThat(combine(0, 320)).isNotEqualTo(combine(10,10)); + assertThat(combine(0, 320)).isNotEqualTo(combine(10, 10)); } @Test public void test_pair_0_10_adjust_40() { - assertThat(combine(0, 350)).isNotEqualTo(combine(10,40)); + assertThat(combine(0, 350)).isNotEqualTo(combine(10, 40)); } @Test public void test_pair_0_10_adjust_90() { - assertThat(combine(0, 400)).isNotEqualTo(combine(10,90)); + assertThat(combine(0, 400)).isNotEqualTo(combine(10, 90)); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/api/HashQueryPlanTest.java b/src/test/java/com/avaje/ebeaninternal/api/HashQueryPlanTest.java index 666dd0da9..d49e9f6a7 100644 --- a/src/test/java/com/avaje/ebeaninternal/api/HashQueryPlanTest.java +++ b/src/test/java/com/avaje/ebeaninternal/api/HashQueryPlanTest.java @@ -18,28 +18,28 @@ public class HashQueryPlanTest { @Test public void testEquals() throws Exception { - assertThat(hqp("foo",10, 7)).isEqualTo(hqp("foo",10, 7)); - assertThat(hqp("foo",10, 7)).isNotEqualTo(hqp("foo", 11, 7)); - assertThat(hqp("foo",10, 7)).isNotEqualTo(hqp("foo", 9, 7)); - assertThat(hqp("foo",10, 7)).isNotEqualTo(hqp("foo", 10, 8)); - assertThat(hqp("foo",10, 7)).isNotEqualTo(hqp("foo", 10, 6)); - assertThat(hqp("foo",10, 7)).isNotEqualTo(hqp("bar", 10, 6)); - assertThat(hqp("foo",10, 7)).isNotEqualTo(hqp(null, 10, 7)); - assertThat(hqp(null,10, 7)).isNotEqualTo(hqp("foo", 10, 7)); - assertThat(hqp(null,10, 7)).isEqualTo(hqp(null, 10, 7)); + assertThat(hqp("foo", 10, 7)).isEqualTo(hqp("foo", 10, 7)); + assertThat(hqp("foo", 10, 7)).isNotEqualTo(hqp("foo", 11, 7)); + assertThat(hqp("foo", 10, 7)).isNotEqualTo(hqp("foo", 9, 7)); + assertThat(hqp("foo", 10, 7)).isNotEqualTo(hqp("foo", 10, 8)); + assertThat(hqp("foo", 10, 7)).isNotEqualTo(hqp("foo", 10, 6)); + assertThat(hqp("foo", 10, 7)).isNotEqualTo(hqp("bar", 10, 6)); + assertThat(hqp("foo", 10, 7)).isNotEqualTo(hqp(null, 10, 7)); + assertThat(hqp(null, 10, 7)).isNotEqualTo(hqp("foo", 10, 7)); + assertThat(hqp(null, 10, 7)).isEqualTo(hqp(null, 10, 7)); } @Test public void testHashCode() throws Exception { - assertThat(hc("foo",10, 7)).isEqualTo(hc("foo",10, 7)); - assertThat(hc("foo",10, 7)).isNotEqualTo(hc("foo", 11, 7)); - assertThat(hc("foo",10, 7)).isNotEqualTo(hc("foo", 9, 7)); - assertThat(hc("foo",10, 7)).isNotEqualTo(hc("foo", 10, 8)); - assertThat(hc("foo",10, 7)).isNotEqualTo(hc("foo", 10, 6)); - assertThat(hc("foo",10, 7)).isNotEqualTo(hc("bar", 10, 6)); - assertThat(hc("foo",10, 7)).isNotEqualTo(hc(null, 10, 7)); - assertThat(hc(null,10, 7)).isNotEqualTo(hc("foo", 10, 7)); - assertThat(hc(null,10, 7)).isEqualTo(hc(null, 10, 7)); + assertThat(hc("foo", 10, 7)).isEqualTo(hc("foo", 10, 7)); + assertThat(hc("foo", 10, 7)).isNotEqualTo(hc("foo", 11, 7)); + assertThat(hc("foo", 10, 7)).isNotEqualTo(hc("foo", 9, 7)); + assertThat(hc("foo", 10, 7)).isNotEqualTo(hc("foo", 10, 8)); + assertThat(hc("foo", 10, 7)).isNotEqualTo(hc("foo", 10, 6)); + assertThat(hc("foo", 10, 7)).isNotEqualTo(hc("bar", 10, 6)); + assertThat(hc("foo", 10, 7)).isNotEqualTo(hc(null, 10, 7)); + assertThat(hc(null, 10, 7)).isNotEqualTo(hc("foo", 10, 7)); + assertThat(hc(null, 10, 7)).isEqualTo(hc(null, 10, 7)); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java index aeb4dc840..bcdd913d4 100644 --- a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java +++ b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java @@ -1,6 +1,34 @@ package com.avaje.ebeaninternal.api; -import com.avaje.ebean.*; +import com.avaje.ebean.AutoTune; +import com.avaje.ebean.BackgroundExecutor; +import com.avaje.ebean.BeanState; +import com.avaje.ebean.CallableSql; +import com.avaje.ebean.DocumentStore; +import com.avaje.ebean.ExpressionFactory; +import com.avaje.ebean.Filter; +import com.avaje.ebean.FutureIds; +import com.avaje.ebean.FutureList; +import com.avaje.ebean.FutureRowCount; +import com.avaje.ebean.PagedList; +import com.avaje.ebean.PersistenceContextScope; +import com.avaje.ebean.Query; +import com.avaje.ebean.QueryEachConsumer; +import com.avaje.ebean.QueryEachWhileConsumer; +import com.avaje.ebean.QueryIterator; +import com.avaje.ebean.SqlQuery; +import com.avaje.ebean.SqlRow; +import com.avaje.ebean.SqlUpdate; +import com.avaje.ebean.Transaction; +import com.avaje.ebean.TransactionCallback; +import com.avaje.ebean.TxCallable; +import com.avaje.ebean.TxIsolation; +import com.avaje.ebean.TxRunnable; +import com.avaje.ebean.TxScope; +import com.avaje.ebean.Update; +import com.avaje.ebean.UpdateQuery; +import com.avaje.ebean.ValuePair; +import com.avaje.ebean.Version; import com.avaje.ebean.bean.BeanCollection; import com.avaje.ebean.bean.CallStack; import com.avaje.ebean.bean.EntityBeanIntercept; @@ -34,8 +62,10 @@ import java.util.Set; public class TDSpiEbeanServer implements SpiEbeanServer { String name; + public TDSpiEbeanServer() { } + public TDSpiEbeanServer(String name) { this.name = name; } diff --git a/src/test/java/com/avaje/ebeaninternal/server/cache/CacheBeanDataTest.java b/src/test/java/com/avaje/ebeaninternal/server/cache/CacheBeanDataTest.java index bfb172161..93303dafe 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/cache/CacheBeanDataTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/cache/CacheBeanDataTest.java @@ -109,7 +109,7 @@ public class CacheBeanDataTest extends BaseTestCase { assertNotNull(cacheData); - EPerson newPerson = (EPerson)desc.cacheEmbeddedBeanLoad(cacheData, context); + EPerson newPerson = (EPerson) desc.cacheEmbeddedBeanLoad(cacheData, context); assertNotNull(newPerson.getId()); assertNotNull(newPerson.getName()); diff --git a/src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java b/src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java index c208b2fcd..4c2da302e 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java @@ -53,15 +53,15 @@ public class CachedBeanDataFromBeanTest extends BaseTestCase { car.setDriver("Jimmy"); car.setNotes("some notes"); - BeanDescriptor carDesc = server.getBeanDescriptor(Car.class); + BeanDescriptor carDesc = server.getBeanDescriptor(Car.class); CachedBeanData cacheData = CachedBeanDataFromBean.extract(carDesc, (EntityBean) car); Car newCar = new Car(); - EntityBean entityBean = (EntityBean)newCar; + EntityBean entityBean = (EntityBean) newCar; CachedBeanDataToBean.load(carDesc, entityBean, cacheData, new DefaultPersistenceContext()); assertEquals(newCar.getId(), car.getId()); assertEquals(newCar.getDriver(), car.getDriver()); assertEquals(newCar.getNotes(), car.getNotes()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java b/src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java index 8d48f7f84..44f40cf5c 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java @@ -32,7 +32,7 @@ public class CachedBeanDataSerializeTest extends BaseTestCase { Map map = new LinkedHashMap<>(); map.put("name", "rob"); map.put("some", "thing"); - map.put("whenCreated", ""+System.currentTimeMillis()); + map.put("whenCreated", "" + System.currentTimeMillis()); long version = System.currentTimeMillis(); CachedBeanData write = new CachedBeanData(null, "C", map, version); @@ -65,13 +65,13 @@ public class CachedBeanDataSerializeTest extends BaseTestCase { ResetBasicData.reset(); List customers = Ebean.find(Customer.class) - .orderBy().asc("id") - .setMaxRows(1).findList(); + .orderBy().asc("id") + .setMaxRows(1).findList(); Customer customer = customers.get(0); BeanDescriptor desc = getBeanDescriptor(Customer.class); - CachedBeanData extract = CachedBeanDataFromBean.extract(desc, (EntityBean)customer); + CachedBeanData extract = CachedBeanDataFromBean.extract(desc, (EntityBean) customer); ByteArrayOutputStream os = new ByteArrayOutputStream(); writeToStream(extract, os); @@ -83,7 +83,7 @@ public class CachedBeanDataSerializeTest extends BaseTestCase { assertEquals(read.getData(), extract.getData()); Customer loadCustomer = new Customer(); - CachedBeanDataToBean.load(desc, (EntityBean)loadCustomer, read, new DefaultPersistenceContext()); + CachedBeanDataToBean.load(desc, (EntityBean) loadCustomer, read, new DefaultPersistenceContext()); assertEquals(loadCustomer.getVersion(), customer.getVersion()); assertEquals(loadCustomer.getId(), customer.getId()); @@ -101,20 +101,20 @@ public class CachedBeanDataSerializeTest extends BaseTestCase { bean.setContent(stringContent.getBytes("UTF-8")); BeanDescriptor desc = getBeanDescriptor(TBytesOnly.class); - CachedBeanData extract = CachedBeanDataFromBean.extract(desc, (EntityBean)bean); + CachedBeanData extract = CachedBeanDataFromBean.extract(desc, (EntityBean) bean); ByteArrayOutputStream os = new ByteArrayOutputStream(); writeToStream(extract, os); byte[] bytes = os.toByteArray(); CachedBeanData read = readFromStream(bytes); - byte[] extraContent = (byte[])extract.getData("content"); + byte[] extraContent = (byte[]) extract.getData("content"); assertEquals(stringContent, new String(extraContent)); assertTrue(Arrays.equals(bean.getContent(), extraContent)); - TBytesOnly loadBean= new TBytesOnly(); - CachedBeanDataToBean.load(desc, (EntityBean)loadBean, read, new DefaultPersistenceContext()); + TBytesOnly loadBean = new TBytesOnly(); + CachedBeanDataToBean.load(desc, (EntityBean) loadBean, read, new DefaultPersistenceContext()); assertEquals(loadBean.getId(), bean.getId()); assertTrue(Arrays.equals(loadBean.getContent(), bean.getContent())); @@ -124,7 +124,7 @@ public class CachedBeanDataSerializeTest extends BaseTestCase { ByteArrayInputStream is = new ByteArrayInputStream(bytes); ObjectInputStream ois = new ObjectInputStream(is); - return (CachedBeanData)ois.readObject(); + return (CachedBeanData) ois.readObject(); } private void writeToStream(CachedBeanData extract, ByteArrayOutputStream os) throws IOException { @@ -135,4 +135,4 @@ public class CachedBeanDataSerializeTest extends BaseTestCase { oos.close(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java b/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java index d0cbd1052..45f99062a 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java +++ b/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultCacheHolder_getCacheOptions_Test.java @@ -7,7 +7,7 @@ import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.Product; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class DefaultCacheHolder_getCacheOptions_Test { @@ -49,4 +49,4 @@ public class DefaultCacheHolder_getCacheOptions_Test { ServerCacheOptions options = cacheHolder.getCacheOptions(Order.class.getName(), ServerCacheType.QUERY); assertEquals(options.getMaxSecsToLive(), 120); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheTest.java b/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheTest.java index 5d84632dc..40f7ad26d 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCacheTest.java @@ -3,7 +3,7 @@ package com.avaje.ebeaninternal.server.cache; import com.avaje.ebean.cache.ServerCacheOptions; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class DefaultServerCacheTest { @@ -85,4 +85,4 @@ public class DefaultServerCacheTest { assertEquals(cache.trimFrequency, 42); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java b/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java index 9706c95a0..788125f93 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java @@ -26,7 +26,7 @@ public class DefaultServerCache_RunEvictionTest { private final Random random = new Random(); - public DefaultServerCache_RunEvictionTest(){ + public DefaultServerCache_RunEvictionTest() { this.cache = createCache(); } @@ -46,14 +46,14 @@ public class DefaultServerCache_RunEvictionTest { private void doStuff() { for (int i = 0; i < 500; i++) { - String key = ""+random.nextInt(20000); + String key = "" + random.nextInt(20000); int mode = random.nextInt(10); if (mode < 8) { cache.get(key); } else { - cache.put(key, key+"-"+System.currentTimeMillis()); + cache.put(key, key + "-" + System.currentTimeMillis()); } } } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java b/src/test/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java index 8386683b4..d71f60adc 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java @@ -10,10 +10,7 @@ import com.avaje.tests.model.basic.Customer; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class DefaultChangeLogRegisterTest extends BaseTestCase { @@ -26,17 +23,17 @@ public class DefaultChangeLogRegisterTest extends BaseTestCase { assertNull(register.getChangeFilter(Address.class)); ChangeLogFilter changeFilter = register.getChangeFilter(Customer.class); - DefaultChangeLogRegister.UpdateFilter updateFilter = (DefaultChangeLogRegister.UpdateFilter)changeFilter; + DefaultChangeLogRegister.UpdateFilter updateFilter = (DefaultChangeLogRegister.UpdateFilter) changeFilter; assertFalse(updateFilter.includeInserts); assertThat(updateFilter.updateProperties).containsExactly("name", "status"); changeFilter = register.getChangeFilter(Country.class); - DefaultChangeLogRegister.BasicFilter countryFilter = (DefaultChangeLogRegister.BasicFilter)changeFilter; + DefaultChangeLogRegister.BasicFilter countryFilter = (DefaultChangeLogRegister.BasicFilter) changeFilter; assertTrue(countryFilter.includeInserts); // use default setting changeFilter = register.getChangeFilter(Contact.class); - DefaultChangeLogRegister.BasicFilter contactFilter = (DefaultChangeLogRegister.BasicFilter)changeFilter; + DefaultChangeLogRegister.BasicFilter contactFilter = (DefaultChangeLogRegister.BasicFilter) changeFilter; assertTrue(contactFilter.includeInserts); } @@ -49,17 +46,17 @@ public class DefaultChangeLogRegisterTest extends BaseTestCase { assertNull(register.getChangeFilter(Address.class)); ChangeLogFilter changeFilter = register.getChangeFilter(Customer.class); - DefaultChangeLogRegister.UpdateFilter updateFilter = (DefaultChangeLogRegister.UpdateFilter)changeFilter; + DefaultChangeLogRegister.UpdateFilter updateFilter = (DefaultChangeLogRegister.UpdateFilter) changeFilter; assertFalse(updateFilter.includeInserts); assertThat(updateFilter.updateProperties).containsExactly("name", "status"); changeFilter = register.getChangeFilter(Country.class); - DefaultChangeLogRegister.BasicFilter countryFilter = (DefaultChangeLogRegister.BasicFilter)changeFilter; + DefaultChangeLogRegister.BasicFilter countryFilter = (DefaultChangeLogRegister.BasicFilter) changeFilter; assertTrue(countryFilter.includeInserts); // use default setting changeFilter = register.getChangeFilter(Contact.class); - DefaultChangeLogRegister.BasicFilter contactFilter = (DefaultChangeLogRegister.BasicFilter)changeFilter; + DefaultChangeLogRegister.BasicFilter contactFilter = (DefaultChangeLogRegister.BasicFilter) changeFilter; assertFalse(contactFilter.includeInserts); } @@ -70,7 +67,7 @@ public class DefaultChangeLogRegisterTest extends BaseTestCase { DefaultChangeLogRegister register = new DefaultChangeLogRegister(true); ChangeLogFilter changeFilter = register.getChangeFilter(ProductConfiguration.class); assertNotNull(changeFilter); - DefaultChangeLogRegister.BasicFilter basicFilter = (DefaultChangeLogRegister.BasicFilter)changeFilter; + DefaultChangeLogRegister.BasicFilter basicFilter = (DefaultChangeLogRegister.BasicFilter) changeFilter; assertTrue(basicFilter.includeInserts); } diff --git a/src/test/java/com/avaje/ebeaninternal/server/changelog/Helper.java b/src/test/java/com/avaje/ebeaninternal/server/changelog/Helper.java index bad5f5920..de37b64b9 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/changelog/Helper.java +++ b/src/test/java/com/avaje/ebeaninternal/server/changelog/Helper.java @@ -24,7 +24,7 @@ public class Helper { cs.setSource("myApp"); cs.setUserId("user234"); cs.setUserIpAddress("123.4.5.6"); - cs.getUserContext().put("someKey","user defined input"); + cs.getUserContext().put("someKey", "user defined input"); List changes = cs.getChanges(); @@ -41,7 +41,7 @@ public class Helper { values.put("name", new ValuePair("rob", null)); values.put("modified", new ValuePair(new Timestamp(System.currentTimeMillis()), null)); - BeanChange bean = new BeanChange("mytable", startId+1, ChangeType.INSERT, null); + BeanChange bean = new BeanChange("mytable", startId + 1, ChangeType.INSERT, null); bean.setValues(values); return bean; } @@ -55,14 +55,14 @@ public class Helper { values.put("modified", new ValuePair(new Timestamp(System.currentTimeMillis()), null)); - BeanChange bean = new BeanChange("mytable", startId+2, ChangeType.UPDATE, null); + BeanChange bean = new BeanChange("mytable", startId + 2, ChangeType.UPDATE, null); bean.setValues(values); return bean; } @NotNull private BeanChange createDelete(long startId) { - return new BeanChange("mytable", startId+3, ChangeType.DELETE, new HashMap<>()); + return new BeanChange("mytable", startId + 3, ChangeType.DELETE, new HashMap<>()); } } diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/BasicTypeConverterTest.java b/src/test/java/com/avaje/ebeaninternal/server/core/BasicTypeConverterTest.java index 4f061a77f..442e0c65f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/BasicTypeConverterTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/core/BasicTypeConverterTest.java @@ -2,7 +2,8 @@ package com.avaje.ebeaninternal.server.core; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class BasicTypeConverterTest { @@ -31,4 +32,4 @@ public class BasicTypeConverterTest { assertFalse(BasicTypeConverter.toBoolean("F", "T")); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java b/src/test/java/com/avaje/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java index 1a6569208..801a02b72 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/core/DefaultBackgroundExecutorTest.java @@ -5,26 +5,28 @@ import org.junit.Test; public class DefaultBackgroundExecutorTest { - @Test @Ignore + @Test + @Ignore public void shutdown_when_running_expect_waitAndNiceShutdown() throws Exception { DefaultBackgroundExecutor es = new DefaultBackgroundExecutor(1, 20, "test"); - es.execute(new RunFor(3000,"a")); - es.execute(new RunFor(3000,"b")); - es.execute(new RunFor(3000,"c")); + es.execute(new RunFor(3000, "a")); + es.execute(new RunFor(3000, "b")); + es.execute(new RunFor(3000, "c")); es.shutdown(); } - @Test @Ignore + @Test + @Ignore public void shutdown_when_rougeRunnable_expect_InterruptedException() throws Exception { DefaultBackgroundExecutor es = new DefaultBackgroundExecutor(1, 10, "test"); - es.execute(new RunFor(300000,"a")); - es.execute(new RunFor(3000,"b")); - es.execute(new RunFor(3000,"c")); + es.execute(new RunFor(300000, "a")); + es.execute(new RunFor(3000, "b")); + es.execute(new RunFor(3000, "c")); es.shutdown(); } @@ -51,4 +53,4 @@ public class DefaultBackgroundExecutorTest { } } } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java b/src/test/java/com/avaje/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java index d45ee0f5e..05cd0f840 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java @@ -69,14 +69,14 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { public void when_fetch_order_different_then_different() { assertDifferent(detail(query().select("id,name").fetch("details").fetch("customer")), - detail(query().select("id,name").fetch("customer").fetch("details"))); + detail(query().select("id,name").fetch("customer").fetch("details"))); } @Test public void when_extra_queryFetchToMany_then_same() { assertDifferent(detail(query().select("id,name").fetch("customer")), - detail(query().select("id,name").fetch("customer").fetch("details", new FetchConfig().query()))); + detail(query().select("id,name").fetch("customer").fetch("details", new FetchConfig().query()))); } @Test @@ -84,7 +84,7 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { // with the fetch of customer the foreign key must be added to the root query assertDifferent(detail(query().select("id,name")), - detail(query().select("id,name").fetch("customer", new FetchConfig().query()))); + detail(query().select("id,name").fetch("customer", new FetchConfig().query()))); } @Test @@ -98,15 +98,15 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { public void when_fetchConfig_then_differentPlan() throws Exception { DefaultOrmQuery query1 = (DefaultOrmQuery) Ebean.find(Order.class) - .select("status, shipDate") - .fetch("details", "orderQty, unitPrice", new FetchConfig().query()) - .fetch("details.product", "sku, name"); + .select("status, shipDate") + .fetch("details", "orderQty, unitPrice", new FetchConfig().query()) + .fetch("details.product", "sku, name"); DefaultOrmQuery query2 = (DefaultOrmQuery) Ebean.find(Order.class) - .select("status, shipDate") - .fetch("details", "orderQty, unitPrice") - .fetch("details.product", "sku, name"); + .select("status, shipDate") + .fetch("details", "orderQty, unitPrice") + .fetch("details.product", "sku, name"); assertDifferent(detail(query1), detail(query2)); } @@ -115,9 +115,9 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { public void testJoinOrder_when_fetchJoins_expect_detailJoinsPreserveOrder() { Query query = Ebean.find(Order.class) - .select("status, orderDate") - .fetch("customer", "name") - .fetch("details"); + .select("status, orderDate") + .fetch("customer", "name") + .fetch("details"); OrmQueryRequest queryRequest = queryRequest(query); OrmQueryDetail detail = queryRequest.getQuery().getDetail(); @@ -129,9 +129,9 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { public void testJoinOrder_when_fetchJoinsAndWhere_expect_fetchJoinsOnlyInFetchPaths() { Query query = Ebean.find(Order.class) - .select("status, orderDate") - .fetch("details") - .where().eq("customer.name", "rob").query(); + .select("status, orderDate") + .fetch("details") + .where().eq("customer.name", "rob").query(); OrmQueryRequest queryRequest = queryRequest(query); OrmQueryDetail detail = queryRequest.getQuery().getDetail(); @@ -143,9 +143,9 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { public void testJoinOrder_when_queryFetch_expect_getFetchPaths_doesNotIncludeQueryJoin() { Query query = Ebean.find(Order.class) - .select("status, orderDate") - .fetch("customer", "name") - .fetch("details", new FetchConfig().query()); + .select("status, orderDate") + .fetch("customer", "name") + .fetch("details", new FetchConfig().query()); OrmQueryRequest queryRequest = queryRequest(query); OrmQueryDetail detail = queryRequest.getQuery().getDetail(); @@ -157,9 +157,9 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { public void testJoinOrder_when_queryFetch_expect_getFetchPaths_doesNotIncludeQueryJoin_via_fetchQuery() { Query query = Ebean.find(Order.class) - .select("status, orderDate") - .fetch("customer", "name") - .fetchQuery("details"); + .select("status, orderDate") + .fetch("customer", "name") + .fetchQuery("details"); OrmQueryRequest queryRequest = queryRequest(query); OrmQueryDetail detail = queryRequest.getQuery().getDetail(); @@ -171,9 +171,9 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { public void testJoinOrder_when_lazyFetch_expect_getFetchPaths_doesNotIncludeQueryJoin() { Query query = Ebean.find(Order.class) - .select("status, orderDate") - .fetch("customer", "name") - .fetch("details", new FetchConfig().lazy()); + .select("status, orderDate") + .fetch("customer", "name") + .fetch("details", new FetchConfig().lazy()); OrmQueryRequest queryRequest = queryRequest(query); OrmQueryDetail detail = queryRequest.getQuery().getDetail(); @@ -185,9 +185,9 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { public void testJoinOrder_when_lazyFetch_expect_getFetchPaths_doesNotIncludeQueryJoin_via_fetchLazy() { Query query = Ebean.find(Order.class) - .select("status, orderDate") - .fetch("customer", "name") - .fetchLazy("details"); + .select("status, orderDate") + .fetch("customer", "name") + .fetchLazy("details"); OrmQueryRequest queryRequest = queryRequest(query); OrmQueryDetail detail = queryRequest.getQuery().getDetail(); @@ -199,10 +199,10 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { public void testJoinOrder_when_lazyFetchAndHasChildren_expect_getFetchPaths_doesNotIncludeJoinOrChild() { Query query = Ebean.find(Order.class) - .select("status, orderDate") - .fetch("customer", "name") - .fetch("details", new FetchConfig().lazy()) - .fetch("details.product"); + .select("status, orderDate") + .fetch("customer", "name") + .fetch("details", new FetchConfig().lazy()) + .fetch("details.product"); OrmQueryRequest queryRequest = queryRequest(query); OrmQueryDetail detail = queryRequest.getQuery().getDetail(); @@ -214,10 +214,10 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { public void testJoinOrder_when_fetchMany_expect_getFetchPaths_containsAllInOrder() { Query query = Ebean.find(Order.class) - .select("status, orderDate") - .fetch("details") - .fetch("details.product") - .fetch("customer", "name"); + .select("status, orderDate") + .fetch("details") + .fetch("details.product") + .fetch("customer", "name"); OrmQueryRequest queryRequest = queryRequest(query); OrmQueryDetail detail = queryRequest.getQuery().getDetail(); @@ -229,10 +229,10 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { public void testJoinOrder_when_queryJoin_expect_getFetchPaths_excludesQueryJoinAndChildren() { Query query = Ebean.find(Order.class) - .select("status, orderDate") - .fetch("details", new FetchConfig().query()) - .fetch("details.product") - .fetch("customer", "name"); + .select("status, orderDate") + .fetch("details", new FetchConfig().query()) + .fetch("details.product") + .fetch("customer", "name"); OrmQueryRequest queryRequest = queryRequest(query); OrmQueryDetail detail = queryRequest.getQuery().getDetail(); @@ -244,10 +244,10 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { public void test_removeJoinToMany_when_multipleManyPaths() { Query query = Ebean.find(Order.class) - .fetch("details") - .fetch("details.product") - .fetch("customer") - .fetch("customer.contacts"); // second many path + .fetch("details") + .fetch("details.product") + .fetch("customer") + .fetch("customer.contacts"); // second many path OrmQueryRequest queryRequest = queryRequest(query); OrmQueryDetail detail = queryRequest.getQuery().getDetail(); @@ -259,11 +259,11 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { public void test_removeAllJoinToMany_when_firstRow() { Query query = Ebean.find(Order.class) - .setFirstRow(1) - .fetch("details") // many path - .fetch("details.product") - .fetch("customer") - .fetch("customer.contacts"); // many path + .setFirstRow(1) + .fetch("details") // many path + .fetch("details.product") + .fetch("customer") + .fetch("customer.contacts"); // many path OrmQueryRequest queryRequest = queryRequest(query); OrmQueryDetail detail = queryRequest.getQuery().getDetail(); @@ -275,11 +275,11 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { public void test_removeAllJoinToMany_when_maxRows() { Query query = Ebean.find(Order.class) - .setMaxRows(1) - .fetch("details") // many path - .fetch("details.product") - .fetch("customer") - .fetch("customer.contacts"); // many path + .setMaxRows(1) + .fetch("details") // many path + .fetch("details.product") + .fetch("customer") + .fetch("customer.contacts"); // many path OrmQueryRequest queryRequest = queryRequest(query); OrmQueryDetail detail = queryRequest.getQuery().getDetail(); @@ -291,12 +291,12 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { public void test_removeJoinToMany_when_filterMany() { Query query = Ebean.find(Order.class) - .fetch("details") - .fetch("details.product") - .fetch("customer") - .fetch("customer.contacts") - .filterMany("details").eq("orderQuantity", 10) - .query(); + .fetch("details") + .fetch("details.product") + .fetch("customer") + .fetch("customer.contacts") + .filterMany("details").eq("orderQuantity", 10) + .query(); OrmQueryRequest queryRequest = queryRequest(query); OrmQueryDetail detail = queryRequest.getQuery().getDetail(); @@ -313,4 +313,4 @@ public class DefaultServer_createOrmQueryRequestTest extends BaseTestCase { assertThat(detail1.isSameByPlan(detail2)).isFalse(); assertThat(detail1.queryPlanHash()).isNotEqualTo(detail2.queryPlanHash()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpInsertSimple.java b/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpInsertSimple.java index 2c5bc082a..94b99b5b2 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpInsertSimple.java +++ b/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpInsertSimple.java @@ -17,9 +17,7 @@ import java.sql.Timestamp; import java.util.Map; import java.util.Set; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class TestDiffHelpInsertSimple extends BaseTestCase { diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpInsertWithEmbedded.java b/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpInsertWithEmbedded.java index 3de19e019..100bb015b 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpInsertWithEmbedded.java +++ b/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpInsertWithEmbedded.java @@ -13,9 +13,7 @@ import org.junit.Test; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.*; public class TestDiffHelpInsertWithEmbedded extends BaseTestCase { diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpSimple.java b/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpSimple.java index f39f3b86f..c53139b1b 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpSimple.java +++ b/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpSimple.java @@ -1,13 +1,5 @@ package com.avaje.ebeaninternal.server.core; -import java.sql.Date; -import java.sql.Timestamp; -import java.util.Map; -import java.util.Set; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; @@ -17,21 +9,28 @@ import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.Order.Status; +import org.junit.Assert; +import org.junit.Test; + +import java.sql.Date; +import java.sql.Timestamp; +import java.util.Map; +import java.util.Set; public class TestDiffHelpSimple extends BaseTestCase { - long firstTime = System.currentTimeMillis()-10000; + long firstTime = System.currentTimeMillis() - 10000; long secondTime = System.currentTimeMillis(); EbeanServer server; BeanDescriptor orderDesc; - + public TestDiffHelpSimple() { server = Ebean.getServer(null); - SpiEbeanServer spiServer = (SpiEbeanServer)server; + SpiEbeanServer spiServer = (SpiEbeanServer) server; orderDesc = spiServer.getBeanDescriptor(Order.class); } - + private Order createBaseOrder(EbeanServer server) { Order order1 = new Order(); order1.setId(12); @@ -42,13 +41,13 @@ public class TestDiffHelpSimple extends BaseTestCase { order1.setOrderDate(new Date(firstTime)); return order1; } - + @Test public void testBasicChanges() { - - + + Order order1 = createBaseOrder(server); - + Order order2 = new Order(); order2.setId(14); order2.setCretime(new Timestamp(secondTime)); @@ -56,11 +55,11 @@ public class TestDiffHelpSimple extends BaseTestCase { order2.setStatus(Status.COMPLETE); order2.setShipDate(new Date(secondTime)); order2.setOrderDate(new Date(secondTime)); - + Map diff = DiffHelp.diff(order1, order2, orderDesc); - + Assert.assertEquals(5, diff.size()); - + Set keySet = diff.keySet(); Assert.assertTrue(keySet.contains("cretime")); Assert.assertTrue(keySet.contains("status")); @@ -99,74 +98,74 @@ public class TestDiffHelpSimple extends BaseTestCase { @Test public void testIdIgnored() { - + Order order1 = createBaseOrder(server); Order order2 = createBaseOrder(server); order2.setId(14); - + Map diff = DiffHelp.diff(order1, order2, orderDesc); - - Assert.assertEquals(0, diff.size()); + + Assert.assertEquals(0, diff.size()); } - + @Test public void testSecondValueNull() { - + Order order1 = createBaseOrder(server); - + Order order2 = createBaseOrder(server); order2.setCustomer(server.getReference(Customer.class, 2133)); order2.setStatus(Status.COMPLETE); order2.setShipDate(null); - + Map diff = DiffHelp.diff(order1, order2, orderDesc); - + Assert.assertEquals(3, diff.size()); - + Set keySet = diff.keySet(); Assert.assertTrue(keySet.contains("status")); Assert.assertTrue(keySet.contains("customer.id")); Assert.assertTrue(keySet.contains("shipDate")); - + ValuePair shipDatePair = diff.get("shipDate"); - Assert.assertEquals(order1.getShipDate(),shipDatePair.getNewValue()); - Assert.assertEquals(order2.getShipDate(),shipDatePair.getOldValue()); + Assert.assertEquals(order1.getShipDate(), shipDatePair.getNewValue()); + Assert.assertEquals(order2.getShipDate(), shipDatePair.getOldValue()); Assert.assertNull(shipDatePair.getOldValue()); } - - + + @Test public void testFirstValueNull() { - + Order order1 = createBaseOrder(server); order1.setShipDate(null); - - Order order2 = createBaseOrder(server); + + Order order2 = createBaseOrder(server); order2.setShipDate(new Date(secondTime)); - + Map diff = DiffHelp.diff(order1, order2, orderDesc); - - Assert.assertEquals(1, diff.size()); + + Assert.assertEquals(1, diff.size()); Set keySet = diff.keySet(); Assert.assertTrue(keySet.contains("shipDate")); - + ValuePair shipDatePair = diff.get("shipDate"); - Assert.assertEquals(order1.getShipDate(),shipDatePair.getNewValue()); - Assert.assertEquals(order2.getShipDate(),shipDatePair.getOldValue()); + Assert.assertEquals(order1.getShipDate(), shipDatePair.getNewValue()); + Assert.assertEquals(order2.getShipDate(), shipDatePair.getOldValue()); Assert.assertNull(shipDatePair.getNewValue()); } - + @Test public void testBothNull() { - + Order order1 = createBaseOrder(server); order1.setShipDate(null); - - Order order2 = createBaseOrder(server); + + Order order2 = createBaseOrder(server); order2.setShipDate(null); - + Map diff = DiffHelp.diff(order1, order2, orderDesc); - - Assert.assertEquals(0, diff.size()); + + Assert.assertEquals(0, diff.size()); } } diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java b/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java index 328d0b482..b7001ac1f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java +++ b/src/test/java/com/avaje/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java @@ -1,10 +1,5 @@ package com.avaje.ebeaninternal.server.core; -import java.util.Map; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; @@ -13,57 +8,61 @@ import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.tests.model.embedded.EMain; import com.avaje.tests.model.embedded.Eembeddable; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Map; public class TestDiffHelpWithEmbedded extends BaseTestCase { EbeanServer server; BeanDescriptor emainDesc; - + public TestDiffHelpWithEmbedded() { server = Ebean.getServer(null); - SpiEbeanServer spiServer = (SpiEbeanServer)server; + SpiEbeanServer spiServer = (SpiEbeanServer) server; emainDesc = spiServer.getBeanDescriptor(EMain.class); } - + @Test public void testChangeExistingEmbedded() { - + EMain emain1 = createEMain(); EMain emain2 = createEMain(); - + emain2.getEmbeddable().setDescription("baz"); - + Map diff = DiffHelp.diff(emain1, emain2, emainDesc); Assert.assertEquals(1, diff.size()); ValuePair valuePair = diff.get("embeddable.description"); - + Assert.assertNotNull(valuePair); - Assert.assertEquals("bar",valuePair.getNewValue()); - Assert.assertEquals("baz",valuePair.getOldValue()); + Assert.assertEquals("bar", valuePair.getNewValue()); + Assert.assertEquals("baz", valuePair.getOldValue()); } - + /** * Same result as testChangeExistingEmbedded. */ @Test public void testSetViaNewEmbedded() { - + EMain emain1 = createEMain(); EMain emain2 = createEMain(); - + Eembeddable embeddable = new Eembeddable(); embeddable.setDescription("baz"); emain2.setEmbeddable(embeddable); - - + + Map diff = DiffHelp.diff(emain1, emain2, emainDesc); Assert.assertEquals(1, diff.size()); ValuePair valuePair = diff.get("embeddable.description"); - + Assert.assertNotNull(valuePair); - Assert.assertEquals("bar",valuePair.getNewValue()); - Assert.assertEquals("baz",valuePair.getOldValue()); + Assert.assertEquals("bar", valuePair.getNewValue()); + Assert.assertEquals("baz", valuePair.getOldValue()); } @Test @@ -78,37 +77,37 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { ValuePair valuePair = diff.get("embeddable.description"); Assert.assertNotNull(valuePair); - Assert.assertEquals("bar",valuePair.getNewValue()); - Assert.assertEquals("baz",valuePair.getOldValue()); + Assert.assertEquals("bar", valuePair.getNewValue()); + Assert.assertEquals("baz", valuePair.getOldValue()); } @Test public void testFirstEmbeddedIsNull() { - + EMain emain1 = createEMain(); emain1.setEmbeddable(null); EMain emain2 = createEMain(); - + Map diff = DiffHelp.diff(emain1, emain2, emainDesc); Assert.assertEquals(1, diff.size()); ValuePair valuePair = diff.get("embeddable.description"); - + Assert.assertNotNull(valuePair); Assert.assertNull(valuePair.getNewValue()); Assert.assertEquals("bar", valuePair.getOldValue()); } - + @Test public void testSecondEmbeddedIsNull() { - + EMain emain1 = createEMain(); EMain emain2 = createEMain(); emain2.setEmbeddable(null); - + Map diff = DiffHelp.diff(emain1, emain2, emainDesc); Assert.assertEquals(1, diff.size()); ValuePair valuePair = diff.get("embeddable.description"); - + Assert.assertNotNull(valuePair); Assert.assertNull(valuePair.getOldValue()); Assert.assertEquals("bar", valuePair.getNewValue()); @@ -132,27 +131,27 @@ public class TestDiffHelpWithEmbedded extends BaseTestCase { @Test public void testBothEmbeddedIsNull() { - + EMain emain1 = createEMain(); emain1.setEmbeddable(null); EMain emain2 = createEMain(); emain2.setEmbeddable(null); - + Map diff = DiffHelp.diff(emain1, emain2, emainDesc); Assert.assertEquals(0, diff.size()); } private EMain createEMain() { - + EMain emain = new EMain(); emain.setName("foo"); emain.setVersion(13l); - + Eembeddable embeddable = new Eembeddable(); embeddable.setDescription("bar"); emain.setEmbeddable(embeddable); - + return emain; } - + } diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/bootup/DistillPackagesTest.java b/src/test/java/com/avaje/ebeaninternal/server/core/bootup/DistillPackagesTest.java index b96ea9bd7..42d74df56 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/core/bootup/DistillPackagesTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/core/bootup/DistillPackagesTest.java @@ -1,8 +1,10 @@ package com.avaje.ebeaninternal.server.core.bootup; import org.junit.Test; + import java.util.Arrays; import java.util.List; + import static org.assertj.core.api.Assertions.assertThat; public class DistillPackagesTest { @@ -39,7 +41,7 @@ public class DistillPackagesTest { @Test public void when_unordered_expect_naturalOrder() throws Exception { - List distill = DistillPackages.distill(group("z.x.y","two"), group("one", "one.sub.me")); + List distill = DistillPackages.distill(group("z.x.y", "two"), group("one", "one.sub.me")); assertThat(distill).containsExactly("one", "two", "z.x.y"); } @@ -47,4 +49,4 @@ public class DistillPackagesTest { return Arrays.asList(packages); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanCascadeInfoTest.java b/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanCascadeInfoTest.java index cd9ff6809..67b6ed937 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanCascadeInfoTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanCascadeInfoTest.java @@ -4,7 +4,8 @@ import org.junit.Test; import javax.persistence.CascadeType; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class BeanCascadeInfoTest { @@ -78,4 +79,4 @@ public class BeanCascadeInfoTest { assertFalse(info.isRefresh()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorTest.java b/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorTest.java index b01379ed2..c1f42db66 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorTest.java @@ -61,10 +61,10 @@ public class BeanDescriptorTest extends BaseTestCase { from.setName("rob"); Customer to = new Customer(); - customerDesc.merge((EntityBean)from, (EntityBean)to); + customerDesc.merge((EntityBean) from, (EntityBean) to); assertThat(to.getId()).isEqualTo(42); assertThat(to.getName()).isEqualTo("rob"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java b/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java index b33d422cb..e78e0a813 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java @@ -44,10 +44,10 @@ public class BeanDescriptor_documentMappingTest extends BaseTestCase { class TDVisitor extends DocPropertyAdapter { StringBuilder sb = new StringBuilder(); - + @Override public void visitProperty(DocPropertyMapping property) { - sb.append(property.getName()+","); + sb.append(property.getName() + ","); } @Override @@ -63,7 +63,7 @@ public class BeanDescriptor_documentMappingTest extends BaseTestCase { @Override public void visitBeginObject(DocPropertyMapping property) { - sb.append(" object{"+property.getName()+":"); + sb.append(" object{" + property.getName() + ":"); } @Override @@ -73,7 +73,7 @@ public class BeanDescriptor_documentMappingTest extends BaseTestCase { @Override public void visitBeginList(DocPropertyMapping property) { - sb.append(" nested{"+property.getName()+": ["); + sb.append(" nested{" + property.getName() + ": ["); } @Override @@ -82,4 +82,4 @@ public class BeanDescriptor_documentMappingTest extends BaseTestCase { } } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java b/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java index 8bfc3bb6a..7803284f1 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java @@ -9,10 +9,7 @@ import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.tests.model.basic.EBasic; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class BeanDescriptor_registerTest { @@ -29,7 +26,7 @@ public class BeanDescriptor_registerTest { config.setDefaultServer(false); config.getClasses().add(EBasic.class); - SpiEbeanServer ebeanServer = (SpiEbeanServer)EbeanServerFactory.create(config); + SpiEbeanServer ebeanServer = (SpiEbeanServer) EbeanServerFactory.create(config); BeanDescriptor desc = ebeanServer.getBeanDescriptor(EBasic.class); persistListenerRegistrationTests(desc); @@ -50,10 +47,10 @@ public class BeanDescriptor_registerTest { assertEquals(2, ((ChainedBeanPersistController) desc.getPersistController()).size()); desc.deregister(controller1); - assertEquals(1, ((ChainedBeanPersistController)desc.getPersistController()).size()); + assertEquals(1, ((ChainedBeanPersistController) desc.getPersistController()).size()); desc.deregister(controller2); - assertEquals(0, ((ChainedBeanPersistController)desc.getPersistController()).size()); + assertEquals(0, ((ChainedBeanPersistController) desc.getPersistController()).size()); } private void persistListenerRegistrationTests(BeanDescriptor desc) { @@ -72,10 +69,10 @@ public class BeanDescriptor_registerTest { assertEquals(2, ((ChainedBeanPersistListener) persistListener).size()); desc.deregister(listener1); - assertEquals(1, ((ChainedBeanPersistListener)desc.getPersistListener()).size()); + assertEquals(1, ((ChainedBeanPersistListener) desc.getPersistListener()).size()); desc.deregister(listener2); - assertEquals(0, ((ChainedBeanPersistListener)desc.getPersistListener()).size()); + assertEquals(0, ((ChainedBeanPersistListener) desc.getPersistListener()).size()); } public static class Listener1 extends AbstractBeanPersistListener { @@ -111,4 +108,4 @@ public class BeanDescriptor_registerTest { return EBasic.class.isAssignableFrom(cls); } } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java b/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java index f9c3e9195..9a6e07b5f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java @@ -17,19 +17,19 @@ public class BeanDescriptor_whenCreatedPropertyTest extends BaseTestCase { @Test public void test() { - SpiEbeanServer server = (SpiEbeanServer)Ebean.getDefaultServer(); + SpiEbeanServer server = (SpiEbeanServer) Ebean.getDefaultServer(); BeanDescriptor desc = server.getBeanDescriptor(Customer.class); BeanProperty whenCreatedProperty = desc.getWhenCreatedProperty(); - assertEquals("cretime",whenCreatedProperty.getDbColumn()); + assertEquals("cretime", whenCreatedProperty.getDbColumn()); BeanProperty whenModifiedProperty = desc.getWhenModifiedProperty(); - assertEquals("updtime",whenModifiedProperty.getDbColumn()); + assertEquals("updtime", whenModifiedProperty.getDbColumn()); BeanDescriptor eBasicDesc = server.getBeanDescriptor(EBasic.class); assertNull(eBasicDesc.getWhenCreatedProperty()); assertNull(eBasicDesc.getWhenModifiedProperty()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java index faf9f50ac..273f11793 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java @@ -3,7 +3,6 @@ package com.avaje.ebeaninternal.server.deploy; import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.bean.BeanCollection; import com.avaje.ebean.bean.EntityBean; -import com.avaje.tests.model.basic.Contact; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; import org.junit.Test; @@ -12,9 +11,7 @@ import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class BeanPropertyAssocManyTest extends BaseTestCase { @@ -22,7 +19,7 @@ public class BeanPropertyAssocManyTest extends BaseTestCase { BeanDescriptor customerDesc = spiEbeanServer().getBeanDescriptor(Customer.class); BeanPropertyAssocMany contacts() { - return (BeanPropertyAssocMany)customerDesc.getBeanProperty("contacts"); + return (BeanPropertyAssocMany) customerDesc.getBeanProperty("contacts"); } @Test @@ -63,4 +60,4 @@ public class BeanPropertyAssocManyTest extends BaseTestCase { assertThat(contactIdsForOne).isNotEmpty(); assertThat(contactIdsForMultiple).isNotEmpty(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java b/src/test/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java index c2a2dfa7a..b1251d555 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java +++ b/src/test/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java @@ -1,25 +1,25 @@ package com.avaje.ebeaninternal.server.deploy; -import java.util.HashMap; -import java.util.Map; - import org.junit.Assert; import org.junit.Test; +import java.util.HashMap; +import java.util.Map; + public class DeployPropertyParserMapTests { @Test public void test_like_escape() { - - + + Map map = new HashMap<>(); map.put("customer.name", "t1.name"); map.put("id", "t0.id"); - + DeployPropertyParserMap parser = new DeployPropertyParserMap(map); - + String output = parser.parse("(lower(customer.name) like ? escape'' or id > ?)"); Assert.assertEquals("(lower(t1.name) like ? escape'' or t0.id > ?)", output); } - + } diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/src/test/java/com/avaje/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java index 0d6b90405..eda5c7373 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java +++ b/src/test/java/com/avaje/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java @@ -15,52 +15,49 @@ import org.junit.Test; import java.sql.Timestamp; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class TestBeanDescriptorHasIdProperty extends BaseTestCase { SpiEbeanServer spiServer; - + public TestBeanDescriptorHasIdProperty() { EbeanServer server = Ebean.getServer(null); - spiServer = (SpiEbeanServer)server; + spiServer = (SpiEbeanServer) server; } - + @Test public void testHasId() { - + BeanDescriptor beanDescriptor = spiServer.getBeanDescriptor(Order.class); assertNotNull(beanDescriptor.getIdProperty()); assertEquals("id", beanDescriptor.getIdProperty().getName()); - + assertNotNull(beanDescriptor.getVersionProperty()); assertEquals("updtime", beanDescriptor.getVersionProperty().getName()); - + Order order = new Order(); - + assertFalse(beanDescriptor.hasIdValue(entityBean(order))); assertFalse(beanDescriptor.hasVersionProperty(getIntercept(order))); - + order.setId(23); order.setUpdtime(new Timestamp(System.currentTimeMillis())); assertTrue(beanDescriptor.hasIdValue(entityBean(order))); assertTrue(beanDescriptor.hasVersionProperty(getIntercept(order))); - + } @Test public void testIsReference() { - + BeanDescriptor beanDescriptor = spiServer.getBeanDescriptor(Customer.class); - + Customer order = new Customer(); EntityBeanIntercept ebi = getIntercept(order); assertFalse(beanDescriptor.hasIdPropertyOnly(ebi)); - + order.setId(23); assertTrue(beanDescriptor.hasIdPropertyOnly(ebi)); @@ -91,23 +88,23 @@ public class TestBeanDescriptorHasIdProperty extends BaseTestCase { BeanDescriptor rcustDesc = spiServer.getBeanDescriptor(RCustomer.class); - Map idForJson = (Map)rcustDesc.getIdForJson(rCustomer); - assertEquals("comp",idForJson.get("company")); - assertEquals("fred",idForJson.get("name")); + Map idForJson = (Map) rcustDesc.getIdForJson(rCustomer); + assertEquals("comp", idForJson.get("company")); + assertEquals("fred", idForJson.get("name")); assertEquals(2, idForJson.size()); - RCustomerKey keyVal = (RCustomerKey)rcustDesc.convertIdFromJson(idForJson); - assertEquals("comp",keyVal.getCompany()); - assertEquals("fred",keyVal.getName()); + RCustomerKey keyVal = (RCustomerKey) rcustDesc.convertIdFromJson(idForJson); + assertEquals("comp", keyVal.getCompany()); + assertEquals("fred", keyVal.getName()); } private EntityBean entityBean(Object bean) { - return (EntityBean)bean; + return (EntityBean) bean; } private EntityBeanIntercept getIntercept(Object bean) { - return ((EntityBean)bean)._ebean_getIntercept(); + return ((EntityBean) bean)._ebean_getIntercept(); } - + } diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java b/src/test/java/com/avaje/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java index dd2922574..00c602947 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java +++ b/src/test/java/com/avaje/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java @@ -1,10 +1,5 @@ package com.avaje.ebeaninternal.server.deploy; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.bean.BeanCollection; @@ -13,30 +8,34 @@ import com.avaje.ebean.bean.EntityBeanIntercept; import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.tests.model.basic.Contact; import com.avaje.tests.model.basic.Customer; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestCollectionLoadedStatus extends BaseTestCase { @Test public void test() { - - SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null); + + SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); BeanDescriptor custDesc = server.getBeanDescriptor(Customer.class); - + Customer customer = new Customer(); - EntityBean eb = (EntityBean)customer; + EntityBean eb = (EntityBean) customer; EntityBeanIntercept ebi = eb._ebean_getIntercept(); - + BeanProperty contactsProperty = custDesc.getBeanProperty("contacts"); Assert.assertFalse(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); - + Object contactsViaInternal = contactsProperty.getValue(eb); Assert.assertNull(contactsViaInternal); Assert.assertFalse(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); - + List contacts = customer.getContacts(); Assert.assertNotNull(contacts); Assert.assertTrue(contacts instanceof BeanCollection); Assert.assertTrue(ebi.isLoadedProperty(contactsProperty.getPropertyIndex())); } - + } diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java b/src/test/java/com/avaje/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java index e0f7d5d06..4b15049d9 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java +++ b/src/test/java/com/avaje/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java @@ -19,22 +19,22 @@ public class TestNotEnhancedMappedSuper extends BaseTestCase { Ebean.save(bean); Assert.assertNotNull(bean.getId()); - + bean.setName("junk mod"); Ebean.save(bean); - + ASimpleBean fetched = Ebean.find(ASimpleBean.class, bean.getId()); Assert.assertEquals("junk mod", fetched.getName()); Assert.assertEquals(bean.getName(), fetched.getName()); - + Ebean.delete(bean); ASimpleBean fetched2 = Ebean.find(ASimpleBean.class, bean.getId()); Assert.assertNull(fetched2); - + NotEnhancedMappedSuper mappedSuper = new NotEnhancedMappedSuper(); boolean enhanced = (mappedSuper instanceof EntityBean); Assert.assertFalse(enhanced); - + } - + } diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java b/src/test/java/com/avaje/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java index f3fd14694..5e62a1e3d 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java +++ b/src/test/java/com/avaje/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java @@ -1,15 +1,14 @@ package com.avaje.ebeaninternal.server.deploy; -import java.util.Set; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.BeanState; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Set; public class TestReferenceWithConstructorProperties extends BaseTestCase { @@ -18,21 +17,21 @@ public class TestReferenceWithConstructorProperties extends BaseTestCase { */ @Test public void test() { - + ResetBasicData.reset(); Order order = Ebean.getReference(Order.class, 1); BeanState beanState = Ebean.getBeanState(order); Set loadedProps = beanState.getLoadedProps(); - + Assert.assertEquals(1, loadedProps.size()); Assert.assertTrue(beanState.isReference()); // read the status invokes lazy loading order.getStatus(); - + Assert.assertFalse(beanState.isReference()); } - + } diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java b/src/test/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java index a2293efa7..5ff3b7741 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java @@ -9,7 +9,7 @@ import java.time.Instant; import java.time.LocalDateTime; import java.time.OffsetDateTime; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; public class UpdateTimestampFactoryTest { @@ -65,4 +65,4 @@ public class UpdateTimestampFactoryTest { Object value = generatedProperty.getInsertValue(null, null, System.currentTimeMillis()); assertTrue(value instanceof java.util.Date); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpressionTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpressionTest.java index 9321e9811..efd439120 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpressionTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/AllEqualsExpressionTest.java @@ -95,24 +95,24 @@ public class AllEqualsExpressionTest { } AllEqualsExpression exp(String key0, Object val1) { - LinkedHashMap map = new LinkedHashMap<>(); + LinkedHashMap map = new LinkedHashMap<>(); map.put(key0, val1); return exp(map); } AllEqualsExpression exp(String key0, Object val1, String key2, Object val2) { - LinkedHashMap map = new LinkedHashMap<>(); + LinkedHashMap map = new LinkedHashMap<>(); map.put(key0, val1); map.put(key2, val2); return exp(map); } AllEqualsExpression exp(String key0, Object val1, String key2, Object val2, String key3, Object val3) { - LinkedHashMap map = new LinkedHashMap<>(); + LinkedHashMap map = new LinkedHashMap<>(); map.put(key0, val1); map.put(key2, val2); map.put(key3, val3); return exp(map); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpressionTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpressionTest.java index 934dfb00a..bf62014f3 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpressionTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExampleExpressionTest.java @@ -33,19 +33,19 @@ public class DefaultExampleExpressionTest extends BaseTestCase { DefaultExampleExpression exp() { Customer customer = customer(); - return new DefaultExampleExpression((EntityBean)customer, false, LikeType.EQUAL_TO); + return new DefaultExampleExpression((EntityBean) customer, false, LikeType.EQUAL_TO); } DefaultExampleExpression expExtra() { Customer customer = customer(); customer.setSmallnote("smallNote"); - return new DefaultExampleExpression((EntityBean)customer, false, LikeType.EQUAL_TO); + return new DefaultExampleExpression((EntityBean) customer, false, LikeType.EQUAL_TO); } DefaultExampleExpression expDiffName() { Customer customer = customer(); customer.setName("otherName"); - return new DefaultExampleExpression((EntityBean)customer, false, LikeType.EQUAL_TO); + return new DefaultExampleExpression((EntityBean) customer, false, LikeType.EQUAL_TO); } BeanDescriptor customerBeanDescriptor() { @@ -54,7 +54,7 @@ public class DefaultExampleExpressionTest extends BaseTestCase { DefaultExampleExpression prepare(DefaultExampleExpression expr) { - SpiQuery query = (SpiQuery)spiEbeanServer().find(Customer.class); + SpiQuery query = (SpiQuery) spiEbeanServer().find(Customer.class); BeanQueryRequest request = create(query); expr.containsMany(customerBeanDescriptor(), new ManyWhereJoins()); expr.prepareExpression(request); @@ -83,8 +83,8 @@ public class DefaultExampleExpressionTest extends BaseTestCase { ResetBasicData.reset(); Query query1 = server().find(Customer.class) - .where().exampleLike(customer) - .query(); + .where().exampleLike(customer) + .query(); query1.findList(); @@ -121,4 +121,4 @@ public class DefaultExampleExpressionTest extends BaseTestCase { assertThat(prepare(expExtra()).isSameByPlan(prepare(exp()))).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionListTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionListTest.java index eb848e91f..e0cce5945 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionListTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionListTest.java @@ -14,56 +14,56 @@ public class DefaultExpressionListTest { } DefaultExpressionList spi(ExpressionList list) { - return (DefaultExpressionList)list; + return (DefaultExpressionList) list; } @Test public void isSameByPlan_when_same() { assertThat(spi(exp().eq("a", 10).eq("b", 20)) - .isSameByPlan(spi(exp().eq("a", 10).eq("b", 20)))).isTrue(); + .isSameByPlan(spi(exp().eq("a", 10).eq("b", 20)))).isTrue(); } @Test public void isSameByPlan_when_diffExpressionType() { assertThat(spi(exp().eq("a", 10).eq("b", 20)) - .isSameByPlan(new NoopExpression())).isFalse(); + .isSameByPlan(new NoopExpression())).isFalse(); } @Test public void isSameByPlan_when_less() { assertThat(spi(exp().eq("a", 10).eq("b", 20)) - .isSameByPlan(spi(exp().eq("a", 10)))).isFalse(); + .isSameByPlan(spi(exp().eq("a", 10)))).isFalse(); } @Test public void isSameByPlan_when_lessEmptyLast() { assertThat(spi(exp().eq("a", 10).eq("b", 20)) - .isSameByPlan(spi(exp()))).isFalse(); + .isSameByPlan(spi(exp()))).isFalse(); } @Test public void isSameByPlan_when_lessEmptyFirst() { assertThat(spi(exp()) - .isSameByPlan(spi(exp().eq("a", 10)))).isFalse(); + .isSameByPlan(spi(exp().eq("a", 10)))).isFalse(); } @Test public void isSameByPlan_when_more() { assertThat(spi(exp().eq("a", 10).eq("b", 20)) - .isSameByPlan(spi(exp().eq("a", 10).eq("b", 20).eq("c", 30)))).isFalse(); + .isSameByPlan(spi(exp().eq("a", 10).eq("b", 20).eq("c", 30)))).isFalse(); } @Test public void isSameByPlan_when_diffProperties() { assertThat(spi(exp().eq("a", 10).eq("b", 20)) - .isSameByPlan(spi(exp().eq("c", 10).eq("b", 20)))).isFalse(); + .isSameByPlan(spi(exp().eq("c", 10).eq("b", 20)))).isFalse(); } @@ -71,28 +71,28 @@ public class DefaultExpressionListTest { public void isSameByBind_when_same() { assertThat(spi(exp().eq("a", 10).eq("b", 20)) - .isSameByBind(spi(exp().eq("a", 10).eq("b", 20)))).isTrue(); + .isSameByBind(spi(exp().eq("a", 10).eq("b", 20)))).isTrue(); } @Test public void isSameByBind_when_diffValues() { assertThat(spi(exp().eq("a", 10).eq("b", 20)) - .isSameByBind(spi(exp().eq("a", 10).eq("b", 30)))).isFalse(); + .isSameByBind(spi(exp().eq("a", 10).eq("b", 30)))).isFalse(); } @Test public void isSameByBind_when_less() { assertThat(spi(exp().eq("a", 10)) - .isSameByBind(spi(exp().eq("a", 10).eq("b", 20)))).isFalse(); + .isSameByBind(spi(exp().eq("a", 10).eq("b", 20)))).isFalse(); } @Test public void isSameByBind_when_more() { assertThat(spi(exp().eq("a", 10)) - .isSameByBind(spi(exp().eq("a", 10).eq("b", 20)))).isFalse(); + .isSameByBind(spi(exp().eq("a", 10).eq("b", 20)))).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/ExistsQueryExpressionTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/ExistsQueryExpressionTest.java index 78752ba3d..9144703ab 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/ExistsQueryExpressionTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/ExistsQueryExpressionTest.java @@ -19,67 +19,67 @@ public class ExistsQueryExpressionTest { @Test public void isSameByPlan_when_same() { - assertThat(exp(true,"a", 10).isSameByPlan(exp(true,"a", 10))).isTrue(); + assertThat(exp(true, "a", 10).isSameByPlan(exp(true, "a", 10))).isTrue(); } @Test public void isSameByPlan_when_diffBind_same() { - assertThat(exp(true,"a", 10).isSameByPlan(exp(true,"a", 20))).isTrue(); + assertThat(exp(true, "a", 10).isSameByPlan(exp(true, "a", 20))).isTrue(); } @Test public void isSameByPlan_when_diffNot() { - assertThat(exp(true,"a", 10).isSameByPlan(exp(false,"a", 10))).isFalse(); + assertThat(exp(true, "a", 10).isSameByPlan(exp(false, "a", 10))).isFalse(); } @Test public void isSameByPlan_when_diffSql() { - assertThat(exp(true,"a", 10).isSameByPlan(exp(true,"b", 10))).isFalse(); + assertThat(exp(true, "a", 10).isSameByPlan(exp(true, "b", 10))).isFalse(); } @Test public void isSameByBind_when_sameBindValues() { - assertThat(exp(true,"a", 10).isSameByBind(exp(true,"a", 10))).isTrue(); + assertThat(exp(true, "a", 10).isSameByBind(exp(true, "a", 10))).isTrue(); } @Test public void isSameByBind_when_sameMultipleBindValues() { - assertThat(exp(true,"a", 10, "ABC", 20).isSameByBind(exp(true,"a", 10, "ABC", 20))).isTrue(); + assertThat(exp(true, "a", 10, "ABC", 20).isSameByBind(exp(true, "a", 10, "ABC", 20))).isTrue(); } @Test public void isSameByBind_when_diffMultipleBindValues() { - assertThat(exp(true,"a", 10, "ABC", 20).isSameByBind(exp(true,"a", 10, "ABC", 21))).isFalse(); + assertThat(exp(true, "a", 10, "ABC", 20).isSameByBind(exp(true, "a", 10, "ABC", 21))).isFalse(); } @Test public void isSameByBind_when_diffMultipleBindValuesByOrder() { - assertThat(exp(true,"a", 10, "ABC", 20).isSameByBind(exp(true,"a", 10, 20, "ABC"))).isFalse(); + assertThat(exp(true, "a", 10, "ABC", 20).isSameByBind(exp(true, "a", 10, 20, "ABC"))).isFalse(); } @Test public void isSameByBind_when_diffBindValues() { - assertThat(exp(true,"a", 10).isSameByBind(exp(true,"a", 20))).isFalse(); + assertThat(exp(true, "a", 10).isSameByBind(exp(true, "a", 20))).isFalse(); } @Test public void isSameByBind_when_lessBindValues() { - assertThat(exp(true,"a", 10, 20).isSameByBind(exp(true,"a", 20))).isFalse(); + assertThat(exp(true, "a", 10, 20).isSameByBind(exp(true, "a", 20))).isFalse(); } @Test public void isSameByBind_when_moreBindValues() { - assertThat(exp(true,"a", 10).isSameByBind(exp(true,"a", 10, 20))).isFalse(); + assertThat(exp(true, "a", 10).isSameByBind(exp(true, "a", 10, 20))).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/IdInExpressionTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/IdInExpressionTest.java index b1b2ab7b2..9d4793684 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/IdInExpressionTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/IdInExpressionTest.java @@ -42,7 +42,7 @@ public class IdInExpressionTest { @Test public void isSameByBind_when_mulitpleSameBindValues() { - assertThat(exp(10,"ABC", 20).isSameByBind(exp(10, "ABC", 20))).isTrue(); + assertThat(exp(10, "ABC", 20).isSameByBind(exp(10, "ABC", 20))).isTrue(); } @Test @@ -54,14 +54,14 @@ public class IdInExpressionTest { @Test public void isSameByBind_when_lessBindValues() { - assertThat(exp(10,"ABC", 20).isSameByBind(exp(10, "ABC"))).isFalse(); + assertThat(exp(10, "ABC", 20).isSameByBind(exp(10, "ABC"))).isFalse(); } @Test public void isSameByBind_when_moreBindValues() { - assertThat(exp(10,"ABC").isSameByBind(exp(10, "ABC", 30))).isFalse(); + assertThat(exp(10, "ABC").isSameByBind(exp(10, "ABC", 30))).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/InQueryExpressionTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/InQueryExpressionTest.java index c1e15dedf..168f0a5b2 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/InQueryExpressionTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/InQueryExpressionTest.java @@ -18,72 +18,72 @@ public class InQueryExpressionTest { @Test public void isSameByPlan_when_same() { - assertThat(exp("name",true,"sql", 10).isSameByPlan(exp("name",true,"sql", 10))).isTrue(); + assertThat(exp("name", true, "sql", 10).isSameByPlan(exp("name", true, "sql", 10))).isTrue(); } @Test public void isSameByPlan_when_diffBind_same() { - assertThat(exp("name",true,"sql", 10).isSameByPlan(exp("name",true,"sql", 20))).isTrue(); + assertThat(exp("name", true, "sql", 10).isSameByPlan(exp("name", true, "sql", 20))).isTrue(); } @Test public void isSameByPlan_when_diffNPropertyName() { - assertThat(exp("name",true,"sql", 10).isSameByPlan(exp("nameDiff",true,"sql", 10))).isFalse(); + assertThat(exp("name", true, "sql", 10).isSameByPlan(exp("nameDiff", true, "sql", 10))).isFalse(); } @Test public void isSameByPlan_when_diffNot() { - assertThat(exp("name",true,"sql", 10).isSameByPlan(exp("name",false,"sql", 10))).isFalse(); + assertThat(exp("name", true, "sql", 10).isSameByPlan(exp("name", false, "sql", 10))).isFalse(); } @Test public void isSameByPlan_when_diffSql() { - assertThat(exp("name",true,"sql", 10).isSameByPlan(exp("name",true,"sqlDiff", 10))).isFalse(); + assertThat(exp("name", true, "sql", 10).isSameByPlan(exp("name", true, "sqlDiff", 10))).isFalse(); } @Test public void isSameByBind_when_sameBindValues() { - assertThat(exp("name",true,"sql", 10).isSameByBind(exp("name",true,"sql", 10))).isTrue(); + assertThat(exp("name", true, "sql", 10).isSameByBind(exp("name", true, "sql", 10))).isTrue(); } @Test public void isSameByBind_when_sameMultipleBindValues() { - assertThat(exp("name",true,"sql", 10, "ABC", 20).isSameByBind(exp("name",true,"sql", 10, "ABC", 20))).isTrue(); + assertThat(exp("name", true, "sql", 10, "ABC", 20).isSameByBind(exp("name", true, "sql", 10, "ABC", 20))).isTrue(); } @Test public void isSameByBind_when_diffMultipleBindValues() { - assertThat(exp("name",true,"sql", 10, "ABC", 20).isSameByBind(exp("name",true,"sql", 10, "ABC", 21))).isFalse(); + assertThat(exp("name", true, "sql", 10, "ABC", 20).isSameByBind(exp("name", true, "sql", 10, "ABC", 21))).isFalse(); } @Test public void isSameByBind_when_diffMultipleBindValuesByOrder() { - assertThat(exp("name",true,"sql", 10, "ABC", 20).isSameByBind(exp("name",true,"sql", 10, 20, "ABC"))).isFalse(); + assertThat(exp("name", true, "sql", 10, "ABC", 20).isSameByBind(exp("name", true, "sql", 10, 20, "ABC"))).isFalse(); } @Test public void isSameByBind_when_diffBindValues() { - assertThat(exp("name",true,"sql", 10).isSameByBind(exp("name",true,"sql", 20))).isFalse(); + assertThat(exp("name", true, "sql", 10).isSameByBind(exp("name", true, "sql", 20))).isFalse(); } @Test public void isSameByBind_when_lessBindValues() { - assertThat(exp("name",true,"sql", 10, 20).isSameByBind(exp("name",true,"sql", 20))).isFalse(); + assertThat(exp("name", true, "sql", 10, 20).isSameByBind(exp("name", true, "sql", 20))).isFalse(); } @Test public void isSameByBind_when_moreBindValues() { - assertThat(exp("name",true,"sql", 10).isSameByBind(exp("name",true,"sql", 10, 20))).isFalse(); + assertThat(exp("name", true, "sql", 10).isSameByBind(exp("name", true, "sql", 10, 20))).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java index 62b133123..68998ee0c 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java @@ -18,9 +18,9 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Customer.class) - .select("id") - .where().isEmpty("contacts") - .query(); + .select("id") + .where().isEmpty("contacts") + .query(); query.findList(); assertThat(sqlOf(query)).contains("select t0.id from o_customer t0 where not exists (select 1 from contact where customer_id = t0.id"); @@ -32,9 +32,9 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Customer.class) - .select("id") - .where().isNotEmpty("contacts") - .query(); + .select("id") + .where().isNotEmpty("contacts") + .query(); query.findList(); assertThat(sqlOf(query)).contains("select t0.id from o_customer t0 where exists (select 1 from contact where customer_id = t0.id"); @@ -46,9 +46,9 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Contact.class) - .select("id") - .where().isEmpty("notes") - .query(); + .select("id") + .where().isEmpty("notes") + .query(); query.findList(); assertThat(sqlOf(query)).contains("select t0.id from contact t0 where not exists (select 1 from contact_note where contact_id = t0.id"); @@ -60,9 +60,9 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Contact.class) - .select("id") - .where().isNotEmpty("notes") - .query(); + .select("id") + .where().isNotEmpty("notes") + .query(); query.findList(); assertThat(sqlOf(query)).contains("select t0.id from contact t0 where exists (select 1 from contact_note where contact_id = t0.id"); @@ -75,9 +75,9 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Contact.class) - .select("id") - .where().isEmpty("notes") - .query(); + .select("id") + .where().isEmpty("notes") + .query(); query.findList(); } @@ -89,9 +89,9 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Customer.class) - .select("id") - .where().isEmpty("contacts.notes") - .query(); + .select("id") + .where().isEmpty("contacts.notes") + .query(); query.findList(); assertThat(sqlOf(query)).contains("select distinct t0.id from o_customer t0 join contact u1 on u1.customer_id = t0.id where not exists (select 1 from contact_note where contact_id = u1.id)"); @@ -103,12 +103,12 @@ public class IsEmptyExpressionQueryTest extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Customer.class) - .select("id") - .where().isNotEmpty("contacts.notes") - .query(); + .select("id") + .where().isNotEmpty("contacts.notes") + .query(); query.findList(); assertThat(sqlOf(query)).contains("select distinct t0.id from o_customer t0 join contact u1 on u1.customer_id = t0.id where exists (select 1 from contact_note where contact_id = u1.id)"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/JunctionExpressionTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/JunctionExpressionTest.java index d9d2052ea..70342fc2a 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/JunctionExpressionTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/JunctionExpressionTest.java @@ -35,27 +35,27 @@ public class JunctionExpressionTest { public void isSameByPlan_when_same() { assertThat(and(exp(eq("a", 10), eq("b", 10))) - .isSameByPlan(and(exp(eq("a", 10), eq("b", 10))))).isTrue(); + .isSameByPlan(and(exp(eq("a", 10), eq("b", 10))))).isTrue(); } @Test public void copyForPlanKey_isSameByPlan_when_same() { assertThat(and(exp(eq("a", 10), eq("b", 10)).copyForPlanKey()) - .isSameByPlan(and(exp(eq("a", 10), eq("b", 10))))).isTrue(); + .isSameByPlan(and(exp(eq("a", 10), eq("b", 10))))).isTrue(); } @Test public void copyForPlanKey_isSameByPlan_when_diff() { assertThat(and(exp(eq("a", 10), eq("b", 10)).copyForPlanKey()) - .isSameByPlan(and(exp(eq("a", 10), eq("c", 10))))).isFalse(); + .isSameByPlan(and(exp(eq("a", 10), eq("c", 10))))).isFalse(); } @Test public void isSameByPlan_when_diffType() { assertThat(and(exp(eq("a", 10), eq("b", 10))) - .isSameByPlan(or(exp(eq("a", 10), eq("b", 10))))).isFalse(); + .isSameByPlan(or(exp(eq("a", 10), eq("b", 10))))).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/LikeExpressionTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/LikeExpressionTest.java index 85a2aef8f..9c21352b4 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/LikeExpressionTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/LikeExpressionTest.java @@ -18,35 +18,35 @@ public class LikeExpressionTest extends BaseExpressionTest { public void isSameByPlan_when_same() { assertThat(exp("a", "rob", true, LikeType.STARTS_WITH) - .isSameByPlan(exp("a", "rob", true, LikeType.STARTS_WITH))).isTrue(); + .isSameByPlan(exp("a", "rob", true, LikeType.STARTS_WITH))).isTrue(); } @Test public void isSameByPlan_when_diffBind_then_stillSame() { assertThat(exp("a", "rob", true, LikeType.STARTS_WITH) - .isSameByPlan(exp("a", "bor", true, LikeType.STARTS_WITH))).isTrue(); + .isSameByPlan(exp("a", "bor", true, LikeType.STARTS_WITH))).isTrue(); } @Test public void isSameByPlan_when_diffCaseInsensitive() { assertThat(exp("a", "rob", true, LikeType.STARTS_WITH) - .isSameByPlan(exp("a", "rob", false, LikeType.STARTS_WITH))).isFalse(); + .isSameByPlan(exp("a", "rob", false, LikeType.STARTS_WITH))).isFalse(); } @Test public void isSameByPlan_when_diffLikeType() { assertThat(exp("a", "rob", true, LikeType.STARTS_WITH) - .isSameByPlan(exp("a", "rob", true, LikeType.ENDS_WITH))).isFalse(); + .isSameByPlan(exp("a", "rob", true, LikeType.ENDS_WITH))).isFalse(); } @Test public void isSameByPlan_when_diffProperty() { assertThat(exp("a", "rob", true, LikeType.STARTS_WITH) - .isSameByPlan(exp("b", "rob", true, LikeType.STARTS_WITH))).isFalse(); + .isSameByPlan(exp("b", "rob", true, LikeType.STARTS_WITH))).isFalse(); } @@ -54,13 +54,13 @@ public class LikeExpressionTest extends BaseExpressionTest { public void isSameByBind_when_sameBindValues() { assertThat(exp("a", "rob", true, LikeType.STARTS_WITH) - .isSameByBind(exp("a", "rob", true, LikeType.STARTS_WITH))).isTrue(); + .isSameByBind(exp("a", "rob", true, LikeType.STARTS_WITH))).isTrue(); } @Test public void isSameByBind_when_diffBindValues() { assertThat(exp("a", "rob", true, LikeType.STARTS_WITH) - .isSameByBind(exp("a", "bor", true, LikeType.STARTS_WITH))).isFalse(); + .isSameByBind(exp("a", "bor", true, LikeType.STARTS_WITH))).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/LogicExpressionTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/LogicExpressionTest.java index 099584e0f..a126f341c 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/LogicExpressionTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/LogicExpressionTest.java @@ -25,56 +25,56 @@ public class LogicExpressionTest extends BaseExpressionTest { public void isSameByPlan_when_same() { assertThat(and(eq("a", 10), eq("b", 10)) - .isSameByPlan(and(eq("a", 10), eq("b", 10)))).isTrue(); + .isSameByPlan(and(eq("a", 10), eq("b", 10)))).isTrue(); } @Test public void isSameByPlan_when_diffBind_then_stillSame() { assertThat(and(eq("a", 10), eq("b", 10)) - .isSameByPlan(and(eq("a", 20), eq("b", 20)))).isTrue(); + .isSameByPlan(and(eq("a", 20), eq("b", 20)))).isTrue(); } @Test public void isSameByPlan_when_diffExp1_then_diff() { assertThat(and(eq("a", 10), eq("b", 10)) - .isSameByPlan(and(eq("c", 10), eq("b", 10)))).isFalse(); + .isSameByPlan(and(eq("c", 10), eq("b", 10)))).isFalse(); } @Test public void isSameByPlan_when_diffExp2_then_diff() { assertThat(and(eq("a", 10), eq("b", 10)) - .isSameByPlan(and(eq("a", 10), eq("c", 10)))).isFalse(); + .isSameByPlan(and(eq("a", 10), eq("c", 10)))).isFalse(); } @Test public void isSameByPlan_when_diffType_then_diff() { assertThat(or(eq("a", 10), eq("b", 10)) - .isSameByPlan(and(eq("a", 10), eq("c", 10)))).isFalse(); + .isSameByPlan(and(eq("a", 10), eq("c", 10)))).isFalse(); } @Test public void isSameByPlan_when_diffExpressionType() { assertThat(or(eq("a", 10), eq("b", 10)) - .isSameByPlan(new NoopExpression())).isFalse(); + .isSameByPlan(new NoopExpression())).isFalse(); } @Test public void isSameByBind_when_sameBindValues() { assertThat(and(eq("a", 10), eq("b", 10)) - .isSameByBind(and(eq("a", 10), eq("c", 10)))).isTrue(); + .isSameByBind(and(eq("a", 10), eq("c", 10)))).isTrue(); } @Test public void isSameByBind_when_diffBindValues() { assertThat(and(eq("a", 10), eq("b", 10)) - .isSameByBind(and(eq("a", 10), eq("c", 20)))).isFalse(); + .isSameByBind(and(eq("a", 10), eq("c", 20)))).isFalse(); } @Test @@ -109,9 +109,9 @@ public class LogicExpressionTest extends BaseExpressionTest { assertThat(path).isNull(); assertThat(and.expOne).isInstanceOf(NestedPathWrapperExpression.class); - assertThat(((NestedPathWrapperExpression)and.expOne).nestedPath).isEqualTo("details"); + assertThat(((NestedPathWrapperExpression) and.expOne).nestedPath).isEqualTo("details"); assertThat(and.expTwo).isInstanceOf(NestedPathWrapperExpression.class); - assertThat(((NestedPathWrapperExpression)and.expTwo).nestedPath).isEqualTo("shipments"); + assertThat(((NestedPathWrapperExpression) and.expTwo).nestedPath).isEqualTo("shipments"); } @Test @@ -123,7 +123,7 @@ public class LogicExpressionTest extends BaseExpressionTest { assertThat(path).isNull(); assertThat(and.expOne).isInstanceOf(NestedPathWrapperExpression.class); - assertThat(((NestedPathWrapperExpression)and.expOne).nestedPath).isEqualTo("details"); + assertThat(((NestedPathWrapperExpression) and.expOne).nestedPath).isEqualTo("details"); assertThat(and.expTwo).isInstanceOf(SimpleExpression.class); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/NoopExpressionTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/NoopExpressionTest.java index 5b40071d6..7e9c896a3 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/NoopExpressionTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/NoopExpressionTest.java @@ -15,9 +15,9 @@ public class NoopExpressionTest extends BaseTestCase { public void test() { Query query = Ebean.find(Customer.class) - .select("id") - .where().add(NoopExpression.INSTANCE) - .query(); + .select("id") + .where().add(NoopExpression.INSTANCE) + .query(); query.findList(); String generatedSql = sqlOf(query); @@ -29,11 +29,11 @@ public class NoopExpressionTest extends BaseTestCase { public void test_withPreAndPost() { Query query = Ebean.find(Customer.class) - .select("id") - .where().eq("name", null) - .add(NoopExpression.INSTANCE) - .ne("status", null) - .query(); + .select("id") + .where().eq("name", null) + .add(NoopExpression.INSTANCE) + .ne("status", null) + .query(); query.findList(); String generatedSql = sqlOf(query); diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/NotExpressionTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/NotExpressionTest.java index 4bb5abe33..638f74aaa 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/NotExpressionTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/NotExpressionTest.java @@ -18,41 +18,41 @@ public class NotExpressionTest { public void isSameByPlan_when_same() { assertThat(not(eq("a", 10)) - .isSameByPlan(not(eq("a", 10)))).isTrue(); + .isSameByPlan(not(eq("a", 10)))).isTrue(); } @Test public void isSameByPlan_when_sameByPlan() { assertThat(not(eq("a", 10)) - .isSameByPlan(not(eq("a", 20)))).isTrue(); + .isSameByPlan(not(eq("a", 20)))).isTrue(); } @Test public void isSameByPlan_when_different() { assertThat(not(eq("a", 10)) - .isSameByPlan(not(eq("b", 10)))).isFalse(); + .isSameByPlan(not(eq("b", 10)))).isFalse(); } @Test public void isSameByPlan_when_differentExpressionType() { assertThat(not(eq("a", 10)) - .isSameByPlan(new NoopExpression())).isFalse(); + .isSameByPlan(new NoopExpression())).isFalse(); } @Test public void isSameByBind_when_same() { assertThat(not(eq("a", 10)) - .isSameByBind(not(eq("b", 10)))).isTrue(); + .isSameByBind(not(eq("b", 10)))).isTrue(); } @Test public void isSameByBind_when_different() { assertThat(not(eq("a", 10)) - .isSameByBind(not(eq("a", 20)))).isFalse(); + .isSameByBind(not(eq("a", 20)))).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/NullExpressionTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/NullExpressionTest.java index b5aa39a96..45bd468dc 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/NullExpressionTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/NullExpressionTest.java @@ -68,28 +68,28 @@ public class NullExpressionTest extends BaseExpressionTest { public void isSameByBind_true() throws Exception { assertThat(nullExp("customer.name", false) - .isSameByBind(nullExp("customer.name", false))).isTrue(); + .isSameByBind(nullExp("customer.name", false))).isTrue(); } @Test public void isSameByPlan_true() throws Exception { assertThat(nullExp("customer.name", false) - .isSameByPlan(nullExp("customer.name", false))).isTrue(); + .isSameByPlan(nullExp("customer.name", false))).isTrue(); } @Test public void isSameByPlan_false_when_notNullDiff() throws Exception { assertThat(new NullExpression("customer.name", false) - .isSameByPlan(new NullExpression("customer.name", true))).isFalse(); + .isSameByPlan(new NullExpression("customer.name", true))).isFalse(); } @Test public void isSameByPlan_false_when_propertyNameDiff() throws Exception { assertThat(new NullExpression("customer.startDate", true) - .isSameByPlan(new NullExpression("customer.name", true))).isFalse(); + .isSameByPlan(new NullExpression("customer.name", true))).isFalse(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/expression/PrepareDocNestedTest.java b/src/test/java/com/avaje/ebeaninternal/server/expression/PrepareDocNestedTest.java index 977bd01aa..9449a0d86 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/expression/PrepareDocNestedTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/expression/PrepareDocNestedTest.java @@ -17,12 +17,12 @@ public class PrepareDocNestedTest extends BaseTestCase { public void prepare() throws Exception { ExpressionList where = Ebean.find(Order.class) - .where() - .gt("details.orderQty", 1) - .query().where(); + .where() + .gt("details.orderQty", 1) + .query().where(); - DefaultExpressionList exp = (DefaultExpressionList)where; + DefaultExpressionList exp = (DefaultExpressionList) where; PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class)); List underlyingList = exp.getUnderlyingList(); @@ -34,13 +34,13 @@ public class PrepareDocNestedTest extends BaseTestCase { public void prepare_when_multipleOfSamePath() throws Exception { ExpressionList where = Ebean.find(Order.class) - .where() - .gt("details.orderQty", 1) - .gt("details.unitPrice", 1) - .query().where(); + .where() + .gt("details.orderQty", 1) + .gt("details.unitPrice", 1) + .query().where(); - DefaultExpressionList exp = (DefaultExpressionList)where; + DefaultExpressionList exp = (DefaultExpressionList) where; PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class)); List underlyingList = exp.getUnderlyingList(); @@ -52,21 +52,21 @@ public class PrepareDocNestedTest extends BaseTestCase { public void prepare_when_mixed() throws Exception { ExpressionList where = Ebean.find(Order.class) - .where() - .gt("customer.id", 1) - .gt("details.orderQty", 1) - .gt("details.unitPrice", 1) - .query().where(); + .where() + .gt("customer.id", 1) + .gt("details.orderQty", 1) + .gt("details.unitPrice", 1) + .query().where(); - DefaultExpressionList exp = (DefaultExpressionList)where; + DefaultExpressionList exp = (DefaultExpressionList) where; PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class)); List underlyingList = exp.getUnderlyingList(); assertEquals(underlyingList.size(), 2); assertNull(exp.allDocNestedPath); - DefaultExpressionList second = (DefaultExpressionList)underlyingList.get(1); + DefaultExpressionList second = (DefaultExpressionList) underlyingList.get(1); assertEquals(second.allDocNestedPath, "details"); } @@ -74,23 +74,23 @@ public class PrepareDocNestedTest extends BaseTestCase { public void prepare_when_nestedJunction() throws Exception { ExpressionList where = Ebean.find(Order.class) - .where() - .not() - .gt("customer.id", 1) - .gt("details.orderQty", 1) - .gt("details.unitPrice", 1) - .query().where(); + .where() + .not() + .gt("customer.id", 1) + .gt("details.orderQty", 1) + .gt("details.unitPrice", 1) + .query().where(); - DefaultExpressionList exp = (DefaultExpressionList)where; + DefaultExpressionList exp = (DefaultExpressionList) where; PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class)); List underlyingList = exp.getUnderlyingList(); assertEquals(underlyingList.size(), 1); assertNull(exp.allDocNestedPath); - JunctionExpression junction = (JunctionExpression)underlyingList.get(0); + JunctionExpression junction = (JunctionExpression) underlyingList.get(0); List junctionUnderlying = junction.exprList.getUnderlyingList(); - JunctionExpression nestedNestedPath = (JunctionExpression)junctionUnderlying.get(1); + JunctionExpression nestedNestedPath = (JunctionExpression) junctionUnderlying.get(1); assertEquals(nestedNestedPath.exprList.allDocNestedPath, "details"); } @@ -98,23 +98,23 @@ public class PrepareDocNestedTest extends BaseTestCase { public void prepare_when_nestedMultiple() throws Exception { ExpressionList where = Ebean.find(Order.class) - .where() - .isNotNull("shipments.shipTime") - .gt("details.orderQty", 1) - .gt("details.unitPrice", 1) - .query().where(); + .where() + .isNotNull("shipments.shipTime") + .gt("details.orderQty", 1) + .gt("details.unitPrice", 1) + .query().where(); - DefaultExpressionList exp = (DefaultExpressionList)where; + DefaultExpressionList exp = (DefaultExpressionList) where; PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class)); List underlyingList = exp.getUnderlyingList(); assertEquals(underlyingList.size(), 2); assertNull(exp.allDocNestedPath); - DefaultExpressionList shipExpr = (DefaultExpressionList)underlyingList.get(0); + DefaultExpressionList shipExpr = (DefaultExpressionList) underlyingList.get(0); assertEquals(shipExpr.allDocNestedPath, "shipments"); - DefaultExpressionList detailsExpr = (DefaultExpressionList)underlyingList.get(1); + DefaultExpressionList detailsExpr = (DefaultExpressionList) underlyingList.get(1); assertEquals(detailsExpr.allDocNestedPath, "details"); } @@ -123,26 +123,26 @@ public class PrepareDocNestedTest extends BaseTestCase { public void prepare_when_manyMixed() throws Exception { ExpressionList where = Ebean.find(Order.class) - .where() - .gt("customer.id", 1) // 0 - .isNotNull("shipments.shipTime") // shipments 0 - .isNotNull("status") // 1 - .gt("details.orderQty", 1) // details 0 - .isNotNull("orderDate") // 2 - .gt("details.unitPrice", 1) // details 1 - .query().where(); + .where() + .gt("customer.id", 1) // 0 + .isNotNull("shipments.shipTime") // shipments 0 + .isNotNull("status") // 1 + .gt("details.orderQty", 1) // details 0 + .isNotNull("orderDate") // 2 + .gt("details.unitPrice", 1) // details 1 + .query().where(); - DefaultExpressionList exp = (DefaultExpressionList)where; + DefaultExpressionList exp = (DefaultExpressionList) where; PrepareDocNested.prepare(exp, getBeanDescriptor(Order.class)); List underlyingList = exp.getUnderlyingList(); assertEquals(underlyingList.size(), 5); assertNull(exp.allDocNestedPath); - DefaultExpressionList shipExpr = (DefaultExpressionList)underlyingList.get(3); + DefaultExpressionList shipExpr = (DefaultExpressionList) underlyingList.get(3); assertEquals(shipExpr.allDocNestedPath, "shipments"); - DefaultExpressionList detailsExpr = (DefaultExpressionList)underlyingList.get(4); + DefaultExpressionList detailsExpr = (DefaultExpressionList) underlyingList.get(4); assertEquals(detailsExpr.allDocNestedPath, "details"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/com/avaje/ebeaninternal/server/grammer/EqlParserTest.java index f9c12cfeb..fd75611e6 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/grammer/EqlParserTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/grammer/EqlParserTest.java @@ -207,7 +207,7 @@ public class EqlParserTest extends BaseTestCase { public void where_in_when_namedParamAsList() throws Exception { Query query = parse("where name in (:names)"); - query.setParameter("names", Arrays.asList("Baz","Maz","Jim")); + query.setParameter("names", Arrays.asList("Baz", "Maz", "Jim")); query.findList(); assertThat(query.getGeneratedSql()).contains("where t0.name in (?, ?, ? )"); @@ -467,8 +467,8 @@ public class EqlParserTest extends BaseTestCase { private Query parse(String raw) { Query query = Ebean.find(Customer.class); - EqlParser.parse(raw, (SpiQuery)query); + EqlParser.parse(raw, (SpiQuery) query); return query; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/lib/ShutdownManagerTest.java b/src/test/java/com/avaje/ebeaninternal/server/lib/ShutdownManagerTest.java index 3d554a56b..30b7a283d 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/lib/ShutdownManagerTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/lib/ShutdownManagerTest.java @@ -25,8 +25,8 @@ public class ShutdownManagerTest extends BaseTestCase { @Test public void test_noShutdownHook() { - System.setProperty("ebean.registerShutdownHook","false"); + System.setProperty("ebean.registerShutdownHook", "false"); Ebean.getDefaultServer(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java b/src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java index ad97b3b5e..ca247f553 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java +++ b/src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java @@ -1,12 +1,11 @@ package com.avaje.ebeaninternal.server.lib.sql; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.ebeaninternal.server.core.DefaultBackgroundExecutor; import com.avaje.tests.model.basic.Customer; +import org.junit.Test; public class TestDataSourceMaxWithEntity extends BaseTestCase { @@ -20,7 +19,7 @@ public class TestDataSourceMaxWithEntity extends BaseTestCase { } EbeanServer server = Ebean.getServer(null); - + DefaultBackgroundExecutor bg = new DefaultBackgroundExecutor(1, 30, "testDs"); @@ -31,7 +30,7 @@ public class TestDataSourceMaxWithEntity extends BaseTestCase { } Thread.sleep(30000); - + server.shutdown(true, false); } catch (Exception e) { @@ -53,12 +52,12 @@ public class TestDataSourceMaxWithEntity extends BaseTestCase { } public void run() { - + server.find(Customer.class).findCount(); try { - System.out.println(position+" sleep " + sleepMillis); + System.out.println(position + " sleep " + sleepMillis); Thread.sleep(sleepMillis); - System.out.println(position+" sleep done"); + System.out.println(position + " sleep done"); } catch (InterruptedException e) { e.printStackTrace(); } diff --git a/src/test/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContextTest.java b/src/test/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContextTest.java index 151d6a5da..e3531aa19 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContextTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/loadcontext/DLoadContextTest.java @@ -27,7 +27,7 @@ public class DLoadContextTest extends BaseTestCase { queryRequest.initTransIfRequired(); queryRequest.endTransIfRequired(); - DLoadContext graphContext = (DLoadContext)queryRequest.getGraphContext(); + DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext(); DLoadBeanContext customer = graphContext.getBeanContext("customer"); @@ -38,11 +38,11 @@ public class DLoadContextTest extends BaseTestCase { @Test public void construct_when_fetchQuery_expect_100_batchSize() { - OrmQueryRequest queryRequest = queryRequest(query().fetch("customer",new FetchConfig().query())); + OrmQueryRequest queryRequest = queryRequest(query().fetch("customer", new FetchConfig().query())); queryRequest.initTransIfRequired(); queryRequest.endTransIfRequired(); - DLoadContext graphContext = (DLoadContext)queryRequest.getGraphContext(); + DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext(); DLoadBeanContext customer = graphContext.getBeanContext("customer"); assertThat(customer.firstBatchSize).isEqualTo(100); @@ -56,7 +56,7 @@ public class DLoadContextTest extends BaseTestCase { queryRequest.initTransIfRequired(); queryRequest.endTransIfRequired(); - DLoadContext graphContext = (DLoadContext)queryRequest.getGraphContext(); + DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext(); DLoadBeanContext customer = graphContext.getBeanContext("customer"); assertThat(customer.firstBatchSize).isEqualTo(100); @@ -66,11 +66,11 @@ public class DLoadContextTest extends BaseTestCase { @Test public void construct_when_fetchQuery50_expect_50_batchSize() { - OrmQueryRequest queryRequest = queryRequest(query().fetch("customer",new FetchConfig().query(50))); + OrmQueryRequest queryRequest = queryRequest(query().fetch("customer", new FetchConfig().query(50))); queryRequest.initTransIfRequired(); queryRequest.endTransIfRequired(); - DLoadContext graphContext = (DLoadContext)queryRequest.getGraphContext(); + DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext(); DLoadBeanContext customer = graphContext.getBeanContext("customer"); assertThat(customer.firstBatchSize).isEqualTo(50); @@ -80,11 +80,11 @@ public class DLoadContextTest extends BaseTestCase { @Test public void construct_when_fetchQueryFirst20Lazy5_expect_20_5_batchSize() { - OrmQueryRequest queryRequest = queryRequest(query().fetch("customer",new FetchConfig().queryFirst(20).lazy(5))); + OrmQueryRequest queryRequest = queryRequest(query().fetch("customer", new FetchConfig().queryFirst(20).lazy(5))); queryRequest.initTransIfRequired(); queryRequest.endTransIfRequired(); - DLoadContext graphContext = (DLoadContext)queryRequest.getGraphContext(); + DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext(); DLoadBeanContext customer = graphContext.getBeanContext("customer"); assertThat(customer.firstBatchSize).isEqualTo(20); @@ -95,15 +95,15 @@ public class DLoadContextTest extends BaseTestCase { public void construct_when_fetch_expect_100_100_batchSize() { // the fetch is converted to a query join due to the maxRows - OrmQueryRequest queryRequest = queryRequest(query().fetch("details").setMaxRows(100)) ; + OrmQueryRequest queryRequest = queryRequest(query().fetch("details").setMaxRows(100)); queryRequest.initTransIfRequired(); queryRequest.endTransIfRequired(); - DLoadContext graphContext = (DLoadContext)queryRequest.getGraphContext(); + DLoadContext graphContext = (DLoadContext) queryRequest.getGraphContext(); DLoadManyContext details = graphContext.getManyContext("details"); assertThat(details.firstBatchSize).isEqualTo(100); assertThat(details.secondaryBatchSize).isEqualTo(100); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/query/OrderVersionDescTest.java b/src/test/java/com/avaje/ebeaninternal/server/query/OrderVersionDescTest.java index 6eeae26ba..391a657c2 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/query/OrderVersionDescTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/query/OrderVersionDescTest.java @@ -73,9 +73,9 @@ public class OrderVersionDescTest { } private Version at(long diff) { - Timestamp timestamp = new Timestamp(now + diff); + Timestamp timestamp = new Timestamp(now + diff); Version ver = new Version(); ver.setStart(timestamp); return ver; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/query/SplitNameTest.java b/src/test/java/com/avaje/ebeaninternal/server/query/SplitNameTest.java index b5070b11d..b46751cda 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/query/SplitNameTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/query/SplitNameTest.java @@ -2,15 +2,16 @@ package com.avaje.ebeaninternal.server.query; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; public class SplitNameTest { @Test public void add() throws Exception { - assertEquals(SplitName.add("a","b"), "a.b"); - assertEquals(SplitName.add("a","b.c"), "a.b.c"); + assertEquals(SplitName.add("a", "b"), "a.b"); + assertEquals(SplitName.add("a", "b.c"), "a.b.c"); } @Test @@ -79,4 +80,4 @@ public class SplitNameTest { assertEquals(split[0], "a"); assertNull(split[1]); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java b/src/test/java/com/avaje/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java index 233bd873b..a294e06fb 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java +++ b/src/test/java/com/avaje/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java @@ -1,10 +1,5 @@ package com.avaje.ebeaninternal.server.query; -import java.util.concurrent.ExecutionException; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; @@ -15,88 +10,92 @@ import com.avaje.ebean.Query; import com.avaje.ebean.Transaction; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.concurrent.ExecutionException; + +public class TestFutureRowCountErrorHandling extends BaseTestCase { -public class TestFutureRowCountErrorHandling extends BaseTestCase { - @Test public void testFutureRowCount() throws InterruptedException { - + ResetBasicData.reset(); - + EbeanServer server = Ebean.getServer(null); - + Query query = server.createQuery(Customer.class) .where().eq("doesNotExist", "this will fail") .query(); - + FutureRowCount futureRowCount = server.findFutureCount(query, null); - - QueryFutureRowCount internalRowCount = (QueryFutureRowCount)futureRowCount; + + QueryFutureRowCount internalRowCount = (QueryFutureRowCount) futureRowCount; Transaction t = internalRowCount.getTransaction(); - + try { futureRowCount.get(); - Assert.assertTrue("never get here as the SQL is invalid",false); - + Assert.assertTrue("never get here as the SQL is invalid", false); + } catch (ExecutionException e) { - // Confirm the Transaction has been rolled back + // Confirm the Transaction has been rolled back Assert.assertFalse("Underlying transaction was rolled back cleanly", t.isActive()); } - - } - - @Test - public void testFutureIds() throws InterruptedException { - - ResetBasicData.reset(); - - EbeanServer server = Ebean.getServer(null); - - Query query = server.createQuery(Customer.class) - .where().eq("doesNotExist", "this will fail") - .query(); - - FutureIds futureIds = server.findFutureIds(query, null); - - QueryFutureIds internalFuture = (QueryFutureIds)futureIds; - Transaction t = internalFuture.getTransaction(); - - try { - internalFuture.get(); - Assert.assertTrue("never get here as the SQL is invalid",false); - - } catch (ExecutionException e) { - // Confirm the Transaction has been rolled back - Assert.assertFalse("Underlying transaction was rolled back cleanly", t.isActive()); - } - + } - @Test - public void testFutureList() throws InterruptedException { - + public void testFutureIds() throws InterruptedException { + ResetBasicData.reset(); - + EbeanServer server = Ebean.getServer(null); - + Query query = server.createQuery(Customer.class) .where().eq("doesNotExist", "this will fail") .query(); - - FutureList futureList = server.findFutureList(query, null); - - QueryFutureList internalFuture = (QueryFutureList)futureList; + + FutureIds futureIds = server.findFutureIds(query, null); + + QueryFutureIds internalFuture = (QueryFutureIds) futureIds; Transaction t = internalFuture.getTransaction(); - + try { internalFuture.get(); - Assert.assertTrue("never get here as the SQL is invalid",false); - + Assert.assertTrue("never get here as the SQL is invalid", false); + } catch (ExecutionException e) { - // Confirm the Transaction has been rolled back + // Confirm the Transaction has been rolled back Assert.assertFalse("Underlying transaction was rolled back cleanly", t.isActive()); } - + + } + + + @Test + public void testFutureList() throws InterruptedException { + + ResetBasicData.reset(); + + EbeanServer server = Ebean.getServer(null); + + Query query = server.createQuery(Customer.class) + .where().eq("doesNotExist", "this will fail") + .query(); + + FutureList futureList = server.findFutureList(query, null); + + QueryFutureList internalFuture = (QueryFutureList) futureList; + Transaction t = internalFuture.getTransaction(); + + try { + internalFuture.get(); + Assert.assertTrue("never get here as the SQL is invalid", false); + + } catch (ExecutionException e) { + // Confirm the Transaction has been rolled back + Assert.assertFalse("Underlying transaction was rolled back cleanly", t.isActive()); + } + } } diff --git a/src/test/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/src/test/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java index ced5d21d7..b6a24fa40 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java @@ -12,7 +12,7 @@ public class DefaultOrmQueryTest { @Test public void checkForId_when_eqId_then_translatedTo_setId() { - DefaultOrmQuery q1 = (DefaultOrmQuery)Ebean.find(Order.class).where().eq("id", 42).query(); + DefaultOrmQuery q1 = (DefaultOrmQuery) Ebean.find(Order.class).where().eq("id", 42).query(); assertThat(q1.getWhereExpressions()).isNotNull(); assertThat(q1.getId()).isNull(); @@ -25,7 +25,7 @@ public class DefaultOrmQueryTest { @Test public void checkForId_when_idEq_ok() { - DefaultOrmQuery q1 = (DefaultOrmQuery)Ebean.find(Order.class).where().idEq(42).query(); + DefaultOrmQuery q1 = (DefaultOrmQuery) Ebean.find(Order.class).where().idEq(42).query(); assertThat(q1.getId()).isEqualTo(42); q1.checkIdEqualTo(); assertThat(q1.getId()).isEqualTo(42); @@ -34,8 +34,8 @@ public class DefaultOrmQueryTest { @Test public void when_addWhere_then_planChanges() { - DefaultOrmQuery q1 = (DefaultOrmQuery)Ebean.find(Order.class).where().in("name", "a","b","c").query(); - DefaultOrmQuery q2 = (DefaultOrmQuery)Ebean.find(Order.class).where().in("id", 2,2,3).query(); + DefaultOrmQuery q1 = (DefaultOrmQuery) Ebean.find(Order.class).where().in("name", "a", "b", "c").query(); + DefaultOrmQuery q2 = (DefaultOrmQuery) Ebean.find(Order.class).where().in("id", 2, 2, 3).query(); prepare(q1, q2); assertThat(q1.createQueryPlanKey()).isNotEqualTo(q2.createQueryPlanKey()); @@ -45,8 +45,8 @@ public class DefaultOrmQueryTest { @Test public void when_sameWhereWithDiffBindValues_then_planSame_bindDiff() { - DefaultOrmQuery q1 = (DefaultOrmQuery)Ebean.find(Order.class).where().in("id", 1,2,3).query(); - DefaultOrmQuery q2 = (DefaultOrmQuery)Ebean.find(Order.class).where().in("id", 2,2,3).query(); + DefaultOrmQuery q1 = (DefaultOrmQuery) Ebean.find(Order.class).where().in("id", 1, 2, 3).query(); + DefaultOrmQuery q2 = (DefaultOrmQuery) Ebean.find(Order.class).where().in("id", 2, 2, 3).query(); prepare(q1, q2); assertThat(q1.createQueryPlanKey()).isEqualTo(q2.createQueryPlanKey()); @@ -56,8 +56,8 @@ public class DefaultOrmQueryTest { @Test public void when_sameWhereAndBindValues_then_planSameAndBind() { - DefaultOrmQuery q1 = (DefaultOrmQuery)Ebean.find(Order.class).where().in("id", 1,2,3).query(); - DefaultOrmQuery q2 = (DefaultOrmQuery)Ebean.find(Order.class).where().in("id", 1,2,3).query(); + DefaultOrmQuery q1 = (DefaultOrmQuery) Ebean.find(Order.class).where().in("id", 1, 2, 3).query(); + DefaultOrmQuery q2 = (DefaultOrmQuery) Ebean.find(Order.class).where().in("id", 1, 2, 3).query(); prepare(q1, q2); assertThat(q1.createQueryPlanKey()).isEqualTo(q2.createQueryPlanKey()); @@ -67,13 +67,13 @@ public class DefaultOrmQueryTest { @Test public void when_diffFirstMaxRows_then_differentPlan() throws Exception { - DefaultOrmQuery query1 = (DefaultOrmQuery)Ebean.find(Order.class) - .setFirstRow(0) - .setMaxRows(31); + DefaultOrmQuery query1 = (DefaultOrmQuery) Ebean.find(Order.class) + .setFirstRow(0) + .setMaxRows(31); - DefaultOrmQuery query2 = (DefaultOrmQuery)Ebean.find(Order.class) - .setFirstRow(1) - .setMaxRows(0); + DefaultOrmQuery query2 = (DefaultOrmQuery) Ebean.find(Order.class) + .setFirstRow(1) + .setMaxRows(0); prepare(query1, query2); assertThat(query1.createQueryPlanKey()).isNotEqualTo(query2.createQueryPlanKey()); @@ -83,4 +83,4 @@ public class DefaultOrmQueryTest { q1.prepare(null); q2.prepare(null); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java b/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java index 3be9f7943..1d215347c 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java @@ -77,7 +77,7 @@ public class OrmQueryDetailParserTest extends BaseTestCase { chunk = detail.getChunk("details.product", false); assertThat(chunk.getPath()).isEqualTo("details.product"); - assertThat(chunk.getIncluded()).contains("sku","description"); + assertThat(chunk.getIncluded()).contains("sku", "description"); } @Test @@ -113,4 +113,4 @@ public class OrmQueryDetailParserTest extends BaseTestCase { assertThat(chunk.isQueryFetch()).isTrue(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailTest.java b/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailTest.java index fa69d51ee..285a9a5f7 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailTest.java @@ -6,9 +6,7 @@ import com.avaje.tests.model.basic.Order; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class OrmQueryDetailTest extends BaseTestCase { @@ -227,8 +225,8 @@ public class OrmQueryDetailTest extends BaseTestCase { detail.sortFetchPaths(orderDesc()); - assertThat(detail.getFetchPaths()).containsExactly("customer","customer.contacts"); - assertThat(detail.getChunk("customer",false).getIncluded()).containsExactly("id"); + assertThat(detail.getFetchPaths()).containsExactly("customer", "customer.contacts"); + assertThat(detail.getChunk("customer", false).getIncluded()).containsExactly("id"); } @Test @@ -240,8 +238,8 @@ public class OrmQueryDetailTest extends BaseTestCase { detail.sortFetchPaths(orderDesc()); - assertThat(detail.getFetchPaths()).containsExactly("customer","customer.contacts"); - assertThat(detail.getChunk("customer",false).getIncluded()).containsExactly("name"); + assertThat(detail.getFetchPaths()).containsExactly("customer", "customer.contacts"); + assertThat(detail.getChunk("customer", false).getIncluded()).containsExactly("name"); } @Test @@ -257,4 +255,4 @@ public class OrmQueryDetailTest extends BaseTestCase { return getBeanDescriptor(Order.class); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java b/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java index 9f8676f3a..611f9e55b 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPlanKeyTest.java @@ -236,17 +236,17 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest { SpiExpressionList list_id_eq_42() { return (SpiExpressionList) server().find(Customer.class) - .where().eq("id", 42); + .where().eq("id", 42); } SpiExpressionList list_id_eq_43() { return (SpiExpressionList) server().find(Customer.class) - .where().eq("id", 43); + .where().eq("id", 43); } SpiExpressionList list_id_eq_42_and_name_eq_rob() { return (SpiExpressionList) server().find(Customer.class) - .where().eq("id", 43).eq("name", "rob"); + .where().eq("id", 43).eq("name", "rob"); } @@ -345,4 +345,4 @@ public class OrmQueryPlanKeyTest extends BaseExpressionTest { assertThat(key1).isEqualTo(key2); assertThat(key1.hashCode()).isEqualTo(key2.hashCode()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java b/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java index d1233fe6f..2731fc18d 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java @@ -16,7 +16,7 @@ public class OrmQueryPropertiesTest { @Test(expected = IllegalArgumentException.class) public void construct_with_propertySet_when_null() { - new OrmQueryProperties(null, (LinkedHashSet)null); + new OrmQueryProperties(null, (LinkedHashSet) null); } @Test @@ -55,35 +55,35 @@ public class OrmQueryPropertiesTest { public void append_when_empty() { OrmQueryProperties p1 = new OrmQueryProperties(); - assertThat(append("select ",p1)).isEqualTo("select "); + assertThat(append("select ", p1)).isEqualTo("select "); } @Test public void append_when_someProperties() { OrmQueryProperties p1 = new OrmQueryProperties(null, "id,name"); - assertThat(append("select ",p1)).isEqualTo("select (id,name) "); + assertThat(append("select ", p1)).isEqualTo("select (id,name) "); } @Test public void append_when_somePropertiesWithOptions() { OrmQueryProperties p1 = new OrmQueryProperties(null, "id,name +cache"); - assertThat(append("select ",p1)).isEqualTo("select (id,name +cache) "); + assertThat(append("select ", p1)).isEqualTo("select (id,name +cache) "); } @Test public void append_when_path_and_emptyProperties() { OrmQueryProperties p1 = new OrmQueryProperties("customer", ""); - assertThat(append("fetch ",p1)).isEqualTo("fetch customer "); + assertThat(append("fetch ", p1)).isEqualTo("fetch customer "); } @Test public void append_when_path_and_somePropertiesWithOptions() { OrmQueryProperties p1 = new OrmQueryProperties("customer", "id,name +cache"); - assertThat(append("fetch ",p1)).isEqualTo("fetch customer (id,name +cache) "); + assertThat(append("fetch ", p1)).isEqualTo("fetch customer (id,name +cache) "); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/rawsql/TestRawSqlParsing.java b/src/test/java/com/avaje/ebeaninternal/server/rawsql/TestRawSqlParsing.java index 601aca988..361b99164 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/rawsql/TestRawSqlParsing.java +++ b/src/test/java/com/avaje/ebeaninternal/server/rawsql/TestRawSqlParsing.java @@ -1,30 +1,29 @@ 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; +import junit.framework.TestCase; 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"; + public void test() { - 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(); - assertTrue(s, s.contains("[order_id, sum")); - - } + 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(); + assertTrue(s, s.contains("[order_id, sum")); + + } } diff --git a/src/test/java/com/avaje/ebeaninternal/server/text/json/TestJsonWriteVisitor.java b/src/test/java/com/avaje/ebeaninternal/server/text/json/TestJsonWriteVisitor.java index 3b43323c8..2d9288e4d 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/text/json/TestJsonWriteVisitor.java +++ b/src/test/java/com/avaje/ebeaninternal/server/text/json/TestJsonWriteVisitor.java @@ -26,12 +26,12 @@ public class TestJsonWriteVisitor extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Customer.class) - .select("id, name, status") - .fetch("billingAddress", "line1, city") - .fetch("billingAddress.country", "*") - .fetch("contacts", "firstName,email") - .order().desc("id") - .findList(); + .select("id, name, status") + .fetch("billingAddress", "line1, city") + .fetch("billingAddress.country", "*") + .fetch("contacts", "firstName,email") + .order().desc("id") + .findList(); JsonContext json = Ebean.json(); diff --git a/src/test/java/com/avaje/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java b/src/test/java/com/avaje/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java index 9341e3d3d..5faec58e6 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java +++ b/src/test/java/com/avaje/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java @@ -26,12 +26,12 @@ public class TestTextJsonBeanReadVisitor extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Customer.class) - .select("id, name, status, shippingAddress") - .fetch("billingAddress", "line1, city") - .fetch("billingAddress.country", "*") - .fetch("contacts", "firstName,email") - .order().desc("id") - .findList(); + .select("id, name, status, shippingAddress") + .fetch("billingAddress", "line1, city") + .fetch("billingAddress.country", "*") + .fetch("contacts", "firstName,email") + .order().desc("id") + .findList(); JsonContext json = Ebean.json(); diff --git a/src/test/java/com/avaje/ebeaninternal/server/text/json/WriteJsonDirtyTest.java b/src/test/java/com/avaje/ebeaninternal/server/text/json/WriteJsonDirtyTest.java index 4b3f64772..819fb62db 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/text/json/WriteJsonDirtyTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/text/json/WriteJsonDirtyTest.java @@ -26,16 +26,16 @@ public class WriteJsonDirtyTest { List customers = Ebean.find(Customer.class).findList(); Customer customer = Ebean.find(Customer.class).setId(customers.get(0).getId()) - .setUseCache(false) - .findUnique(); + .setUseCache(false) + .findUnique(); - SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null); + SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); BeanDescriptor descriptor = server.getBeanDescriptor(Customer.class); customer.setName("dirtyCustName"); customer.setAnniversary(new Date(System.currentTimeMillis())); - EntityBean entityBean = (EntityBean)customer; + EntityBean entityBean = (EntityBean) customer; boolean[] dirtyProperties = entityBean._ebean_getIntercept().getDirtyProperties(); StringWriter writer = new StringWriter(); diff --git a/src/test/java/com/avaje/ebeaninternal/server/text/json/WriteJsonTest.java b/src/test/java/com/avaje/ebeaninternal/server/text/json/WriteJsonTest.java index a200d80df..e347b2533 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/text/json/WriteJsonTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/text/json/WriteJsonTest.java @@ -1,8 +1,8 @@ package com.avaje.ebeaninternal.server.text.json; +import com.avaje.ebean.FetchPath; import com.avaje.ebean.config.JsonConfig; import com.avaje.ebean.text.PathProperties; -import com.avaje.ebean.FetchPath; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import org.junit.Test; @@ -10,7 +10,7 @@ import org.junit.Test; import java.io.IOException; import java.io.StringWriter; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; public class WriteJsonTest { @@ -56,4 +56,4 @@ public class WriteJsonTest { writeJson.endAssocMany(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/transaction/JdbcTransactionTest.java b/src/test/java/com/avaje/ebeaninternal/server/transaction/JdbcTransactionTest.java index 7d9b5ecc6..7b6b35a6b 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/transaction/JdbcTransactionTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/transaction/JdbcTransactionTest.java @@ -54,7 +54,7 @@ public class JdbcTransactionTest { contactNatKeyCache.getStatistics(true); Customer.find.byId(19898989); - Ebean.find(Contact.class).where().eq("email","junk@foo.com").findUnique(); + Ebean.find(Contact.class).where().eq("email", "junk@foo.com").findUnique(); assertThat(customerBeanCache.getStatistics(true).getMissCount()).isEqualTo(1); assertThat(contactNatKeyCache.getStatistics(true).getMissCount()).isEqualTo(1); @@ -64,7 +64,7 @@ public class JdbcTransactionTest { // these don't hit L2 cache due to the save of b1 Customer.find.byId(29898989); - Ebean.find(Contact.class).where().eq("email","junk2@foo.com").findUnique(); + Ebean.find(Contact.class).where().eq("email", "junk2@foo.com").findUnique(); assertThat(customerBeanCache.getStatistics(true).getMissCount()).isEqualTo(0); assertThat(contactNatKeyCache.getStatistics(true).getMissCount()).isEqualTo(0); @@ -74,4 +74,4 @@ public class JdbcTransactionTest { } } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ConvertInetAddressTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ConvertInetAddressTest.java index 04b4890be..1cf8a89cc 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ConvertInetAddressTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ConvertInetAddressTest.java @@ -1,32 +1,32 @@ package com.avaje.ebeaninternal.server.type; -import java.net.InetAddress; - import org.junit.Assert; import org.junit.Test; +import java.net.InetAddress; + public class ConvertInetAddressTest { @Test public void forString() { - + InetAddress addr = ConvertInetAddresses.forString("128.1.10.23"); Assert.assertNotNull(addr); Assert.assertEquals("128.1.10.23", addr.getHostAddress()); - + String ip6addr = "2001:db8:85a3:0:0:8a2e:370:7334"; InetAddress addr6 = ConvertInetAddresses.forString(ip6addr); String uriAddr6 = ConvertInetAddresses.toUriString(addr6); - Assert.assertEquals("["+ip6addr+"]", uriAddr6); + Assert.assertEquals("[" + ip6addr + "]", uriAddr6); Assert.assertEquals(ip6addr, addr6.getHostAddress()); } @Test public void toUriString() { - + InetAddress addr = ConvertInetAddresses.forString("128.1.10.23"); Assert.assertEquals("128.1.10.23", addr.getHostAddress()); - + String uriAddr = ConvertInetAddresses.toUriString(addr); Assert.assertEquals("128.1.10.23", uriAddr); } diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/DefaultTypeFactoryTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/DefaultTypeFactoryTest.java index f4db70110..323e644ef 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/DefaultTypeFactoryTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/DefaultTypeFactoryTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import java.sql.Types; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class DefaultTypeFactoryTest { @@ -24,4 +24,4 @@ public class DefaultTypeFactoryTest { assertEquals(Types.VARCHAR, stStringBoolean.getJdbcType()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/DefaultTypeManagerTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/DefaultTypeManagerTest.java index cca2a3e9f..013f4b017 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/DefaultTypeManagerTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/DefaultTypeManagerTest.java @@ -5,7 +5,8 @@ import com.avaje.ebean.config.dbplatform.PostgresPlatform; import com.avaje.ebeaninternal.server.core.bootup.BootupClasses; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class DefaultTypeManagerTest { @@ -32,4 +33,4 @@ public class DefaultTypeManagerTest { assertFalse(typeManager.isIntegerType(" A")); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/JsonTester.java b/src/test/java/com/avaje/ebeaninternal/server/type/JsonTester.java index fab435c37..5fd9d493b 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/JsonTester.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/JsonTester.java @@ -21,7 +21,7 @@ public class JsonTester { protected ScalarType type; - public JsonTester(ScalarType type ) { + public JsonTester(ScalarType type) { this.type = type; } diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareListTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareListTest.java index dea108068..2e6a2dc6d 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareListTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareListTest.java @@ -2,7 +2,11 @@ package com.avaje.ebeaninternal.server.type; import org.junit.Test; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; import static org.junit.Assert.*; @@ -11,9 +15,10 @@ public class ModifyAwareListTest { private ModifyAwareList createList() { ArrayList list = new ArrayList(); - list.addAll(Arrays.asList("A","B","C","D","E")); + list.addAll(Arrays.asList("A", "B", "C", "D", "E")); return new ModifyAwareList<>(list); } + private ModifyAwareList createEmptyList() { return new ModifyAwareList<>(new ArrayList<>()); } @@ -237,4 +242,4 @@ public class ModifyAwareListTest { assertTrue(set.isMarkedDirty()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareMapTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareMapTest.java index a50997680..b6fb8d94a 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareMapTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ModifyAwareMapTest.java @@ -2,7 +2,11 @@ package com.avaje.ebeaninternal.server.type; import org.junit.Test; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; import static org.junit.Assert.*; @@ -177,4 +181,4 @@ public class ModifyAwareMapTest { assertEquals(map.size(), entries.size()); assertFalse(map.isMarkedDirty()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeBooleanTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeBooleanTest.java index 19e36c2c7..04c4ed125 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeBooleanTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeBooleanTest.java @@ -6,9 +6,7 @@ import com.avaje.ebean.text.json.JsonContext; import com.avaje.tests.model.basic.TOne; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class ScalarTypeBooleanTest { @@ -42,4 +40,4 @@ public class ScalarTypeBooleanTest { assertEquals(json, "{\"id\":42,\"active\":false}"); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDateTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDateTest.java index 4742b8e17..55f86c213 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDateTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDateTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import java.sql.Date; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class ScalarTypeDateTest { @@ -19,4 +19,4 @@ public class ScalarTypeDateTest { Date parsed = type.parse(format); assertEquals(parsed, postgresInfinityDate); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationTest.java index 5a41641d2..8b75ba954 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationTest.java @@ -9,9 +9,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.time.Duration; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.*; public class ScalarTypeDurationTest { @@ -61,7 +59,7 @@ public class ScalarTypeDurationTest { Duration val1 = type.toBeanType(duration); Duration val2 = type.toBeanType(seconds); - Duration val3 = type.toBeanType((int)seconds); + Duration val3 = type.toBeanType((int) seconds); assertEquals(duration, val1); assertEquals(duration, val2); @@ -79,7 +77,7 @@ public class ScalarTypeDurationTest { @Test public void testParse() throws Exception { - Duration duration = type.parse("PT20M34S"); + Duration duration = type.parse("PT20M34S"); assertEquals(Duration.ofSeconds(1234), duration); } @@ -105,4 +103,4 @@ public class ScalarTypeDurationTest { } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java index 199835aa2..6ae6d1a13 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeDurationWithNanosTest.java @@ -10,9 +10,7 @@ import java.io.ObjectOutputStream; import java.math.BigDecimal; import java.time.Duration; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.*; public class ScalarTypeDurationWithNanosTest { @@ -79,7 +77,7 @@ public class ScalarTypeDurationWithNanosTest { public void testParse() throws Exception { Duration duration = Duration.ofSeconds(323, 1500000); - Duration val1 = type.parse("PT5M23.0015S"); + Duration val1 = type.parse("PT5M23.0015S"); assertEquals(duration, val1); } @@ -104,4 +102,4 @@ public class ScalarTypeDurationWithNanosTest { jsonTester.test(duration); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstantTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstantTest.java index ccb40bce2..926cc4e1c 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstantTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeInstantTest.java @@ -10,9 +10,7 @@ import java.io.ObjectOutputStream; import java.sql.Timestamp; import java.time.Instant; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class ScalarTypeInstantTest { @@ -69,7 +67,7 @@ public class ScalarTypeInstantTest { Instant now = Instant.now(); Timestamp timestamp = Timestamp.from(now); String formatted = type.formatValue(now); - assertEquals(""+timestamp.getTime(), formatted); + assertEquals("" + timestamp.getTime(), formatted); } @Test @@ -77,7 +75,7 @@ public class ScalarTypeInstantTest { Instant now = Instant.now(); Timestamp timestamp = Timestamp.from(now); - Instant val1 = type.parse(""+timestamp.getTime()); + Instant val1 = type.parse("" + timestamp.getTime()); assertEquals(now, val1); } @@ -133,4 +131,4 @@ public class ScalarTypeInstantTest { } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java index 948fee29a..9febb2a31 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeJodaLocalDateTimeTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import java.sql.Timestamp; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class ScalarTypeJodaLocalDateTimeTest { @@ -40,4 +40,4 @@ public class ScalarTypeJodaLocalDateTimeTest { return new Timestamp(t.toDateTime(DateTimeZone.getDefault()).getMillis()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTest.java index f556822f0..8ca29d809 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTest.java @@ -5,7 +5,8 @@ import org.junit.Test; import java.sql.Date; import java.time.LocalDate; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class ScalarTypeLocalDateTest { @@ -53,4 +54,4 @@ public class ScalarTypeLocalDateTest { assertEquals(localDate, localDate1); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java index 1f5211cdc..c4b1dbeb9 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeTest.java @@ -10,9 +10,7 @@ import java.io.ObjectOutputStream; import java.sql.Time; import java.time.LocalTime; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.*; public class ScalarTypeLocalTimeTest { @@ -101,4 +99,4 @@ public class ScalarTypeLocalTimeTest { jsonTester.test(localTime); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java index 31d23fedb..c7b08cc86 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanosTest.java @@ -9,9 +9,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.time.LocalTime; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.*; public class ScalarTypeLocalTimeWithNanosTest { @@ -102,5 +100,4 @@ public class ScalarTypeLocalTimeWithNanosTest { } - -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDayTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDayTest.java index 1b3c05fc8..18b3f6d87 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDayTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeMonthDayTest.java @@ -6,7 +6,8 @@ import java.sql.Date; import java.time.LocalDate; import java.time.MonthDay; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; public class ScalarTypeMonthDayTest { @@ -72,4 +73,4 @@ public class ScalarTypeMonthDayTest { public void testReadWriteData() throws Exception { } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java index db565a2ea..615cde86e 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeOffsetDateTimeTest.java @@ -6,9 +6,7 @@ import org.junit.Test; import java.sql.Timestamp; import java.time.OffsetDateTime; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class ScalarTypeOffsetDateTimeTest { @@ -76,4 +74,4 @@ public class ScalarTypeOffsetDateTimeTest { jsonTester = new JsonTester(typeIso); jsonTester.test(now); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePathTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePathTest.java index b14c2569b..25a0c04bb 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePathTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePathTest.java @@ -10,9 +10,9 @@ import static org.junit.Assert.assertEquals; public class ScalarTypePathTest { private static final String TEMP_PATH = new File("/tmp").getAbsolutePath(); - + private ScalarTypePath type = new ScalarTypePath(); - + @Test public void convertFromDbString() throws Exception { @@ -35,4 +35,4 @@ public class ScalarTypePathTest { assertEquals(path, converted); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java index 9a52898aa..21209cda6 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypePostgresHstoreTest.java @@ -12,9 +12,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class ScalarTypePostgresHstoreTest { @@ -34,10 +32,10 @@ public class ScalarTypePostgresHstoreTest { @Test public void testIsDirty() throws Exception { - Map emptyMap = new HashMap<>(); + Map emptyMap = new HashMap<>(); assertTrue(hstore.isDirty(emptyMap)); - ModifyAwareMap modAware = new ModifyAwareMap<>(emptyMap); + ModifyAwareMap modAware = new ModifyAwareMap<>(emptyMap); assertFalse(hstore.isDirty(modAware)); modAware.put("foo", "Rob"); assertTrue(hstore.isDirty(emptyMap)); @@ -46,7 +44,7 @@ public class ScalarTypePostgresHstoreTest { @Test @SuppressWarnings("unchecked") public void testParse() throws Exception { - Map map = (Map)hstore.parse("{\"name\":\"rob\"}"); + Map map = (Map) hstore.parse("{\"name\":\"rob\"}"); assertEquals(1, map.size()); assertEquals("rob", map.get("name")); } @@ -54,7 +52,7 @@ public class ScalarTypePostgresHstoreTest { @Test(expected = RuntimeException.class) @SuppressWarnings("unchecked") public void testParseDateTime() throws Exception { - Map map = (Map)hstore.convertFromMillis(1234L); + Map map = (Map) hstore.convertFromMillis(1234L); assertEquals(1, map.size()); assertEquals("rob", map.get("name")); } @@ -62,7 +60,7 @@ public class ScalarTypePostgresHstoreTest { @Test public void testJsonWrite() throws Exception { - Map map = new LinkedHashMap<>(); + Map map = new LinkedHashMap<>(); assertEquals("{\"key\":{}}", generateJson(map)); @@ -88,13 +86,13 @@ public class ScalarTypePostgresHstoreTest { } @SuppressWarnings("unchecked") - private Map parseHstore(String json) throws IOException { + private Map parseHstore(String json) throws IOException { JsonParser parser = jsonFactory.createParser(json); // BeanProperty reads the first token checking for null so // simulate that here JsonToken token = parser.nextToken(); assertEquals(JsonToken.START_OBJECT, token); - return (Map)hstore.jsonRead(parser); + return (Map) hstore.jsonRead(parser); } private String generateJson(Map map) throws IOException { @@ -113,4 +111,4 @@ public class ScalarTypePostgresHstoreTest { return writer.toString(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearTest.java index 9246221f7..7552dd21c 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeYearTest.java @@ -9,9 +9,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.time.Year; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.*; public class ScalarTypeYearTest { @@ -97,4 +95,4 @@ public class ScalarTypeYearTest { jsonTester.test(Year.of(2013)); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneIdTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneIdTest.java index ac59b0da5..daddf28d7 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneIdTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZoneIdTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import java.time.ZoneId; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class ScalarTypeZoneIdTest { @@ -37,4 +37,4 @@ public class ScalarTypeZoneIdTest { assertEquals(zoneId, val1); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java index 0e9c7aa08..13cdb9c8a 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeZonedDateTimeTest.java @@ -6,9 +6,7 @@ import org.junit.Test; import java.sql.Timestamp; import java.time.ZonedDateTime; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class ScalarTypeZonedDateTimeTest { @@ -77,4 +75,4 @@ public class ScalarTypeZonedDateTimeTest { jsonTester = new JsonTester(typeIso); jsonTester.test(now); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/TestEnumToBeanType.java b/src/test/java/com/avaje/ebeaninternal/server/type/TestEnumToBeanType.java index 75e86eca3..39515a80f 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/TestEnumToBeanType.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/TestEnumToBeanType.java @@ -1,39 +1,38 @@ package com.avaje.ebeaninternal.server.type; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebeaninternal.server.type.ScalarTypeEnumStandard.OrdinalEnum; import com.avaje.ebeaninternal.server.type.ScalarTypeEnumStandard.StringEnum; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Order; +import org.junit.Assert; +import org.junit.Test; public class TestEnumToBeanType { @Test public void test() { - - StringEnum stringEnum = new ScalarTypeEnumStandard.StringEnum(Order.Status.class); - - OrdinalEnum ordinalEnum = new ScalarTypeEnumStandard.OrdinalEnum(Order.Status.class); - - EnumToDbValueMap beanDbMap = EnumToDbValueMap.create(false); - beanDbMap.add(Customer.Status.ACTIVE, "A", Customer.Status.ACTIVE.name()); - beanDbMap.add(Customer.Status.NEW, "N", Customer.Status.NEW.name()); - beanDbMap.add(Customer.Status.INACTIVE, "I", Customer.Status.INACTIVE.name()); - - ScalarTypeEnumWithMapping withMapping = new ScalarTypeEnumWithMapping(beanDbMap, Customer.Status.class, 1); - - - Object approved = stringEnum.toBeanType(Order.Status.APPROVED); - Assert.assertTrue(approved == Order.Status.APPROVED); - approved = ordinalEnum.toBeanType(Order.Status.APPROVED); - Assert.assertTrue(approved == Order.Status.APPROVED); + StringEnum stringEnum = new ScalarTypeEnumStandard.StringEnum(Order.Status.class); - Object active = withMapping.toBeanType(Customer.Status.ACTIVE); - Assert.assertTrue(active == Customer.Status.ACTIVE); + OrdinalEnum ordinalEnum = new ScalarTypeEnumStandard.OrdinalEnum(Order.Status.class); + + EnumToDbValueMap beanDbMap = EnumToDbValueMap.create(false); + beanDbMap.add(Customer.Status.ACTIVE, "A", Customer.Status.ACTIVE.name()); + beanDbMap.add(Customer.Status.NEW, "N", Customer.Status.NEW.name()); + beanDbMap.add(Customer.Status.INACTIVE, "I", Customer.Status.INACTIVE.name()); + + ScalarTypeEnumWithMapping withMapping = new ScalarTypeEnumWithMapping(beanDbMap, Customer.Status.class, 1); + + + Object approved = stringEnum.toBeanType(Order.Status.APPROVED); + Assert.assertTrue(approved == Order.Status.APPROVED); + + approved = ordinalEnum.toBeanType(Order.Status.APPROVED); + Assert.assertTrue(approved == Order.Status.APPROVED); + + Object active = withMapping.toBeanType(Customer.Status.ACTIVE); + Assert.assertTrue(active == Customer.Status.ACTIVE); } - + } diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java b/src/test/java/com/avaje/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java index 9a760a3d8..9bc8b3631 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/TestScalarTypeUUIDBinaryConversion.java @@ -1,22 +1,22 @@ package com.avaje.ebeaninternal.server.type; -import java.util.UUID; - import org.junit.Assert; import org.junit.Test; +import java.util.UUID; + public class TestScalarTypeUUIDBinaryConversion { @Test public void testConversion() { - + UUID id = UUID.randomUUID(); - + byte[] bytes = ScalarTypeUUIDBinary.convertToBytes(id); Assert.assertEquals(16, bytes.length); - + UUID id2 = ScalarTypeUUIDBinary.convertFromBytes(bytes); Assert.assertEquals(id, id2); } - + } diff --git a/src/test/java/com/avaje/ebeaninternal/server/util/Md5Test.java b/src/test/java/com/avaje/ebeaninternal/server/util/Md5Test.java index 2d676d13a..ccf719454 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/util/Md5Test.java +++ b/src/test/java/com/avaje/ebeaninternal/server/util/Md5Test.java @@ -2,7 +2,7 @@ package com.avaje.ebeaninternal.server.util; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class Md5Test { @@ -15,4 +15,4 @@ public class Md5Test { assertEquals(hash1, hash2); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java b/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java index 090e9b932..83c2d6d36 100644 --- a/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java +++ b/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java @@ -26,7 +26,7 @@ public class DocStoreBeanBaseAdapterTest extends BaseTestCase { SpiEbeanServer server = spiEbeanServer(); BeanDescriptor orderDesc = server.getBeanDescriptor(Order.class); - DeployBeanDescriptor deployDesc = (DeployBeanDescriptor)mock(DeployBeanDescriptor.class); + DeployBeanDescriptor deployDesc = (DeployBeanDescriptor) mock(DeployBeanDescriptor.class); TDAdapter adapter = new TDAdapter<>(orderDesc, deployDesc); @@ -65,4 +65,4 @@ public class DocStoreBeanBaseAdapterTest extends BaseTestCase { public void updateEmbedded(Object idValue, String embeddedProperty, String embeddedRawContent, DocStoreUpdateContext txn) throws IOException { } } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java b/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java index f864180a5..5d3e61013 100644 --- a/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java +++ b/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java @@ -14,9 +14,7 @@ import org.mockito.Mockito; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; public class DocStoreDeleteEventTest { @@ -35,7 +33,7 @@ public class DocStoreDeleteEventTest { public void docStoreUpdate() throws Exception { BeanType mock = (BeanType) Mockito.mock(BeanType.class); - BeanDocType mockDocType = (BeanDocType)Mockito.mock(BeanDocType.class); + BeanDocType mockDocType = (BeanDocType) Mockito.mock(BeanDocType.class); when(mock.docStore()).thenReturn(mockDocType); DocStoreDeleteEvent event = new DocStoreDeleteEvent(mock, 42); @@ -62,4 +60,4 @@ public class DocStoreDeleteEventTest { StrictAssertions.assertThat(entry.getPath()).isNull(); assertThat(entry.getType()).isEqualTo(DocStoreQueueEntry.Action.DELETE); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java b/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java index 67128499a..b487f6499 100644 --- a/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java +++ b/src/test/java/com/avaje/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java @@ -13,9 +13,7 @@ import org.mockito.Mockito; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; public class DocStoreIndexEventTest { @@ -33,8 +31,8 @@ public class DocStoreIndexEventTest { @SuppressWarnings("unchecked") public void docStoreUpdate() throws Exception { - BeanType mock = (BeanType)Mockito.mock(BeanType.class); - BeanDocType mockDocType = (BeanDocType)Mockito.mock(BeanDocType.class); + BeanType mock = (BeanType) Mockito.mock(BeanType.class); + BeanDocType mockDocType = (BeanDocType) Mockito.mock(BeanDocType.class); when(mock.docStore()).thenReturn(mockDocType); Order bean = new Order(); @@ -65,4 +63,4 @@ public class DocStoreIndexEventTest { assertThat(entry.getPath()).isNull(); assertThat(entry.getType()).isEqualTo(DocStoreQueueEntry.Action.INDEX); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/autofetch/AutofetchEmbeddedTest.java b/src/test/java/com/avaje/tests/autofetch/AutofetchEmbeddedTest.java index ab24df13c..4d3df1ec8 100644 --- a/src/test/java/com/avaje/tests/autofetch/AutofetchEmbeddedTest.java +++ b/src/test/java/com/avaje/tests/autofetch/AutofetchEmbeddedTest.java @@ -1,15 +1,12 @@ package com.avaje.tests.autofetch; -import java.util.List; - -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.embedded.EMain; import com.avaje.tests.model.embedded.Eembeddable; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class AutofetchEmbeddedTest extends BaseTestCase { @@ -18,23 +15,23 @@ public class AutofetchEmbeddedTest extends BaseTestCase { @Test public void testEmbeddedBeanLazyLoadAndUpdate() { - + EMain testBean = new EMain(); testBean.setName("test"); testBean.getEmbeddable().setDescription("test description"); Ebean.save(testBean); EMain partialBean = Ebean.find(EMain.class).select("version").setId(testBean.getId()).findUnique(); - + logger.info(" -- invoke lazy loading of embedded bean"); Eembeddable embeddable = partialBean.getEmbeddable(); embeddable.setDescription("modified description"); - + logger.info(" -- update bean"); Ebean.save(partialBean); - + } - + @Test public void testEmbeddedBeanQueryTuning() { // Ebean.getServer(null).getAutoTune().setProfiling(true); diff --git a/src/test/java/com/avaje/tests/autofetch/MainAutoFetchExcludeLazyLobs.java b/src/test/java/com/avaje/tests/autofetch/MainAutoFetchExcludeLazyLobs.java index e53931b16..296e334fd 100644 --- a/src/test/java/com/avaje/tests/autofetch/MainAutoFetchExcludeLazyLobs.java +++ b/src/test/java/com/avaje/tests/autofetch/MainAutoFetchExcludeLazyLobs.java @@ -7,28 +7,26 @@ import java.util.List; public class MainAutoFetchExcludeLazyLobs { - public static void main(String[] args) { - - EBasicClob a = new EBasicClob(); - a.setName("name 1"); - a.setTitle("a title"); - a.setDescription("not that meaningful"); - - Ebean.save(a); - - List list = Ebean.find(EBasicClob.class) - .setAutoTune(true) - .findList(); - - for (EBasicClob bean : list) { - bean.getName(); - // although we read the description - // autofetch will not include it later - bean.getDescription(); - } - - - - + public static void main(String[] args) { + + EBasicClob a = new EBasicClob(); + a.setName("name 1"); + a.setTitle("a title"); + a.setDescription("not that meaningful"); + + Ebean.save(a); + + List list = Ebean.find(EBasicClob.class) + .setAutoTune(true) + .findList(); + + for (EBasicClob bean : list) { + bean.getName(); + // although we read the description + // autofetch will not include it later + bean.getDescription(); } + + + } } diff --git a/src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java b/src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java index 1f6cb05e5..f720fa691 100644 --- a/src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java +++ b/src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java @@ -8,27 +8,27 @@ import java.util.List; public class MainAutoQueryTune1 { - public static void main(String[] args) { + public static void main(String[] args) { - ResetBasicData.reset(); + ResetBasicData.reset(); - MainAutoQueryTune1 me = new MainAutoQueryTune1(); - me.tuneJoin(); - } + MainAutoQueryTune1 me = new MainAutoQueryTune1(); + me.tuneJoin(); + } - private void tuneJoin() { - List list = Ebean.find(Order.class) - .setAutoTune(true) - .fetch("customer") - .where() - .eq("status", Order.Status.NEW) - .eq("customer.name", "Rob") - .order().asc("id") - .findList(); + private void tuneJoin() { + List list = Ebean.find(Order.class) + .setAutoTune(true) + .fetch("customer") + .where() + .eq("status", Order.Status.NEW) + .eq("customer.name", "Rob") + .order().asc("id") + .findList(); - for (Order order : list) { - order.getId(); + for (Order order : list) { + order.getId(); order.getOrderDate(); - } - } + } + } } diff --git a/src/test/java/com/avaje/tests/autofetch/TunedQueryInfoTest.java b/src/test/java/com/avaje/tests/autofetch/TunedQueryInfoTest.java index 9a80c7684..a785e9dfe 100644 --- a/src/test/java/com/avaje/tests/autofetch/TunedQueryInfoTest.java +++ b/src/test/java/com/avaje/tests/autofetch/TunedQueryInfoTest.java @@ -1,14 +1,5 @@ package com.avaje.tests.autofetch; -import java.util.List; -import java.util.Set; - -import com.avaje.ebeaninternal.server.autotune.model.Origin; -import org.avaje.ebeantest.LoggedSqlCollector; -import org.jetbrains.annotations.NotNull; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; @@ -17,82 +8,90 @@ import com.avaje.ebean.bean.EntityBean; import com.avaje.ebean.bean.EntityBeanIntercept; import com.avaje.ebean.cache.ServerCacheManager; import com.avaje.ebeaninternal.api.SpiQuery; +import com.avaje.ebeaninternal.server.autotune.model.Origin; import com.avaje.ebeaninternal.server.autotune.service.TunedQueryInfo; import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; +import org.avaje.ebeantest.LoggedSqlCollector; +import org.jetbrains.annotations.NotNull; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; +import java.util.Set; public class TunedQueryInfoTest extends BaseTestCase { EbeanServer server = Ebean.getServer(null); - + private void init() { - + ResetBasicData.reset(); - + ServerCacheManager serverCacheManager = Ebean.getServer(null).getServerCacheManager(); serverCacheManager.clearAll(); } - + @Test public void withSelectEmpty() { - + init(); - + OrmQueryDetail tunedDetail = new OrmQueryDetail(); tunedDetail.select(""); TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail); Query query = server.find(Order.class).setId(1); - + tunedInfo.tuneQuery((SpiQuery) query); - + Order order = query.findUnique(); - EntityBean eb = (EntityBean)order; + EntityBean eb = (EntityBean) order; EntityBeanIntercept ebi = eb._ebean_getIntercept(); - + Assert.assertTrue(ebi.isFullyLoadedBean()); - + Set loadedPropertyNames = ebi.getLoadedPropertyNames(); Assert.assertNull(loadedPropertyNames); - + // invoke lazy loading order.getCustomer(); } - + @Test public void withSelectSomethingThatDoesNotExist() { - + init(); - + OrmQueryDetail tunedDetail = new OrmQueryDetail(); tunedDetail.select("somethingThatDoesNotExist"); TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail); Query query = server.find(Order.class).setId(1); - + tunedInfo.tuneQuery((SpiQuery) query); - + LoggedSqlCollector.start(); - + Order order = query.findUnique(); - EntityBean eb = (EntityBean)order; + EntityBean eb = (EntityBean) order; EntityBeanIntercept ebi = eb._ebean_getIntercept(); - + Assert.assertFalse(ebi.isFullyLoadedBean()); - + // id and any ToMany relationships Set loadedPropertyNames = ebi.getLoadedPropertyNames(); Assert.assertNotNull(loadedPropertyNames); - + // invoke lazy loading order.getCustomer(); - + List loggedSql = LoggedSqlCollector.stop(); Assert.assertEquals(2, loggedSql.size()); - + Assert.assertTrue(trimSql(loggedSql.get(0), 1).contains("select t0.id, t0.id from o_order t0 where t0.id = ?")); Assert.assertTrue(trimSql(loggedSql.get(1), 1).contains("select t0.id, t0.status,")); } @@ -106,72 +105,72 @@ public class TunedQueryInfoTest extends BaseTestCase { @Test public void withSelectSomeIncludeLazyLoaded() { - + init(); OrmQueryDetail tunedDetail = new OrmQueryDetail(); tunedDetail.select("status, customer"); - + TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail); - + Query query = server.find(Order.class).setId(1); - + tunedInfo.tuneQuery((SpiQuery) query); - + LoggedSqlCollector.start(); - + Order order = query.findUnique(); - EntityBean eb = (EntityBean)order; + EntityBean eb = (EntityBean) order; EntityBeanIntercept ebi = eb._ebean_getIntercept(); - + Assert.assertFalse(ebi.isFullyLoadedBean()); - + Set loadedPropertyNames = ebi.getLoadedPropertyNames(); Assert.assertNotNull(loadedPropertyNames); - + Assert.assertTrue(loadedPropertyNames.contains("status")); Assert.assertTrue(loadedPropertyNames.contains("customer")); - + // no lazy loading expected here order.getCustomer(); - + List loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(1, loggedSql.size()); + Assert.assertEquals(1, loggedSql.size()); } - + @Test public void withSelectSome() { - + init(); - + OrmQueryDetail tunedDetail = new OrmQueryDetail(); tunedDetail.select("status"); - + TunedQueryInfo tunedInfo = createTunedQueryInfo(tunedDetail); - + Query query = server.find(Order.class).setId(1); - + tunedInfo.tuneQuery((SpiQuery) query); - + LoggedSqlCollector.start(); - + Order order = query.findUnique(); - EntityBean eb = (EntityBean)order; + EntityBean eb = (EntityBean) order; EntityBeanIntercept ebi = eb._ebean_getIntercept(); - + Assert.assertFalse(ebi.isFullyLoadedBean()); - + Set loadedPropertyNames = ebi.getLoadedPropertyNames(); Assert.assertNotNull(loadedPropertyNames); - + Assert.assertTrue(loadedPropertyNames.contains("status")); Assert.assertFalse(loadedPropertyNames.contains("customer")); - + // no lazy loading expected here order.getCustomer(); - + List loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(2, loggedSql.size()); + Assert.assertEquals(2, loggedSql.size()); } - + } diff --git a/src/test/java/com/avaje/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java b/src/test/java/com/avaje/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java index 501614941..60f829223 100644 --- a/src/test/java/com/avaje/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java +++ b/src/test/java/com/avaje/tests/autofetch/TunedQueryWithNullFetchedBeanTest.java @@ -1,12 +1,5 @@ package com.avaje.tests.autofetch; -import java.util.List; -import java.util.Set; - -import org.avaje.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; @@ -16,32 +9,38 @@ import com.avaje.ebean.bean.EntityBeanIntercept; import com.avaje.tests.model.basic.Address; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.avaje.ebeantest.LoggedSqlCollector; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; +import java.util.Set; public class TunedQueryWithNullFetchedBeanTest extends BaseTestCase { EbeanServer server = Ebean.getServer(null); - + @Test public void withFetchOfNullBeanJoin() { - + ResetBasicData.reset(); - + Customer newCustomer = new Customer(); newCustomer.setName("TestFetchBillingAddress"); server.save(newCustomer); - + Query query = server.find(Customer.class) - .setId(newCustomer.getId()) - .fetch("billingAddress","id"); - + .setId(newCustomer.getId()) + .fetch("billingAddress", "id"); + LoggedSqlCollector.start(); - + Customer customer = query.findUnique(); - EntityBean eb = (EntityBean)customer; + EntityBean eb = (EntityBean) customer; EntityBeanIntercept ebi = eb._ebean_getIntercept(); - + Assert.assertTrue(ebi.isFullyLoadedBean()); - + // find the internal property index for "billingAddress" String[] propNames = eb._ebean_getPropertyNames(); int pos = 0; @@ -50,19 +49,19 @@ public class TunedQueryWithNullFetchedBeanTest extends BaseTestCase { pos = i; } } - + // The billing address is loaded (but value null) Assert.assertTrue(ebi.isLoadedProperty(pos)); - + Set loadedPropertyNames = ebi.getLoadedPropertyNames(); Assert.assertNull(loadedPropertyNames); - + // no lazy loading expected here, value is null Address billingAddress = customer.getBillingAddress(); Assert.assertNull(billingAddress); - + // assert only one query executed List loggedSql = LoggedSqlCollector.stop(); - Assert.assertEquals(1, loggedSql.size()); + Assert.assertEquals(1, loggedSql.size()); } } diff --git a/src/test/java/com/avaje/tests/basic/MainDbBoolean.java b/src/test/java/com/avaje/tests/basic/MainDbBoolean.java index e3c2ab758..a4fe53a0f 100644 --- a/src/test/java/com/avaje/tests/basic/MainDbBoolean.java +++ b/src/test/java/com/avaje/tests/basic/MainDbBoolean.java @@ -1,156 +1,154 @@ package com.avaje.tests.basic; -import java.util.List; - -import org.junit.Assert; - import com.avaje.ebean.EbeanServer; import com.avaje.ebean.EbeanServerFactory; import com.avaje.ebean.Query; import com.avaje.ebean.SqlRow; -import org.avaje.datasource.DataSourceConfig; import com.avaje.ebean.config.ServerConfig; import com.avaje.ebean.config.dbplatform.PostgresPlatform; import com.avaje.tests.model.basic.TOne; import com.avaje.tests.model.basic.TSDetail; import com.avaje.tests.model.basic.TSMaster; +import org.avaje.datasource.DataSourceConfig; +import org.junit.Assert; + +import java.util.List; /** * Used to run some tests manually on a specific Database type. */ public class MainDbBoolean { - - public static void main(String[] args) { - - MainDbBoolean me = new MainDbBoolean(); - - EbeanServer server = me.createEbeanServer(); - me.simpleCheck(server); - - EbeanServer oraServer = me.createOracleEbeanServer(); - me.simpleCheck(oraServer); - } - /** - * Create a server for running small oracle specific tests manually. - * DDL generation etc. - */ - private EbeanServer createOracleEbeanServer() { + public static void main(String[] args) { - System.setProperty("ebean.ignoreExtraDdl", "true"); + MainDbBoolean me = new MainDbBoolean(); - ServerConfig c = new ServerConfig(); - c.setName("ora"); + EbeanServer server = me.createEbeanServer(); + me.simpleCheck(server); - // requires oracle driver in class path - DataSourceConfig oraDb = new DataSourceConfig(); - oraDb.setDriver("oracle.jdbc.driver.OracleDriver"); - oraDb.setUsername("junk"); - oraDb.setPassword("junk"); - oraDb.setUrl("jdbc:oracle:thin:junk/junk@localhost:1521:XE"); - oraDb.setHeartbeatSql("select count(*) from dual"); - - - c.loadFromProperties(); - c.setDdlGenerate(true); - c.setDdlRun(true); - c.setDefaultServer(false); - c.setRegister(false); - c.setDataSourceConfig(oraDb); - - //c.setDatabaseBooleanTrue("1"); - //c.setDatabaseBooleanFalse("0"); - c.setDatabaseBooleanTrue("T"); - c.setDatabaseBooleanFalse("F"); + EbeanServer oraServer = me.createOracleEbeanServer(); + me.simpleCheck(oraServer); + } - c.addClass(TOne.class); - c.addClass(TSMaster.class); - c.addClass(TSDetail.class); + /** + * Create a server for running small oracle specific tests manually. + * DDL generation etc. + */ + private EbeanServer createOracleEbeanServer() { - return EbeanServerFactory.create(c); + System.setProperty("ebean.ignoreExtraDdl", "true"); - } - - private EbeanServer createEbeanServer() { + ServerConfig c = new ServerConfig(); + c.setName("ora"); - System.setProperty("ebean.ignoreExtraDdl", "true"); + // requires oracle driver in class path + DataSourceConfig oraDb = new DataSourceConfig(); + oraDb.setDriver("oracle.jdbc.driver.OracleDriver"); + oraDb.setUsername("junk"); + oraDb.setPassword("junk"); + oraDb.setUrl("jdbc:oracle:thin:junk/junk@localhost:1521:XE"); + oraDb.setHeartbeatSql("select count(*) from dual"); - ServerConfig c = new ServerConfig(); - c.setName("pgtest"); - // requires postgres driver in class path - DataSourceConfig postgresDb = new DataSourceConfig(); - postgresDb.setDriver("org.postgresql.Driver"); - postgresDb.setUsername("test"); - postgresDb.setPassword("test"); - postgresDb.setUrl("jdbc:postgresql://127.0.0.1:5432/test"); - postgresDb.setHeartbeatSql("select count(*) from t_one"); - - c.loadFromProperties(); - c.setDdlGenerate(true); - c.setDdlRun(true); - c.setDefaultServer(false); - c.setRegister(false); - c.setDataSourceConfig(postgresDb); - - //c.setDatabaseBooleanTrue("1"); - //c.setDatabaseBooleanFalse("0"); - c.setDatabaseBooleanTrue("T"); - c.setDatabaseBooleanFalse("F"); + c.loadFromProperties(); + c.setDdlGenerate(true); + c.setDdlRun(true); + c.setDefaultServer(false); + c.setRegister(false); + c.setDataSourceConfig(oraDb); - c.setDatabasePlatform(new PostgresPlatform()); + //c.setDatabaseBooleanTrue("1"); + //c.setDatabaseBooleanFalse("0"); + c.setDatabaseBooleanTrue("T"); + c.setDatabaseBooleanFalse("F"); - c.addClass(TOne.class); + c.addClass(TOne.class); + c.addClass(TSMaster.class); + c.addClass(TSDetail.class); - return EbeanServerFactory.create(c); + return EbeanServerFactory.create(c); - } + } - private void simpleCheck(EbeanServer server) { + private EbeanServer createEbeanServer() { - TOne o = new TOne(); - o.setName("banan"); - o.setDescription("this one is true"); - o.setActive(true); + System.setProperty("ebean.ignoreExtraDdl", "true"); - server.save(o); + ServerConfig c = new ServerConfig(); + c.setName("pgtest"); - TOne o2 = new TOne(); - o2.setName("banan"); - o2.setDescription("this one is false"); - o2.setActive(false); + // requires postgres driver in class path + DataSourceConfig postgresDb = new DataSourceConfig(); + postgresDb.setDriver("org.postgresql.Driver"); + postgresDb.setUsername("test"); + postgresDb.setPassword("test"); + postgresDb.setUrl("jdbc:postgresql://127.0.0.1:5432/test"); + postgresDb.setHeartbeatSql("select count(*) from t_one"); - server.save(o2); + c.loadFromProperties(); + c.setDdlGenerate(true); + c.setDdlRun(true); + c.setDefaultServer(false); + c.setRegister(false); + c.setDataSourceConfig(postgresDb); - - List list = server.find(TOne.class) - .setAutoTune(false) - .order("id") - .findList(); - - Assert.assertTrue(list.size() == 2); - Assert.assertTrue(list.get(0).isActive()); - Assert.assertFalse(!list.get(0).isActive()); - - String sql = "select id, name, active from t_oneb order by id"; - List sqlRows = server.createSqlQuery(sql).findList(); - Assert.assertTrue(sqlRows.size() == 2); - Object active0 = sqlRows.get(0).get("active"); - Object active1 = sqlRows.get(1).get("active"); - - Assert.assertTrue("T".equals(active0)); - Assert.assertTrue("F".equals(active1)); - - + //c.setDatabaseBooleanTrue("1"); + //c.setDatabaseBooleanFalse("0"); + c.setDatabaseBooleanTrue("T"); + c.setDatabaseBooleanFalse("F"); - Query query = server.find(TOne.class) - .setAutoTune(false) - .order("id"); - - int rc = query.findCount(); - Assert.assertTrue(rc > 0); - - - System.out.println("done"); - } + c.setDatabasePlatform(new PostgresPlatform()); + + c.addClass(TOne.class); + + return EbeanServerFactory.create(c); + + } + + private void simpleCheck(EbeanServer server) { + + TOne o = new TOne(); + o.setName("banan"); + o.setDescription("this one is true"); + o.setActive(true); + + server.save(o); + + TOne o2 = new TOne(); + o2.setName("banan"); + o2.setDescription("this one is false"); + o2.setActive(false); + + server.save(o2); + + + List list = server.find(TOne.class) + .setAutoTune(false) + .order("id") + .findList(); + + Assert.assertTrue(list.size() == 2); + Assert.assertTrue(list.get(0).isActive()); + Assert.assertFalse(!list.get(0).isActive()); + + String sql = "select id, name, active from t_oneb order by id"; + List sqlRows = server.createSqlQuery(sql).findList(); + Assert.assertTrue(sqlRows.size() == 2); + Object active0 = sqlRows.get(0).get("active"); + Object active1 = sqlRows.get(1).get("active"); + + Assert.assertTrue("T".equals(active0)); + Assert.assertTrue("F".equals(active1)); + + + Query query = server.find(TOne.class) + .setAutoTune(false) + .order("id"); + + int rc = query.findCount(); + Assert.assertTrue(rc > 0); + + + System.out.println("done"); + } } diff --git a/src/test/java/com/avaje/tests/basic/MyTestDataSourcePoolListener.java b/src/test/java/com/avaje/tests/basic/MyTestDataSourcePoolListener.java index 4cf1adc4d..1459c4e90 100644 --- a/src/test/java/com/avaje/tests/basic/MyTestDataSourcePoolListener.java +++ b/src/test/java/com/avaje/tests/basic/MyTestDataSourcePoolListener.java @@ -1,29 +1,22 @@ package com.avaje.tests.basic; -import java.sql.Connection; - import org.avaje.datasource.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); - } - } - } +import java.sql.Connection; - public void onBeforeReturnConnection(Connection c) - { +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) { + } } diff --git a/src/test/java/com/avaje/tests/basic/TestAssocOneEqExpression.java b/src/test/java/com/avaje/tests/basic/TestAssocOneEqExpression.java index 50fb2fe99..1e26e7a11 100644 --- a/src/test/java/com/avaje/tests/basic/TestAssocOneEqExpression.java +++ b/src/test/java/com/avaje/tests/basic/TestAssocOneEqExpression.java @@ -1,8 +1,5 @@ package com.avaje.tests.basic; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; @@ -10,35 +7,37 @@ 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; +import org.junit.Assert; +import org.junit.Test; public class TestAssocOneEqExpression extends BaseTestCase { @Test - public void test() { - - ResetBasicData.reset(); - - Customer c = new Customer(); - c.setId(1); - - Query query = Ebean.find(Order.class) - .where().eq("customer", c) - .query(); - - query.findList(); - String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.contains("where t0.kcustomer_id = ?")); - - Address b = new Address(); - b.setId((short)1); - - Query q2 = Ebean.find(Order.class) - .where().eq("customer.billingAddress", b) - .query(); - - q2.findList(); - sql = q2.getGeneratedSql(); - Assert.assertTrue(sql.contains("where t1.billing_address_id = ?")); + public void test() { - } + ResetBasicData.reset(); + + Customer c = new Customer(); + c.setId(1); + + Query query = Ebean.find(Order.class) + .where().eq("customer", c) + .query(); + + query.findList(); + String sql = query.getGeneratedSql(); + Assert.assertTrue(sql.contains("where t0.kcustomer_id = ?")); + + Address b = new Address(); + b.setId((short) 1); + + Query q2 = Ebean.find(Order.class) + .where().eq("customer.billingAddress", b) + .query(); + + q2.findList(); + sql = q2.getGeneratedSql(); + Assert.assertTrue(sql.contains("where t1.billing_address_id = ?")); + + } } diff --git a/src/test/java/com/avaje/tests/basic/TestBatchLazy.java b/src/test/java/com/avaje/tests/basic/TestBatchLazy.java index 7c1e27457..b79513816 100644 --- a/src/test/java/com/avaje/tests/basic/TestBatchLazy.java +++ b/src/test/java/com/avaje/tests/basic/TestBatchLazy.java @@ -14,12 +14,12 @@ import java.util.List; public class TestBatchLazy extends BaseTestCase { @Test - public void testMe() { - - ResetBasicData.reset(); + public void testMe() { - Query query = Ebean.find(Order.class); - List list = query.findList(); + ResetBasicData.reset(); + + Query query = Ebean.find(Order.class); + List list = query.findList(); for (Order order : list) { @@ -35,8 +35,7 @@ public class TestBatchLazy extends BaseTestCase { Ebean.getDefaultServer().getAutoTune().collectProfiling(); Ebean.getDefaultServer().getAutoTune().reportProfiling(); - } - - - + } + + } diff --git a/src/test/java/com/avaje/tests/basic/TestBatchLazyMany.java b/src/test/java/com/avaje/tests/basic/TestBatchLazyMany.java index d3cbe44dc..6dd0699f9 100644 --- a/src/test/java/com/avaje/tests/basic/TestBatchLazyMany.java +++ b/src/test/java/com/avaje/tests/basic/TestBatchLazyMany.java @@ -1,36 +1,35 @@ package com.avaje.tests.basic; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Test; public class TestBatchLazyMany extends BaseTestCase { @Test - public void testMe() { - - ResetBasicData.reset(); - - Order order2 = Ebean.getReference(Order.class, 1); - order2.getOrderDate(); + public void testMe() { + + ResetBasicData.reset(); + + Order order2 = Ebean.getReference(Order.class, 1); + order2.getOrderDate(); // List list = Ebean.find(Order.class) // //.join("details") // //.join("details", "+fetchquery") // .findList(); -// +// // Order order = list.get(0); // //List details = order.getDetails(); // //details.size(); -// +// // Customer customer = order.getCustomer(); // customer.getName(); // System.out.println("done"); - - } - - + + } + + } diff --git a/src/test/java/com/avaje/tests/basic/TestBeanReferenceRefresh.java b/src/test/java/com/avaje/tests/basic/TestBeanReferenceRefresh.java index d1f510bed..bd7948d7b 100644 --- a/src/test/java/com/avaje/tests/basic/TestBeanReferenceRefresh.java +++ b/src/test/java/com/avaje/tests/basic/TestBeanReferenceRefresh.java @@ -1,53 +1,52 @@ package com.avaje.tests.basic; -import java.sql.Date; - -import com.avaje.ebean.cache.ServerCache; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; +import com.avaje.ebean.cache.ServerCache; 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; +import org.junit.Assert; +import org.junit.Test; + +import java.sql.Date; public class TestBeanReferenceRefresh extends BaseTestCase { @Test - public void testMe() { - - ResetBasicData.reset(); + public void testMe() { + + ResetBasicData.reset(); ServerCache beanCache = Ebean.getServerCacheManager().getBeanCache(Order.class); beanCache.clear(); Order order = Ebean.getReference(Order.class, 1); - - Assert.assertTrue(Ebean.getBeanState(order).isReference()); - - // invoke lazy loading - Date orderDate = order.getOrderDate(); - Assert.assertNotNull(orderDate); - - Customer customer = order.getCustomer(); - Assert.assertNotNull(customer); - - 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); - - } - - + + Assert.assertTrue(Ebean.getBeanState(order).isReference()); + + // invoke lazy loading + Date orderDate = order.getOrderDate(); + Assert.assertNotNull(orderDate); + + Customer customer = order.getCustomer(); + Assert.assertNotNull(customer); + + 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); + + } + + } diff --git a/src/test/java/com/avaje/tests/basic/TestDeleteByIdCollection.java b/src/test/java/com/avaje/tests/basic/TestDeleteByIdCollection.java index f2e22e346..088197310 100644 --- a/src/test/java/com/avaje/tests/basic/TestDeleteByIdCollection.java +++ b/src/test/java/com/avaje/tests/basic/TestDeleteByIdCollection.java @@ -1,16 +1,15 @@ package com.avaje.tests.basic; -import java.util.ArrayList; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; public class TestDeleteByIdCollection extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/TestDeleteCascadingOneToMany.java b/src/test/java/com/avaje/tests/basic/TestDeleteCascadingOneToMany.java index 5d84b6725..3dbb5a0a3 100644 --- a/src/test/java/com/avaje/tests/basic/TestDeleteCascadingOneToMany.java +++ b/src/test/java/com/avaje/tests/basic/TestDeleteCascadingOneToMany.java @@ -1,21 +1,20 @@ package com.avaje.tests.basic; -import junit.framework.TestCase; - import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Article; import com.avaje.tests.model.basic.Section; +import junit.framework.TestCase; public class TestDeleteCascadingOneToMany extends TestCase { - public void testDeleteCascadingOneToMany() { - Section s0 = new Section("some content"); - Article a0 = new Article("art1","auth1"); - a0.addSection(s0); + public void testDeleteCascadingOneToMany() { + Section s0 = new Section("some content"); + Article a0 = new Article("art1", "auth1"); + a0.addSection(s0); - Ebean.save(a0); + Ebean.save(a0); - Ebean.delete(a0); - } + Ebean.delete(a0); + } } diff --git a/src/test/java/com/avaje/tests/basic/TestDeleteImportedPartial.java b/src/test/java/com/avaje/tests/basic/TestDeleteImportedPartial.java index cadcfda3e..c9a02dba3 100644 --- a/src/test/java/com/avaje/tests/basic/TestDeleteImportedPartial.java +++ b/src/test/java/com/avaje/tests/basic/TestDeleteImportedPartial.java @@ -1,12 +1,11 @@ package com.avaje.tests.basic; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.PFile; import com.avaje.tests.model.basic.PFileContent; +import org.junit.Assert; +import org.junit.Test; public class TestDeleteImportedPartial extends BaseTestCase { @@ -20,7 +19,7 @@ public class TestDeleteImportedPartial extends BaseTestCase { Integer contentId = persistentFile.getFileContent().getId(); PFile partialPfile = Ebean.find(PFile.class).select("id").where().idEq(persistentFile.getId()) - .findUnique(); + .findUnique(); // should delete file and fileContent Ebean.delete(partialPfile); diff --git a/src/test/java/com/avaje/tests/basic/TestDeleteOneToOne.java b/src/test/java/com/avaje/tests/basic/TestDeleteOneToOne.java index 9feab8730..5fe5106e3 100644 --- a/src/test/java/com/avaje/tests/basic/TestDeleteOneToOne.java +++ b/src/test/java/com/avaje/tests/basic/TestDeleteOneToOne.java @@ -1,12 +1,11 @@ package com.avaje.tests.basic; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.PersistentFile; import com.avaje.tests.model.basic.PersistentFileContent; +import org.junit.Assert; +import org.junit.Test; public class TestDeleteOneToOne extends BaseTestCase { @@ -14,7 +13,7 @@ public class TestDeleteOneToOne extends BaseTestCase { public void testCreateDeletePersistentFile() { PersistentFile persistentFile = new PersistentFile("test.txt", new PersistentFileContent( - "test".getBytes())); + "test".getBytes())); Ebean.save(persistentFile); Integer id = persistentFile.getId(); diff --git a/src/test/java/com/avaje/tests/basic/TestDeleteOneToOneMultiple.java b/src/test/java/com/avaje/tests/basic/TestDeleteOneToOneMultiple.java index 872ccf155..fe546bdc5 100644 --- a/src/test/java/com/avaje/tests/basic/TestDeleteOneToOneMultiple.java +++ b/src/test/java/com/avaje/tests/basic/TestDeleteOneToOneMultiple.java @@ -1,12 +1,11 @@ package com.avaje.tests.basic; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.PFile; import com.avaje.tests.model.basic.PFileContent; +import org.junit.Assert; +import org.junit.Test; public class TestDeleteOneToOneMultiple extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/TestDeletePartialNoVersion.java b/src/test/java/com/avaje/tests/basic/TestDeletePartialNoVersion.java index 199c18f7c..376b9c8e4 100644 --- a/src/test/java/com/avaje/tests/basic/TestDeletePartialNoVersion.java +++ b/src/test/java/com/avaje/tests/basic/TestDeletePartialNoVersion.java @@ -1,55 +1,54 @@ package com.avaje.tests.basic; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.TMapSuperEntity; +import org.junit.Assert; +import org.junit.Test; public class TestDeletePartialNoVersion extends BaseTestCase { @Test - public void testNoVersion() { - - TMapSuperEntity e = new TMapSuperEntity(); - e.setName("babanaone"); - - Ebean.save(e); - - // select includes a transient property - TMapSuperEntity e2 = Ebean.find(TMapSuperEntity.class) - .where().idEq(e.getId()) - .select("id, name") - .findUnique(); - - Assert.assertNotNull(e2); - - e2.setName("banaban2"); - Ebean.save(e2); - - Ebean.delete(e2); - } - - - public void testWithVersion() { - - TMapSuperEntity e = new TMapSuperEntity(); - e.setName("babanatwo"); - - Ebean.save(e); - - // select includes a transient property - TMapSuperEntity e2 = Ebean.find(TMapSuperEntity.class) - .where().idEq(e.getId()) - .select("id, name, version") - .findUnique(); - - Assert.assertNotNull(e2); - - e2.setName("banaban2two"); - Ebean.save(e2); - - Ebean.delete(e2); - } + public void testNoVersion() { + + TMapSuperEntity e = new TMapSuperEntity(); + e.setName("babanaone"); + + Ebean.save(e); + + // select includes a transient property + TMapSuperEntity e2 = Ebean.find(TMapSuperEntity.class) + .where().idEq(e.getId()) + .select("id, name") + .findUnique(); + + Assert.assertNotNull(e2); + + e2.setName("banaban2"); + Ebean.save(e2); + + Ebean.delete(e2); + } + + + public void testWithVersion() { + + TMapSuperEntity e = new TMapSuperEntity(); + e.setName("babanatwo"); + + Ebean.save(e); + + // select includes a transient property + TMapSuperEntity e2 = Ebean.find(TMapSuperEntity.class) + .where().idEq(e.getId()) + .select("id, name, version") + .findUnique(); + + Assert.assertNotNull(e2); + + e2.setName("banaban2two"); + Ebean.save(e2); + + Ebean.delete(e2); + } } diff --git a/src/test/java/com/avaje/tests/basic/TestDynamicUpdate.java b/src/test/java/com/avaje/tests/basic/TestDynamicUpdate.java index e36454a0e..4aede36f0 100644 --- a/src/test/java/com/avaje/tests/basic/TestDynamicUpdate.java +++ b/src/test/java/com/avaje/tests/basic/TestDynamicUpdate.java @@ -1,54 +1,53 @@ package com.avaje.tests.basic; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.BeanState; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.tests.model.embedded.EMain; +import org.junit.Assert; +import org.junit.Test; public class TestDynamicUpdate extends BaseTestCase { @Test - public void testUpdate() { + public void testUpdate() { - // insert - EMain b = new EMain(); - b.setName("aaa"); - b.getEmbeddable().setDescription("123"); + // insert + EMain b = new EMain(); + b.setName("aaa"); + b.getEmbeddable().setDescription("123"); - EbeanServer server = Ebean.getServer(null); - - server.save(b); + EbeanServer server = Ebean.getServer(null); - Assert.assertNotNull(b.getId()); + server.save(b); - // reload object und update the name - EMain b2 = server.find(EMain.class, b.getId()); + Assert.assertNotNull(b.getId()); - b2.getEmbeddable().setDescription("ABC"); - - BeanState beanState = server.getBeanState(b2); - boolean dirty = beanState.isDirty(); + // reload object und update the name + EMain b2 = server.find(EMain.class, b.getId()); + + b2.getEmbeddable().setDescription("ABC"); + + BeanState beanState = server.getBeanState(b2); + boolean dirty = beanState.isDirty(); Assert.assertTrue(dirty); - - server.save(b2); - server.beginTransaction(); - try { - EMain b3 = server.find(EMain.class, b.getId()); - Assert.assertEquals("ABC", b3.getEmbeddable().getDescription()); - } finally { - server.endTransaction(); - } - EMain b4 = server.find(EMain.class, b.getId()); - b4.setName("bbb"); - b4.getEmbeddable().setDescription("123"); - server.save(b4); + server.save(b2); - EMain b5 = server.find(EMain.class, b.getId()); - Assert.assertEquals("123", b5.getEmbeddable().getDescription()); - } + server.beginTransaction(); + try { + EMain b3 = server.find(EMain.class, b.getId()); + Assert.assertEquals("ABC", b3.getEmbeddable().getDescription()); + } finally { + server.endTransaction(); + } + EMain b4 = server.find(EMain.class, b.getId()); + b4.setName("bbb"); + b4.getEmbeddable().setDescription("123"); + server.save(b4); + + EMain b5 = server.find(EMain.class, b.getId()); + Assert.assertEquals("123", b5.getEmbeddable().getDescription()); + } } diff --git a/src/test/java/com/avaje/tests/basic/TestEnhancementCollectionInitialisation.java b/src/test/java/com/avaje/tests/basic/TestEnhancementCollectionInitialisation.java index c8af36eac..6b0e6d5b1 100644 --- a/src/test/java/com/avaje/tests/basic/TestEnhancementCollectionInitialisation.java +++ b/src/test/java/com/avaje/tests/basic/TestEnhancementCollectionInitialisation.java @@ -1,29 +1,28 @@ package com.avaje.tests.basic; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.BeanState; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Order; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestEnhancementCollectionInitialisation extends BaseTestCase { - + @Test public void testListInitialisation() { - + Customer customer = new Customer(); BeanState beanState = Ebean.getBeanState(customer); if (beanState != null) { List orders = customer.getOrders(); Assert.assertNotNull(orders); } - + } } diff --git a/src/test/java/com/avaje/tests/basic/TestExplicitInsert.java b/src/test/java/com/avaje/tests/basic/TestExplicitInsert.java index d86cf3043..3c585a08c 100644 --- a/src/test/java/com/avaje/tests/basic/TestExplicitInsert.java +++ b/src/test/java/com/avaje/tests/basic/TestExplicitInsert.java @@ -1,16 +1,15 @@ package com.avaje.tests.basic; -import java.util.List; - -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.MyEBasicConfigStartup; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; +import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.EBasic; +import com.avaje.tests.model.basic.MyEBasicConfigStartup; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; @@ -61,9 +60,6 @@ public class TestExplicitInsert extends BaseTestCase { Assert.assertEquals(b.getId(), server.getBeanId(b)); - - - EBasic b2 = server.find(EBasic.class, b.getId()); b2.setId(null); diff --git a/src/test/java/com/avaje/tests/basic/TestFetchId.java b/src/test/java/com/avaje/tests/basic/TestFetchId.java index 2e0908bfb..1b4a09d84 100644 --- a/src/test/java/com/avaje/tests/basic/TestFetchId.java +++ b/src/test/java/com/avaje/tests/basic/TestFetchId.java @@ -14,26 +14,26 @@ import java.util.concurrent.ExecutionException; import static org.assertj.core.api.Assertions.assertThat; public class TestFetchId extends BaseTestCase { - + @Test - public void testFetchId() throws InterruptedException, ExecutionException { - - ResetBasicData.reset(); - - Query query = Ebean.find(Order.class) - .setAutoTune(false) - .fetch("details") - .where().gt("id", 1) - .gt("details.id", 0) - .query(); - - List ids = Ebean.getServer(null).findIds(query, null); - assertThat(ids).isNotEmpty(); + public void testFetchId() throws InterruptedException, ExecutionException { - FutureIds futureIds = Ebean.getServer(null).findFutureIds(query,null); + ResetBasicData.reset(); - // wait for all the id's to be fetched - List idList = futureIds.get(); - assertThat(idList).isNotEmpty(); - } + Query query = Ebean.find(Order.class) + .setAutoTune(false) + .fetch("details") + .where().gt("id", 1) + .gt("details.id", 0) + .query(); + + List ids = Ebean.getServer(null).findIds(query, null); + assertThat(ids).isNotEmpty(); + + FutureIds futureIds = Ebean.getServer(null).findFutureIds(query, null); + + // wait for all the id's to be fetched + List idList = futureIds.get(); + assertThat(idList).isNotEmpty(); + } } diff --git a/src/test/java/com/avaje/tests/basic/TestIUDVanilla.java b/src/test/java/com/avaje/tests/basic/TestIUDVanilla.java index 2b9d1e3d8..5fd6051a0 100644 --- a/src/test/java/com/avaje/tests/basic/TestIUDVanilla.java +++ b/src/test/java/com/avaje/tests/basic/TestIUDVanilla.java @@ -1,13 +1,12 @@ package com.avaje.tests.basic; -import java.sql.Timestamp; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.EBasicVer; +import org.junit.Assert; +import org.junit.Test; + +import java.sql.Timestamp; public class TestIUDVanilla extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/TestInEmpty.java b/src/test/java/com/avaje/tests/basic/TestInEmpty.java index 846d183c0..91a4afd70 100644 --- a/src/test/java/com/avaje/tests/basic/TestInEmpty.java +++ b/src/test/java/com/avaje/tests/basic/TestInEmpty.java @@ -1,13 +1,12 @@ package com.avaje.tests.basic; -import java.util.List; - -import com.avaje.ebean.Query; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; +import com.avaje.ebean.Query; import com.avaje.tests.model.basic.Order; +import org.junit.Test; + +import java.util.List; import static org.assertj.core.api.StrictAssertions.assertThat; import static org.junit.Assert.assertEquals; @@ -18,7 +17,7 @@ public class TestInEmpty extends BaseTestCase { public void test_in_empty() { Query query = Ebean.find(Order.class).where().in("id", new Object[0]).gt("id", 0) - .query(); + .query(); List list = query.findList(); assertThat(query.getGeneratedSql()).contains("1=0"); @@ -29,7 +28,7 @@ public class TestInEmpty extends BaseTestCase { public void test_notIn_empty() { Query query = Ebean.find(Order.class).where().notIn("id", new Object[0]).gt("id", 0) - .query(); + .query(); query.findList(); assertThat(query.getGeneratedSql()).contains("1=1"); diff --git a/src/test/java/com/avaje/tests/basic/TestInheritRef.java b/src/test/java/com/avaje/tests/basic/TestInheritRef.java index 76c7a02ec..28c16ce99 100644 --- a/src/test/java/com/avaje/tests/basic/TestInheritRef.java +++ b/src/test/java/com/avaje/tests/basic/TestInheritRef.java @@ -1,20 +1,19 @@ package com.avaje.tests.basic; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Car; import com.avaje.tests.model.basic.Truck; import com.avaje.tests.model.basic.Vehicle; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestInheritRef extends BaseTestCase { - @Test - public void testAssocOne() { + @Test + public void testAssocOne() { Ebean.beginTransaction(); try { @@ -31,8 +30,8 @@ public class TestInheritRef extends BaseTestCase { Ebean.save(t); List list = Ebean.find(Vehicle.class) - .setAutoTune(false) - .findList(); + .setAutoTune(false) + .findList(); Assert.assertTrue(!list.isEmpty()); diff --git a/src/test/java/com/avaje/tests/basic/TestJodaType.java b/src/test/java/com/avaje/tests/basic/TestJodaType.java index 57c90eaff..5215a339a 100644 --- a/src/test/java/com/avaje/tests/basic/TestJodaType.java +++ b/src/test/java/com/avaje/tests/basic/TestJodaType.java @@ -1,9 +1,5 @@ package com.avaje.tests.basic; -import org.joda.time.LocalTime; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebeaninternal.api.SpiEbeanServer; @@ -11,21 +7,24 @@ import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.ebeaninternal.server.deploy.BeanProperty; import com.avaje.ebeaninternal.server.type.ScalarType; import com.avaje.tests.model.basic.TJodaEntity; +import org.joda.time.LocalTime; +import org.junit.Assert; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; public class TestJodaType extends BaseTestCase { @Test - public void test() { - - SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null); - BeanDescriptor beanDescriptor = server.getBeanDescriptor(TJodaEntity.class); - BeanProperty beanProperty = beanDescriptor.getBeanProperty("localTime"); - ScalarType scalarType = beanProperty.getScalarType(); - - Assert.assertNotNull(scalarType); - } + public void test() { + + SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); + BeanDescriptor beanDescriptor = server.getBeanDescriptor(TJodaEntity.class); + BeanProperty beanProperty = beanDescriptor.getBeanProperty("localTime"); + ScalarType scalarType = beanProperty.getScalarType(); + + Assert.assertNotNull(scalarType); + } @Test public void test_insert_find() { diff --git a/src/test/java/com/avaje/tests/basic/TestJoinInheritance.java b/src/test/java/com/avaje/tests/basic/TestJoinInheritance.java index 96d1c9e56..d06b57527 100644 --- a/src/test/java/com/avaje/tests/basic/TestJoinInheritance.java +++ b/src/test/java/com/avaje/tests/basic/TestJoinInheritance.java @@ -1,84 +1,80 @@ package com.avaje.tests.basic; -import java.sql.Timestamp; -import java.util.Date; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; -import com.avaje.ebean.Query; import com.avaje.tests.model.basic.Address; import com.avaje.tests.model.basic.Car; import com.avaje.tests.model.basic.Trip; import com.avaje.tests.model.basic.Vehicle; import com.avaje.tests.model.basic.VehicleDriver; +import org.junit.Test; + +import java.sql.Timestamp; +import java.util.Date; public class TestJoinInheritance extends BaseTestCase { - - /** - * Test join hierarchy assoc one. - * - * This test catches the problem where the discriminator column is select - * but is not skipped if the parent bean is already in the presistence context. - * - * Test case: We have several trips with different addresses but always the same - * driver and car (the cars could be different). So the driver will be loaded - * when the first trip is loaded but when the second trip is loaded the driver is - * found in the persistence context. So the bean is not read but the index in the - * result set is forwarded by the number of properties - however, the vehicle type - * column was not being skipped - but the query reads happily - only the data is - * then wrong in the address object. - */ + + /** + * Test join hierarchy assoc one. + *

+ * This test catches the problem where the discriminator column is select + * but is not skipped if the parent bean is already in the presistence context. + *

+ * Test case: We have several trips with different addresses but always the same + * driver and car (the cars could be different). So the driver will be loaded + * when the first trip is loaded but when the second trip is loaded the driver is + * found in the persistence context. So the bean is not read but the index in the + * result set is forwarded by the number of properties - however, the vehicle type + * column was not being skipped - but the query reads happily - only the data is + * then wrong in the address object. + */ @Test - public void testJoinHierarchyAssocOne() { - - Ebean.createUpdate(Vehicle.class, "delete from vehicle"); + public void testJoinHierarchyAssocOne() { + + Ebean.createUpdate(Vehicle.class, "delete from vehicle"); - Address address = new Address(); - address.setLine1("Street"); - address.setLine2("Street"); - address.setCity("City"); - - address.setCretime(new Timestamp(new Date().getTime())); - - Ebean.save(address); - - Car c = new Car(); - c.setLicenseNumber("C6788"); - c.setDriver("CarDriver"); - c.setRegistrationDate(new Date()); - Ebean.save(c); - - VehicleDriver driver = new VehicleDriver(); - - driver.setVehicle(c); - driver.setAddress(address); - driver.setLicenseIssuedOn(new Date()); - Ebean.save(driver); - - final String line1 = "Street1"; - final String line2 = "Street2"; - final String city = "City"; - - int nrDrivers = 2; - for (int i = 0; i < nrDrivers;i++){ - Address address1 = new Address(); - address1.setLine1(line1); - address1.setLine2(line2); - address1.setCity(city); - Ebean.save(address1); + Address address = new Address(); + address.setLine1("Street"); + address.setLine2("Street"); + address.setCity("City"); - Trip trip = new Trip(); - trip.setVehicleDriver(driver); - trip.setAddress(address1); - trip.setCretime(new Timestamp(new Date().getTime())); - Ebean.save(trip); - } + address.setCretime(new Timestamp(new Date().getTime())); - } + Ebean.save(address); + + Car c = new Car(); + c.setLicenseNumber("C6788"); + c.setDriver("CarDriver"); + c.setRegistrationDate(new Date()); + Ebean.save(c); + + VehicleDriver driver = new VehicleDriver(); + + driver.setVehicle(c); + driver.setAddress(address); + driver.setLicenseIssuedOn(new Date()); + Ebean.save(driver); + + final String line1 = "Street1"; + final String line2 = "Street2"; + final String city = "City"; + + int nrDrivers = 2; + for (int i = 0; i < nrDrivers; i++) { + Address address1 = new Address(); + address1.setLine1(line1); + address1.setLine2(line2); + address1.setCity(city); + Ebean.save(address1); + + Trip trip = new Trip(); + trip.setVehicleDriver(driver); + trip.setAddress(address1); + trip.setCretime(new Timestamp(new Date().getTime())); + Ebean.save(trip); + } + + } } diff --git a/src/test/java/com/avaje/tests/basic/TestLazyLoadEmptyOneToMany.java b/src/test/java/com/avaje/tests/basic/TestLazyLoadEmptyOneToMany.java index 45b58a749..091dd3586 100644 --- a/src/test/java/com/avaje/tests/basic/TestLazyLoadEmptyOneToMany.java +++ b/src/test/java/com/avaje/tests/basic/TestLazyLoadEmptyOneToMany.java @@ -1,15 +1,14 @@ package com.avaje.tests.basic; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Contact; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestLazyLoadEmptyOneToMany extends BaseTestCase { @@ -24,11 +23,11 @@ public class TestLazyLoadEmptyOneToMany extends BaseTestCase { Ebean.save(c); Customer c1 = Ebean.find(Customer.class) - .setAutoTune(false) - .select("id") - .fetch("contacts", "id") - .where().idEq(c.getId()) - .findUnique(); + .setAutoTune(false) + .select("id") + .fetch("contacts", "id") + .where().idEq(c.getId()) + .findUnique(); List contacts = c1.getContacts(); int sz = contacts.size(); diff --git a/src/test/java/com/avaje/tests/basic/TestLazyLoadInCache.java b/src/test/java/com/avaje/tests/basic/TestLazyLoadInCache.java index f1cb4a1c5..271cdb80e 100644 --- a/src/test/java/com/avaje/tests/basic/TestLazyLoadInCache.java +++ b/src/test/java/com/avaje/tests/basic/TestLazyLoadInCache.java @@ -1,64 +1,63 @@ package com.avaje.tests.basic; -import java.util.Map; -import java.util.Set; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.BeanState; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Address; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Test; + +import java.util.Map; +import java.util.Set; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; public class TestLazyLoadInCache extends BaseTestCase { - @Test - public void testLoadInCache() { - - ResetBasicData.reset(); - - Map map = Ebean.find(Customer.class) - .select("id, name") - .setLoadBeanCache(true) - .setReadOnly(true) - .orderBy().asc("id") - .findMap(); - - assertTrue(!map.isEmpty()); - - Object id = map.keySet().iterator().next(); - - Customer cust1 = map.get(id); - - Customer cust1B = Ebean.find(Customer.class) - .setReadOnly(true) - .setId(id) - .findUnique(); - - assertTrue(cust1 != cust1B); - - Set loadedProps = Ebean.getBeanState(cust1).getLoadedProps(); - - assertTrue(loadedProps.contains("name")); - assertFalse(loadedProps.contains("status")); - - cust1.getStatus(); - - // a readOnly reference - Address billingAddress = cust1.getBillingAddress(); - BeanState billAddrState = Ebean.getBeanState(billingAddress); - assertTrue(billAddrState.isReference()); - assertTrue(billAddrState.isReadOnly()); - - // lazy load .. no longer a reference - billingAddress.getCity(); - assertFalse(billAddrState.isReference()); - - } + @Test + public void testLoadInCache() { + + ResetBasicData.reset(); + + Map map = Ebean.find(Customer.class) + .select("id, name") + .setLoadBeanCache(true) + .setReadOnly(true) + .orderBy().asc("id") + .findMap(); + + assertTrue(!map.isEmpty()); + + Object id = map.keySet().iterator().next(); + + Customer cust1 = map.get(id); + + Customer cust1B = Ebean.find(Customer.class) + .setReadOnly(true) + .setId(id) + .findUnique(); + + assertTrue(cust1 != cust1B); + + Set loadedProps = Ebean.getBeanState(cust1).getLoadedProps(); + + assertTrue(loadedProps.contains("name")); + assertFalse(loadedProps.contains("status")); + + cust1.getStatus(); + + // a readOnly reference + Address billingAddress = cust1.getBillingAddress(); + BeanState billAddrState = Ebean.getBeanState(billingAddress); + assertTrue(billAddrState.isReference()); + assertTrue(billAddrState.isReadOnly()); + + // lazy load .. no longer a reference + billingAddress.getCity(); + assertFalse(billAddrState.isReference()); + + } } diff --git a/src/test/java/com/avaje/tests/basic/TestLimitQuery.java b/src/test/java/com/avaje/tests/basic/TestLimitQuery.java index 39b97989c..f727496d4 100644 --- a/src/test/java/com/avaje/tests/basic/TestLimitQuery.java +++ b/src/test/java/com/avaje/tests/basic/TestLimitQuery.java @@ -27,12 +27,12 @@ public class TestLimitQuery extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class) - .setAutoTune(false) - .fetch("details") - .where().gt("details.id", 0) - .setMaxRows(0) - .setFirstRow(3) - .order().asc("orderDate"); + .setAutoTune(false) + .fetch("details") + .where().gt("details.id", 0) + .setMaxRows(0) + .setFirstRow(3) + .order().asc("orderDate"); query.findList(); @@ -49,11 +49,11 @@ public class TestLimitQuery extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class) - .setAutoTune(false) - .fetch("details") - .where().gt("details.id", 0) - .setMaxRows(3) - .setFirstRow(0); + .setAutoTune(false) + .fetch("details") + .where().gt("details.id", 0) + .setMaxRows(3) + .setFirstRow(0); query.findList(); @@ -72,10 +72,10 @@ public class TestLimitQuery extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class) - .setAutoTune(false) - .fetch("details") - .where().gt("details.id", 0) - .query(); + .setAutoTune(false) + .fetch("details") + .where().gt("details.id", 0) + .query(); query.findList(); @@ -93,10 +93,10 @@ public class TestLimitQuery extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class) - .setAutoTune(false) - .fetch("details") - .where().gt("details.id", 0) - .setMaxRows(10); + .setAutoTune(false) + .fetch("details") + .where().gt("details.id", 0) + .setMaxRows(10); //.findList(); List list = query.findList(); @@ -117,9 +117,9 @@ public class TestLimitQuery extends BaseTestCase { } query = Ebean.find(Order.class) - .setAutoTune(false) - .fetch("details") - .setMaxRows(10); + .setAutoTune(false) + .fetch("details") + .setMaxRows(10); query.findList(); diff --git a/src/test/java/com/avaje/tests/basic/TestLoadBeanCache.java b/src/test/java/com/avaje/tests/basic/TestLoadBeanCache.java index 6e950ee62..f3ee0cdde 100644 --- a/src/test/java/com/avaje/tests/basic/TestLoadBeanCache.java +++ b/src/test/java/com/avaje/tests/basic/TestLoadBeanCache.java @@ -1,34 +1,33 @@ package com.avaje.tests.basic; -import java.util.Map; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Country; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Map; public class TestLoadBeanCache extends BaseTestCase { @Test - public void testLoad() { - - ResetBasicData.reset(); - - Map map = Ebean.find(Country.class) - .setLoadBeanCache(true) - .setUseQueryCache(true) - .setReadOnly(true) - .order("name") - .findMap(); - - Country loadedNz = map.get("NZ"); - - // this will hit the cache - Country nz = Ebean.find(Country.class, "NZ"); - - Assert.assertTrue(loadedNz == nz); - } + public void testLoad() { + + ResetBasicData.reset(); + + Map map = Ebean.find(Country.class) + .setLoadBeanCache(true) + .setUseQueryCache(true) + .setReadOnly(true) + .order("name") + .findMap(); + + Country loadedNz = map.get("NZ"); + + // this will hit the cache + Country nz = Ebean.find(Country.class, "NZ"); + + Assert.assertTrue(loadedNz == nz); + } } diff --git a/src/test/java/com/avaje/tests/basic/TestLogTransLogOnError.java b/src/test/java/com/avaje/tests/basic/TestLogTransLogOnError.java index 58a8368d5..1789bf2df 100644 --- a/src/test/java/com/avaje/tests/basic/TestLogTransLogOnError.java +++ b/src/test/java/com/avaje/tests/basic/TestLogTransLogOnError.java @@ -1,16 +1,15 @@ package com.avaje.tests.basic; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.EBasicVer; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestLogTransLogOnError extends BaseTestCase { @@ -21,7 +20,7 @@ public class TestLogTransLogOnError extends BaseTestCase { Ebean.beginTransaction(); try { - + Ebean.find(Customer.class).findList(); Ebean.find(Order.class).where().gt("id", 1).findList(); @@ -56,10 +55,10 @@ public class TestLogTransLogOnError extends BaseTestCase { EBasicVer newBean = new EBasicVer("aName"); newBean - .setDescription("something sdfjksdjflsjdflsjdflksjdfkjd fsjdfkjsdkfjsdkfjskdjfskjdf" - + " sjdf sdjflksjdfkjsdlfkjsdkfjs ksjdfksjdlfjsldf something sdfjksdjflsjdflsjdflksjdfkjd" - + "fsjdfkjsdkfjsdkfjskdjfskjdf sjdf sdjflksjdfkjsdlfkjsdkfjs ksjdfksjdlfjsldf something s" - + "dfjksdjflsjdflsjdflksjdfkjd fsjdfkjsdkfjsdkfjskdjfskjdf sjdf sdjflksjdfkjsdlfkjsdkfjs "); + .setDescription("something sdfjksdjflsjdflsjdflksjdfkjd fsjdfkjsdkfjsdkfjskdjfskjdf" + + " sjdf sdjflksjdfkjsdlfkjsdkfjs ksjdfksjdlfjsldf something sdfjksdjflsjdflsjdflksjdfkjd" + + "fsjdfkjsdkfjsdkfjskdjfskjdf sjdf sdjflksjdfkjsdlfkjsdkfjs ksjdfksjdlfjsldf something s" + + "dfjksdjflsjdflsjdflksjdfkjd fsjdfkjsdkfjsdkfjskdjfskjdf sjdf sdjflksjdfkjsdlfkjsdkfjs "); // t.log("--- next insert should error"); Ebean.save(newBean); diff --git a/src/test/java/com/avaje/tests/basic/TestM2MCascadeOne.java b/src/test/java/com/avaje/tests/basic/TestM2MCascadeOne.java index 611853d1c..bb63f5c2f 100644 --- a/src/test/java/com/avaje/tests/basic/TestM2MCascadeOne.java +++ b/src/test/java/com/avaje/tests/basic/TestM2MCascadeOne.java @@ -38,9 +38,9 @@ public class TestM2MCascadeOne extends BaseTestCase { public void testRawPredicate_with_ManyToManyPath() { Query query = Ebean.find(MUser.class) - .select("userid") - .where().raw("roles.roleid in (?)", 24) - .query(); + .select("userid") + .where().raw("roles.roleid in (?)", 24) + .query(); query.findList(); diff --git a/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java b/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java index c82aa67ef..a43a8443d 100644 --- a/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java +++ b/src/test/java/com/avaje/tests/basic/TestM2MVanilla.java @@ -1,17 +1,16 @@ package com.avaje.tests.basic; -import java.util.ArrayList; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.ebean.SqlUpdate; import com.avaje.tests.model.basic.MRole; import com.avaje.tests.model.basic.MUser; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; public class TestM2MVanilla extends BaseTestCase { @@ -21,11 +20,11 @@ public class TestM2MVanilla extends BaseTestCase { SqlUpdate delInt = Ebean.createSqlUpdate("delete from mrole_muser"); SqlUpdate delRoles = Ebean.createSqlUpdate("delete from mrole"); SqlUpdate delUsers = Ebean.createSqlUpdate("delete from muser"); - + Ebean.execute(delInt); Ebean.execute(delRoles); Ebean.execute(delUsers); - + MRole r1 = new MRole(); r1.setRoleName("role1"); Ebean.save(r1); @@ -79,9 +78,9 @@ public class TestM2MVanilla extends BaseTestCase { Assert.assertTrue(!userInRolesList.isEmpty()); List list = Ebean.find(MUser.class) - .where().in("roles", roleList) - .filterMany("roles").eq("roleName", "role1") - .findList(); + .where().in("roles", roleList) + .filterMany("roles").eq("roleName", "role1") + .findList(); MUser mUser = list.get(0); List roles = mUser.getRoles(); diff --git a/src/test/java/com/avaje/tests/basic/TestManyLazyLoad.java b/src/test/java/com/avaje/tests/basic/TestManyLazyLoad.java index c2d8b5d62..d05a006f3 100644 --- a/src/test/java/com/avaje/tests/basic/TestManyLazyLoad.java +++ b/src/test/java/com/avaje/tests/basic/TestManyLazyLoad.java @@ -10,9 +10,7 @@ import org.junit.Test; import java.sql.Date; import java.util.List; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class TestManyLazyLoad extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/TestManyOneInterface.java b/src/test/java/com/avaje/tests/basic/TestManyOneInterface.java index e66644735..fc722e4a3 100644 --- a/src/test/java/com/avaje/tests/basic/TestManyOneInterface.java +++ b/src/test/java/com/avaje/tests/basic/TestManyOneInterface.java @@ -1,7 +1,5 @@ package com.avaje.tests.basic; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.ResetBasicData; @@ -9,24 +7,25 @@ import com.avaje.tests.model.interfaces.Address; import com.avaje.tests.model.interfaces.IAddress; import com.avaje.tests.model.interfaces.IPerson; import com.avaje.tests.model.interfaces.Person; +import org.junit.Test; public class TestManyOneInterface extends BaseTestCase { @Test - public void test() { - - ResetBasicData.reset(); - - IAddress a = new Address(); - - IPerson p = new Person(); - - p.setDefaultAddress(a); - - Ebean.save(a); - Ebean.save(p); - - //Assert.assertTrue(); + public void test() { - } + ResetBasicData.reset(); + + IAddress a = new Address(); + + IPerson p = new Person(); + + p.setDefaultAddress(a); + + Ebean.save(a); + Ebean.save(p); + + //Assert.assertTrue(); + + } } diff --git a/src/test/java/com/avaje/tests/basic/TestMappedSuper.java b/src/test/java/com/avaje/tests/basic/TestMappedSuper.java index 8ac108ddd..2e9bc6c11 100644 --- a/src/test/java/com/avaje/tests/basic/TestMappedSuper.java +++ b/src/test/java/com/avaje/tests/basic/TestMappedSuper.java @@ -9,27 +9,27 @@ import org.junit.Test; public class TestMappedSuper extends BaseTestCase { @Test - public void test() { - - TMapSuperEntity e = new TMapSuperEntity(); - e.setName("babana"); - - Ebean.save(e); - - // select includes a transient property - TMapSuperEntity e2 = Ebean.find(TMapSuperEntity.class) - .where().idEq(e.getId()) - .select("id, name, myint, someObject, bananan") - .findUnique(); - - Assert.assertNotNull(e2); - - TMapSuperEntity eSaveDelete = new TMapSuperEntity(); - eSaveDelete.setName("babana"); - - Ebean.save(eSaveDelete); - - Ebean.delete(eSaveDelete); - } - + public void test() { + + TMapSuperEntity e = new TMapSuperEntity(); + e.setName("babana"); + + Ebean.save(e); + + // select includes a transient property + TMapSuperEntity e2 = Ebean.find(TMapSuperEntity.class) + .where().idEq(e.getId()) + .select("id, name, myint, someObject, bananan") + .findUnique(); + + Assert.assertNotNull(e2); + + TMapSuperEntity eSaveDelete = new TMapSuperEntity(); + eSaveDelete.setName("babana"); + + Ebean.save(eSaveDelete); + + Ebean.delete(eSaveDelete); + } + } diff --git a/src/test/java/com/avaje/tests/basic/TestMetaAnnotation.java b/src/test/java/com/avaje/tests/basic/TestMetaAnnotation.java index 31db7757a..8d782b9a5 100644 --- a/src/test/java/com/avaje/tests/basic/TestMetaAnnotation.java +++ b/src/test/java/com/avaje/tests/basic/TestMetaAnnotation.java @@ -12,16 +12,16 @@ import static org.junit.Assert.assertTrue; /** * Very simple test case to check if Ebean recognizes meta-annotation correctly. - * + * * @author Roland Praml, FOCONIS AG */ public class TestMetaAnnotation extends BaseTestCase { - private static final String spaces100 = new String(new char[100]).replace('\0', ' '); - private static final String spaces101 = new String(new char[101]).replace('\0', ' '); - + private static final String spaces100 = new String(new char[100]).replace('\0', ' '); + private static final String spaces101 = new String(new char[101]).replace('\0', ' '); + /** - * This test writes 100 spaces to "line1" which is annotated with @Size(max=100) + * This test writes 100 spaces to "line1" which is annotated with @Size(max=100) */ @Test public void testWrite100SpacesToLine1() { diff --git a/src/test/java/com/avaje/tests/basic/TestMultipleOneToOneIUD.java b/src/test/java/com/avaje/tests/basic/TestMultipleOneToOneIUD.java index 2c0758fa0..c1d5b0296 100644 --- a/src/test/java/com/avaje/tests/basic/TestMultipleOneToOneIUD.java +++ b/src/test/java/com/avaje/tests/basic/TestMultipleOneToOneIUD.java @@ -1,13 +1,12 @@ package com.avaje.tests.basic; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Assert; +import org.junit.Test; public class TestMultipleOneToOneIUD extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/TestNonUpdateProperty.java b/src/test/java/com/avaje/tests/basic/TestNonUpdateProperty.java index ed33fd984..4f68a9e58 100644 --- a/src/test/java/com/avaje/tests/basic/TestNonUpdateProperty.java +++ b/src/test/java/com/avaje/tests/basic/TestNonUpdateProperty.java @@ -1,10 +1,9 @@ package com.avaje.tests.basic; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.MNonUpdPropEntity; +import org.junit.Test; public class TestNonUpdateProperty extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/TestOrderByAnnotation.java b/src/test/java/com/avaje/tests/basic/TestOrderByAnnotation.java index 786f394d3..a6ce21681 100644 --- a/src/test/java/com/avaje/tests/basic/TestOrderByAnnotation.java +++ b/src/test/java/com/avaje/tests/basic/TestOrderByAnnotation.java @@ -1,38 +1,37 @@ package com.avaje.tests.basic; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestOrderByAnnotation extends BaseTestCase { @Test - public void testOrderBy() { + public void testOrderBy() { - ResetBasicData.reset(); - Customer custTest = ResetBasicData.createCustAndOrder("testOrderByAnn"); + ResetBasicData.reset(); + Customer custTest = ResetBasicData.createCustAndOrder("testOrderByAnn"); - Customer customer = Ebean.find(Customer.class, custTest.getId()); - List orders = customer.getOrders(); + Customer customer = Ebean.find(Customer.class, custTest.getId()); + List orders = customer.getOrders(); - Assert.assertTrue(!orders.isEmpty()); + Assert.assertTrue(!orders.isEmpty()); - Query q1 = Ebean.find(Order.class) - .fetch("details"); + Query q1 = Ebean.find(Order.class) + .fetch("details"); - q1.findList(); - - String s1 = q1.getGeneratedSql(); + q1.findList(); - Assert.assertTrue(s1.contains("order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc")); - } -} \ No newline at end of file + String s1 = q1.getGeneratedSql(); + + Assert.assertTrue(s1.contains("order by t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc")); + } +} diff --git a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountFormula.java b/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountFormula.java index f167e28a0..bbd4ce10e 100644 --- a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountFormula.java +++ b/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountFormula.java @@ -1,14 +1,13 @@ package com.avaje.tests.basic; -import java.util.List; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Test; + +import java.util.List; public class TestOrderTotalAmountFormula extends BaseTestCase { @@ -18,12 +17,12 @@ public class TestOrderTotalAmountFormula extends BaseTestCase { ResetBasicData.reset(); List l0 = Ebean.find(Customer.class) - .select("id, name") - .fetch("orders", "status, totalAmount") - .where() - .eq("orders.details.product.name", "Desk") - .like("contacts.firstName", "Ji%") - .findList(); + .select("id, name") + .fetch("orders", "status, totalAmount") + .where() + .eq("orders.details.product.name", "Desk") + .like("contacts.firstName", "Ji%") + .findList(); for (Customer c0 : l0) { c0.getId(); diff --git a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountReportBean.java b/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountReportBean.java index e344946b1..824c07170 100644 --- a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountReportBean.java +++ b/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountReportBean.java @@ -1,17 +1,16 @@ package com.avaje.tests.basic; -import java.util.List; - -import com.avaje.ebean.Query; -import com.avaje.ebean.RawSql; -import com.avaje.ebean.RawSqlBuilder; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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.OrderAggregate; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertNotNull; @@ -24,14 +23,14 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase { ResetBasicData.reset(); String sql = - "select order_id, count(*) as totalItems, sum(order_qty*unit_price) as totalAmount \n" + - "from o_order_detail \n" + - "group by order_id"; + "select order_id, count(*) as totalItems, sum(order_qty*unit_price) as totalAmount \n" + + "from o_order_detail \n" + + "group by order_id"; RawSql rawSql = RawSqlBuilder.parse(sql).columnMapping("order_id", "order.id").create(); List l0 = - Ebean.find(OrderAggregate.class) + Ebean.find(OrderAggregate.class) .setRawSql(rawSql) .findList(); @@ -40,9 +39,9 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase { } List l2 = Ebean.createQuery(OrderAggregate.class) - .setRawSql(rawSql) - .where().gt("order.id", 0) - .having().lt("totalItems", 3).gt("totalAmount", 50).findList(); + .setRawSql(rawSql) + .where().gt("order.id", 0) + .having().lt("totalItems", 3).gt("totalAmount", 50).findList(); for (OrderAggregate r2 : l2) { Assert.assertTrue(r2.getTotalItems() < 3); @@ -56,16 +55,16 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase { ResetBasicData.reset(); String sql = - "select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount \n" + - "from o_order_detail \n" + - "group by order_id"; + "select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount \n" + + "from o_order_detail \n" + + "group by order_id"; RawSql rawSql = RawSqlBuilder.parse(sql) - .columnMapping("order_id", "order.id") - .create(); + .columnMapping("order_id", "order.id") + .create(); Query query = Ebean.find(OrderAggregate.class) - .setRawSql(rawSql); + .setRawSql(rawSql); query.findList(); @@ -78,16 +77,16 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase { ResetBasicData.reset(); String sql = - "select order_id, count(*) as totalItems, sum(order_qty*unit_price) as totalAmount \n" + - "from o_order_detail \n" + - "group by order_id"; + "select order_id, count(*) as totalItems, sum(order_qty*unit_price) as totalAmount \n" + + "from o_order_detail \n" + + "group by order_id"; RawSql rawSql = RawSqlBuilder.parse(sql) - .columnMapping("order_id", "order.id") - .create(); + .columnMapping("order_id", "order.id") + .create(); Query query = Ebean.find(OrderAggregate.class) - .setRawSql(rawSql); + .setRawSql(rawSql); query.findList(); @@ -123,10 +122,10 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase { Query query = Ebean.getDefaultServer().createNamedQuery(OrderAggregate.class, "withMax"); List list = query - .where().gt("order.id", 1) - .having().gt("totalItems", 1) - .order().desc("totalAmount") - .findList(); + .where().gt("order.id", 1) + .having().gt("totalItems", 1) + .order().desc("totalAmount") + .findList(); assertThat(query.getGeneratedSql()).contains("count(*) as total_items, sum(order_qty*unit_price) as total_amount, max(order_qty*unit_price) as maxAmount from o_order_detail"); assertThat(query.getGeneratedSql()).contains("from o_order_detail where order_id > ? group by order_id having count(*) > ? order by sum(order_qty*unit_price) desc"); @@ -140,12 +139,12 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase { Query query = Ebean.getDefaultServer().createNamedQuery(OrderAggregate.class, "withParam"); List list = query - .setParameter("minId", 2) - .where().isNotNull("order.id") - .having().lt("totalAmount", 100) - .order().desc("totalAmount") - .setMaxRows(10) - .findList(); + .setParameter("minId", 2) + .where().isNotNull("order.id") + .having().lt("totalAmount", 100) + .order().desc("totalAmount") + .setMaxRows(10) + .findList(); assertThat(query.getGeneratedSql()).contains("count(*) as totalItems, sum(order_qty*unit_price) as totalAmount, max(order_qty*unit_price) as maxAmount from o_order_detail"); assertThat(query.getGeneratedSql()).contains("from o_order_detail where id > ? and order_id is not null group by order_id having sum(order_qty*unit_price) < ? order by sum(order_qty*unit_price) desc"); diff --git a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountSql.java b/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountSql.java index 2fa6ee997..744d9e45e 100644 --- a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountSql.java +++ b/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountSql.java @@ -1,14 +1,13 @@ package com.avaje.tests.basic; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.SqlRow; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestOrderTotalAmountSql extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/TestPersistenceContext.java b/src/test/java/com/avaje/tests/basic/TestPersistenceContext.java index e28b0abce..e75c7d3f5 100644 --- a/src/test/java/com/avaje/tests/basic/TestPersistenceContext.java +++ b/src/test/java/com/avaje/tests/basic/TestPersistenceContext.java @@ -1,82 +1,81 @@ package com.avaje.tests.basic; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Assert; +import org.junit.Test; public class TestPersistenceContext extends BaseTestCase { @Test - public void test() { - - ResetBasicData.reset(); + public void test() { - // implicit transaction with its own - // persistence context - Order oBefore = Ebean.find(Order.class, 1); + ResetBasicData.reset(); - Order order = null; - - // start a persistence context - Ebean.beginTransaction(); - try { - - order = Ebean.find(Order.class, 1); - - // not the same instance ...as a different - // persistence context - Assert.assertTrue(order != oBefore); - - - // finds an existing bean in the persistence context - // ... so doesn't even execute a query - Order o2 = Ebean.find(Order.class, 1); - Order o3 = Ebean.getReference(Order.class, 1); - - // all the same instance - Assert.assertTrue(order == o2); - Assert.assertTrue(order == o3); - - } finally { - Ebean.endTransaction(); - } + // implicit transaction with its own + // persistence context + Order oBefore = Ebean.find(Order.class, 1); - // implicit transaction with its own - // persistence context - Order oAfter = Ebean.find(Order.class, 1); + Order order = null; - Assert.assertTrue(oAfter != oBefore); - Assert.assertTrue(oAfter != order); - - - Order testOrder = ResetBasicData.createOrderCustAndOrder("testPC"); - Integer id = testOrder.getCustomer().getId(); - Integer orderId = testOrder.getId(); + // start a persistence context + Ebean.beginTransaction(); + try { - // start a persistence context - Ebean.beginTransaction(); - try { - Customer customer = Ebean.find(Customer.class) - .setUseCache(false) - .setId(id) - .findUnique(); - - System.gc(); - Order order2 = Ebean.find(Order.class, orderId); - Customer customer2 = order2.getCustomer(); + order = Ebean.find(Order.class, 1); - Assert.assertEquals(customer.getId(),customer2.getId()); + // not the same instance ...as a different + // persistence context + Assert.assertTrue(order != oBefore); + + + // finds an existing bean in the persistence context + // ... so doesn't even execute a query + Order o2 = Ebean.find(Order.class, 1); + Order o3 = Ebean.getReference(Order.class, 1); + + // all the same instance + Assert.assertTrue(order == o2); + Assert.assertTrue(order == o3); + + } finally { + Ebean.endTransaction(); + } + + // implicit transaction with its own + // persistence context + Order oAfter = Ebean.find(Order.class, 1); + + Assert.assertTrue(oAfter != oBefore); + Assert.assertTrue(oAfter != order); + + + Order testOrder = ResetBasicData.createOrderCustAndOrder("testPC"); + Integer id = testOrder.getCustomer().getId(); + Integer orderId = testOrder.getId(); + + // start a persistence context + Ebean.beginTransaction(); + try { + Customer customer = Ebean.find(Customer.class) + .setUseCache(false) + .setId(id) + .findUnique(); + + System.gc(); + Order order2 = Ebean.find(Order.class, orderId); + Customer customer2 = order2.getCustomer(); + + Assert.assertEquals(customer.getId(), customer2.getId()); + + Assert.assertTrue(customer == customer2); + + } finally { + Ebean.endTransaction(); + } + } - Assert.assertTrue(customer == customer2); - - } finally { - Ebean.endTransaction(); - } - } - } diff --git a/src/test/java/com/avaje/tests/basic/TestQuery.java b/src/test/java/com/avaje/tests/basic/TestQuery.java index 0a0c24c7e..31af63bec 100644 --- a/src/test/java/com/avaje/tests/basic/TestQuery.java +++ b/src/test/java/com/avaje/tests/basic/TestQuery.java @@ -1,13 +1,12 @@ package com.avaje.tests.basic; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Assert; +import org.junit.Test; public class TestQuery extends BaseTestCase { @@ -17,7 +16,7 @@ public class TestQuery extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class).setAutoTune(false).order().asc("orderDate") - .order().desc("id"); + .order().desc("id"); // .orderBy("orderDate"); int rc = query.findList().size(); @@ -32,14 +31,14 @@ public class TestQuery extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class).setAutoTune(false).setForUpdate(false) - .setMaxRows(1).order().asc("orderDate").order().desc("id"); + .setMaxRows(1).order().asc("orderDate").order().desc("id"); int rc = query.findList().size(); Assert.assertTrue(rc > 0); Assert.assertTrue(!query.getGeneratedSql().toLowerCase().contains("for update")); query = Ebean.find(Order.class).setAutoTune(false).setForUpdate(true).setMaxRows(1).order() - .asc("orderDate").order().desc("id"); + .asc("orderDate").order().desc("id"); rc = query.findList().size(); Assert.assertTrue(rc > 0); diff --git a/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java b/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java index ed782b45c..254f817de 100644 --- a/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java +++ b/src/test/java/com/avaje/tests/basic/TestQueryWhereBetween.java @@ -1,15 +1,14 @@ package com.avaje.tests.basic; -import java.sql.Timestamp; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Assert; +import org.junit.Test; + +import java.sql.Timestamp; public class TestQueryWhereBetween extends BaseTestCase { @@ -21,7 +20,7 @@ public class TestQueryWhereBetween extends BaseTestCase { Timestamp t = new Timestamp(System.currentTimeMillis()); Query query = Ebean.find(Order.class).setAutoTune(false).where() - .betweenProperties("cretime", "updtime", t).order().asc("orderDate").order().desc("id"); + .betweenProperties("cretime", "updtime", t).order().asc("orderDate").order().desc("id"); query.findList(); diff --git a/src/test/java/com/avaje/tests/basic/TestQueryWithCache.java b/src/test/java/com/avaje/tests/basic/TestQueryWithCache.java index 950ac8662..ae387795b 100644 --- a/src/test/java/com/avaje/tests/basic/TestQueryWithCache.java +++ b/src/test/java/com/avaje/tests/basic/TestQueryWithCache.java @@ -13,9 +13,7 @@ import com.avaje.tests.model.basic.ResetBasicData; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class TestQueryWithCache extends BaseTestCase { @@ -51,7 +49,7 @@ public class TestQueryWithCache extends BaseTestCase { Country nz3 = Ebean.find(Country.class, "NZ"); Country nz4 = Ebean.find(Country.class).setId("NZ").setAutoTune(false).setUseCache(false) - .findUnique(); + .findUnique(); assertTrue(nz2 == nz2b); assertTrue(nz2 == nz3); diff --git a/src/test/java/com/avaje/tests/basic/TestReadOnlyPropagation.java b/src/test/java/com/avaje/tests/basic/TestReadOnlyPropagation.java index 2f3420db8..f6b81185d 100644 --- a/src/test/java/com/avaje/tests/basic/TestReadOnlyPropagation.java +++ b/src/test/java/com/avaje/tests/basic/TestReadOnlyPropagation.java @@ -1,12 +1,5 @@ package com.avaje.tests.basic; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.bean.BeanCollection; @@ -15,78 +8,84 @@ 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 org.junit.Assert; +import org.junit.Test; + +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; public class TestReadOnlyPropagation extends BaseTestCase { @Test - public void testReadOnly() { - - ResetBasicData.reset(); - - Order order = Ebean.find(Order.class) - .setAutoTune(false) - .setUseCache(false) - .setReadOnly(true) - .setId(1) - .findUnique(); - - Assert.assertTrue(Ebean.getBeanState(order).isReadOnly()); + public void testReadOnly() { - - Customer customer = order.getCustomer(); - Assert.assertTrue(Ebean.getBeanState(customer).isReadOnly()); - - Address billingAddress = customer.getBillingAddress(); - Assert.assertTrue(Ebean.getBeanState(billingAddress).isReadOnly()); - - - List details = order.getDetails(); - BeanCollection bc = (BeanCollection)details; - - Assert.assertTrue(bc.isReadOnly()); - Assert.assertTrue(!bc.isPopulated()); - - bc.size(); - Assert.assertTrue(!bc.isEmpty()); - Assert.assertTrue(bc.isReadOnly()); - Assert.assertTrue(bc.isPopulated()); - try { - details.add(new OrderDetail()); - Assert.assertTrue(false); - } catch (IllegalStateException e){ - Assert.assertTrue(true); - } - try { - details.remove(0); - Assert.assertTrue(false); - } catch (IllegalStateException e){ - Assert.assertTrue(true); - } - try { - Iterator it = details.iterator(); - it.next(); - it.remove(); - Assert.assertTrue(false); - } catch (IllegalStateException e){ - Assert.assertTrue(true); - } - try { - ListIterator it = details.listIterator(); - it.next(); - it.remove(); - Assert.assertTrue(false); - } catch (IllegalStateException e){ - Assert.assertTrue(true); - } - try { - List subList = details.subList(0, 1); - subList.remove(0); - Assert.assertTrue(false); - } catch (UnsupportedOperationException e){ - Assert.assertTrue(true); - } + ResetBasicData.reset(); + + Order order = Ebean.find(Order.class) + .setAutoTune(false) + .setUseCache(false) + .setReadOnly(true) + .setId(1) + .findUnique(); + + Assert.assertTrue(Ebean.getBeanState(order).isReadOnly()); + + + Customer customer = order.getCustomer(); + Assert.assertTrue(Ebean.getBeanState(customer).isReadOnly()); + + Address billingAddress = customer.getBillingAddress(); + Assert.assertTrue(Ebean.getBeanState(billingAddress).isReadOnly()); + + + List details = order.getDetails(); + BeanCollection bc = (BeanCollection) details; + + Assert.assertTrue(bc.isReadOnly()); + Assert.assertTrue(!bc.isPopulated()); + + bc.size(); + Assert.assertTrue(!bc.isEmpty()); + Assert.assertTrue(bc.isReadOnly()); + Assert.assertTrue(bc.isPopulated()); + try { + details.add(new OrderDetail()); + Assert.assertTrue(false); + } catch (IllegalStateException e) { + Assert.assertTrue(true); + } + try { + details.remove(0); + Assert.assertTrue(false); + } catch (IllegalStateException e) { + Assert.assertTrue(true); + } + try { + Iterator it = details.iterator(); + it.next(); + it.remove(); + Assert.assertTrue(false); + } catch (IllegalStateException e) { + Assert.assertTrue(true); + } + try { + ListIterator it = details.listIterator(); + it.next(); + it.remove(); + Assert.assertTrue(false); + } catch (IllegalStateException e) { + Assert.assertTrue(true); + } + try { + List subList = details.subList(0, 1); + subList.remove(0); + Assert.assertTrue(false); + } catch (UnsupportedOperationException e) { + Assert.assertTrue(true); + } + + + } - - } - } diff --git a/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOne.java b/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOne.java index bb41f8f50..23be6218e 100644 --- a/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOne.java +++ b/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOne.java @@ -1,39 +1,38 @@ package com.avaje.tests.basic; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.PersistentFile; import com.avaje.tests.model.basic.PersistentFileContent; +import org.junit.Assert; +import org.junit.Test; public class TestSaveDeleteOneToOne extends BaseTestCase { @Test - public void testCreateDeletePersistentFile() { - PersistentFile persistentFile = new PersistentFile("test.txt", - new PersistentFileContent("test".getBytes())); + public void testCreateDeletePersistentFile() { + PersistentFile persistentFile = new PersistentFile("test.txt", + new PersistentFileContent("test".getBytes())); - Ebean.save(persistentFile); - Ebean.delete(persistentFile); - } + Ebean.save(persistentFile); + Ebean.delete(persistentFile); + } @Test - public void testCreateLoadDeletePersistentFile() { - PersistentFile persistentFile = new PersistentFile("test.txt", - new PersistentFileContent("test".getBytes())); + public void testCreateLoadDeletePersistentFile() { + PersistentFile persistentFile = new PersistentFile("test.txt", + new PersistentFileContent("test".getBytes())); - Ebean.save(persistentFile); + Ebean.save(persistentFile); - persistentFile = Ebean.find(PersistentFile.class, persistentFile.getId()); - - PersistentFileContent persistentFileContent = persistentFile.getPersistentFileContent(); - - Assert.assertNotNull(persistentFileContent); - - Assert.assertNotNull("load byte content", persistentFileContent.getContent()); - - Ebean.delete(persistentFile); - } + persistentFile = Ebean.find(PersistentFile.class, persistentFile.getId()); + + PersistentFileContent persistentFileContent = persistentFile.getPersistentFileContent(); + + Assert.assertNotNull(persistentFileContent); + + Assert.assertNotNull("load byte content", persistentFileContent.getContent()); + + Ebean.delete(persistentFile); + } } diff --git a/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOneMultiple.java b/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOneMultiple.java index 27e6370ad..70f841cda 100644 --- a/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOneMultiple.java +++ b/src/test/java/com/avaje/tests/basic/TestSaveDeleteOneToOneMultiple.java @@ -1,12 +1,11 @@ package com.avaje.tests.basic; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.PFile; import com.avaje.tests.model.basic.PFileContent; +import org.junit.Assert; +import org.junit.Test; public class TestSaveDeleteOneToOneMultiple extends BaseTestCase { @@ -19,20 +18,20 @@ public class TestSaveDeleteOneToOneMultiple extends BaseTestCase { // } @Test - public void testCreateLoadDeletePFile() { - PFile persistentFile = new PFile("test.txt", - new PFileContent("test".getBytes())); + public void testCreateLoadDeletePFile() { + PFile persistentFile = new PFile("test.txt", + new PFileContent("test".getBytes())); - Ebean.save(persistentFile); + Ebean.save(persistentFile); - persistentFile = Ebean.find(PFile.class, persistentFile.getId()); - - PFileContent persistentFileContent = persistentFile.getFileContent(); - - Assert.assertNotNull(persistentFileContent); - - Assert.assertNotNull("load byte content", persistentFileContent.getContent()); - - Ebean.delete(persistentFile); - } + persistentFile = Ebean.find(PFile.class, persistentFile.getId()); + + PFileContent persistentFileContent = persistentFile.getFileContent(); + + Assert.assertNotNull(persistentFileContent); + + Assert.assertNotNull("load byte content", persistentFileContent.getContent()); + + Ebean.delete(persistentFile); + } } diff --git a/src/test/java/com/avaje/tests/basic/TestSharedInstancePropagation.java b/src/test/java/com/avaje/tests/basic/TestSharedInstancePropagation.java index 929465f39..fba85a8f4 100644 --- a/src/test/java/com/avaje/tests/basic/TestSharedInstancePropagation.java +++ b/src/test/java/com/avaje/tests/basic/TestSharedInstancePropagation.java @@ -11,55 +11,53 @@ import org.junit.Test; import java.util.List; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class TestSharedInstancePropagation extends BaseTestCase { - - /** - * Test that the sharedInstance status is propagated on lazy loading. - */ + + /** + * Test that the sharedInstance status is propagated on lazy loading. + */ @Test - public void testSharedListNavigate() { + public void testSharedListNavigate() { - ResetBasicData.reset(); - - Ebean.getServerCacheManager().clearAll(); + ResetBasicData.reset(); - Order order = Ebean.find(Order.class) - .setAutoTune(false) - .setReadOnly(true) - .setId(1) - .findUnique(); - - - assertNotNull(order); - assertTrue(Ebean.getBeanState(order).isReadOnly()); - - List details = order.getDetails(); - BeanCollection bc = (BeanCollection)details; - assertTrue(bc.isReadOnly()); - assertFalse(bc.isPopulated()); - - // lazy load - bc.size(); - - assertTrue(bc.isPopulated()); - assertTrue(!bc.isEmpty()); - OrderDetail detail = details.get(0); - - assertTrue(Ebean.getBeanState(detail).isReadOnly()); - assertFalse(Ebean.getBeanState(detail).isReference()); - - Product product = detail.getProduct(); + Ebean.getServerCacheManager().clearAll(); - assertTrue(Ebean.getBeanState(product).isReadOnly()); - - // lazy load - product.getName(); - assertFalse(Ebean.getBeanState(product).isReference()); - - } + Order order = Ebean.find(Order.class) + .setAutoTune(false) + .setReadOnly(true) + .setId(1) + .findUnique(); + + + assertNotNull(order); + assertTrue(Ebean.getBeanState(order).isReadOnly()); + + List details = order.getDetails(); + BeanCollection bc = (BeanCollection) details; + assertTrue(bc.isReadOnly()); + assertFalse(bc.isPopulated()); + + // lazy load + bc.size(); + + assertTrue(bc.isPopulated()); + assertTrue(!bc.isEmpty()); + OrderDetail detail = details.get(0); + + assertTrue(Ebean.getBeanState(detail).isReadOnly()); + assertFalse(Ebean.getBeanState(detail).isReference()); + + Product product = detail.getProduct(); + + assertTrue(Ebean.getBeanState(product).isReadOnly()); + + // lazy load + product.getName(); + assertFalse(Ebean.getBeanState(product).isReference()); + + } } diff --git a/src/test/java/com/avaje/tests/basic/TestTransient.java b/src/test/java/com/avaje/tests/basic/TestTransient.java index aa5df2e95..e116cca44 100644 --- a/src/test/java/com/avaje/tests/basic/TestTransient.java +++ b/src/test/java/com/avaje/tests/basic/TestTransient.java @@ -1,12 +1,11 @@ package com.avaje.tests.basic; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.BeanState; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Customer; +import org.junit.Assert; +import org.junit.Test; public class TestTransient extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/TestUpdateManyToOne.java b/src/test/java/com/avaje/tests/basic/TestUpdateManyToOne.java index adca28095..a1c94cb78 100644 --- a/src/test/java/com/avaje/tests/basic/TestUpdateManyToOne.java +++ b/src/test/java/com/avaje/tests/basic/TestUpdateManyToOne.java @@ -1,14 +1,13 @@ package com.avaje.tests.basic; -import java.util.List; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Test; + +import java.util.List; public class TestUpdateManyToOne extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/TestUuidInsert.java b/src/test/java/com/avaje/tests/basic/TestUuidInsert.java index 36cd874ac..20c1d0dc5 100644 --- a/src/test/java/com/avaje/tests/basic/TestUuidInsert.java +++ b/src/test/java/com/avaje/tests/basic/TestUuidInsert.java @@ -1,26 +1,25 @@ package com.avaje.tests.basic; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.TUuidEntity; +import org.junit.Test; public class TestUuidInsert extends BaseTestCase { - @Test - public void test() { - - TUuidEntity e = new TUuidEntity(); - e.setName("bana"); - - Ebean.save(e); - - TUuidEntity e2 = Ebean.find(TUuidEntity.class, e.getId()); - e2.setName("apple"); - - Ebean.save(e2); - - Ebean.delete(e2); - } + @Test + public void test() { + + TUuidEntity e = new TUuidEntity(); + e.setName("bana"); + + Ebean.save(e); + + TUuidEntity e2 = Ebean.find(TUuidEntity.class, e.getId()); + e2.setName("apple"); + + Ebean.save(e2); + + Ebean.delete(e2); + } } diff --git a/src/test/java/com/avaje/tests/basic/TestUuidInsertMasterDetail.java b/src/test/java/com/avaje/tests/basic/TestUuidInsertMasterDetail.java index 1d11001be..5bf751c88 100644 --- a/src/test/java/com/avaje/tests/basic/TestUuidInsertMasterDetail.java +++ b/src/test/java/com/avaje/tests/basic/TestUuidInsertMasterDetail.java @@ -1,13 +1,12 @@ package com.avaje.tests.basic; -import java.util.ArrayList; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.UUOne; import com.avaje.tests.model.basic.UUTwo; +import org.junit.Test; + +import java.util.ArrayList; public class TestUuidInsertMasterDetail extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/TestWhereAnnotation.java b/src/test/java/com/avaje/tests/basic/TestWhereAnnotation.java index fe65799b5..bae636eaa 100644 --- a/src/test/java/com/avaje/tests/basic/TestWhereAnnotation.java +++ b/src/test/java/com/avaje/tests/basic/TestWhereAnnotation.java @@ -1,16 +1,15 @@ package com.avaje.tests.basic; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestWhereAnnotation extends BaseTestCase { @@ -26,7 +25,7 @@ public class TestWhereAnnotation extends BaseTestCase { Assert.assertTrue(!orders.isEmpty()); Query q1 = Ebean.find(Customer.class).setUseCache(false).fetch("orders").where() - .idEq(1).query(); + .idEq(1).query(); q1.findUnique(); String s1 = q1.getGeneratedSql(); diff --git a/src/test/java/com/avaje/tests/basic/delete/TestDeleteByIdList.java b/src/test/java/com/avaje/tests/basic/delete/TestDeleteByIdList.java index 29846f2fd..1cc18632b 100644 --- a/src/test/java/com/avaje/tests/basic/delete/TestDeleteByIdList.java +++ b/src/test/java/com/avaje/tests/basic/delete/TestDeleteByIdList.java @@ -1,10 +1,5 @@ package com.avaje.tests.basic.delete; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebeaninternal.api.SpiEbeanServer; @@ -12,6 +7,10 @@ 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 org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestDeleteByIdList extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/delete/TestDeleteCascadeById.java b/src/test/java/com/avaje/tests/basic/delete/TestDeleteCascadeById.java index aa4553bf5..2d1f05bbb 100644 --- a/src/test/java/com/avaje/tests/basic/delete/TestDeleteCascadeById.java +++ b/src/test/java/com/avaje/tests/basic/delete/TestDeleteCascadeById.java @@ -1,10 +1,5 @@ package com.avaje.tests.basic.delete; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebeaninternal.api.SpiEbeanServer; @@ -12,6 +7,10 @@ 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 org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestDeleteCascadeById extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/encrypt/BasicEncryptKey.java b/src/test/java/com/avaje/tests/basic/encrypt/BasicEncryptKey.java index eb0566ac3..e33b8779c 100644 --- a/src/test/java/com/avaje/tests/basic/encrypt/BasicEncryptKey.java +++ b/src/test/java/com/avaje/tests/basic/encrypt/BasicEncryptKey.java @@ -4,16 +4,15 @@ import com.avaje.ebean.config.EncryptKey; public class BasicEncryptKey implements EncryptKey { - private final String key; + private final String key; + + public BasicEncryptKey(String key) { + this.key = key; + } + + public String getStringValue() { + return key; + } - public BasicEncryptKey(String key) { - this.key = key; - } - - public String getStringValue() { - return key; - } - - } diff --git a/src/test/java/com/avaje/tests/basic/encrypt/BasicEncyptKeyManager.java b/src/test/java/com/avaje/tests/basic/encrypt/BasicEncyptKeyManager.java index f91b425e0..b50b7e869 100644 --- a/src/test/java/com/avaje/tests/basic/encrypt/BasicEncyptKeyManager.java +++ b/src/test/java/com/avaje/tests/basic/encrypt/BasicEncyptKeyManager.java @@ -5,16 +5,16 @@ import com.avaje.ebean.config.EncryptKeyManager; public class BasicEncyptKeyManager implements EncryptKeyManager { - /** - * Initialise the key manager. - */ - public void initialise() { - - } + /** + * Initialise the key manager. + */ + public void initialise() { - public EncryptKey getEncryptKey(String tableName, String columnName) { - // Must be 16 Chars for Oracle function - return new BasicEncryptKey("simple0123456789"); - } + } + + public EncryptKey getEncryptKey(String tableName, String columnName) { + // Must be 16 Chars for Oracle function + return new BasicEncryptKey("simple0123456789"); + } } diff --git a/src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java b/src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java index 6d685fa1a..005ae1e65 100644 --- a/src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java +++ b/src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java @@ -1,13 +1,5 @@ package com.avaje.tests.basic.encrypt; -import java.sql.Date; -import java.util.List; - -import org.avaje.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.SqlQuery; @@ -16,6 +8,13 @@ import com.avaje.ebean.Update; import com.avaje.ebean.config.dbplatform.DbEncrypt; import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.tests.model.basic.EBasicEncrypt; +import org.avaje.ebeantest.LoggedSqlCollector; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + +import java.sql.Date; +import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -32,8 +31,8 @@ public class TestEncrypt extends BaseTestCase { LoggedSqlCollector.start(); Ebean.find(EBasicEncrypt.class) - .where().startsWith("description", "Rob") - .findList(); + .where().startsWith("description", "Rob") + .findList(); List loggedSql = LoggedSqlCollector.stop(); assertThat(loggedSql).hasSize(1); @@ -46,7 +45,7 @@ public class TestEncrypt extends BaseTestCase { Update deleteAll = Ebean.createUpdate(EBasicEncrypt.class, "delete from EBasicEncrypt"); deleteAll.execute(); - + EBasicEncrypt e = new EBasicEncrypt(); e.setName("testname"); e.setDescription("testdesc"); @@ -86,7 +85,7 @@ public class TestEncrypt extends BaseTestCase { } else { List list = Ebean.find(EBasicEncrypt.class).where() - .eq("description", "moddesc").findList(); + .eq("description", "moddesc").findList(); Assert.assertEquals(1, list.size()); diff --git a/src/test/java/com/avaje/tests/basic/encrypt/TestEncryptBinary.java b/src/test/java/com/avaje/tests/basic/encrypt/TestEncryptBinary.java index 25d86ba06..85c02b8e0 100644 --- a/src/test/java/com/avaje/tests/basic/encrypt/TestEncryptBinary.java +++ b/src/test/java/com/avaje/tests/basic/encrypt/TestEncryptBinary.java @@ -1,15 +1,14 @@ package com.avaje.tests.basic.encrypt; -import java.sql.Timestamp; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.SqlQuery; import com.avaje.ebean.SqlRow; import com.avaje.tests.model.basic.EBasicEncryptBinary; +import org.junit.Assert; +import org.junit.Test; + +import java.sql.Timestamp; public class TestEncryptBinary extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/event/TestPreInsertValidation.java b/src/test/java/com/avaje/tests/basic/event/TestPreInsertValidation.java index 141c8a499..baf763554 100644 --- a/src/test/java/com/avaje/tests/basic/event/TestPreInsertValidation.java +++ b/src/test/java/com/avaje/tests/basic/event/TestPreInsertValidation.java @@ -1,50 +1,49 @@ package com.avaje.tests.basic.event; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.TWithPreInsert; +import org.junit.Assert; +import org.junit.Test; public class TestPreInsertValidation extends BaseTestCase { @Test - 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 and name set in preInsert - Assert.assertNotNull(e.getId()); - Assert.assertNotNull(e.getName()); - - TWithPreInsert e1 = Ebean.find(TWithPreInsert.class, e.getId()); - - e1.setTitle("Missus"); - Ebean.save(e1); - } - + 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 and name set in preInsert + Assert.assertNotNull(e.getId()); + Assert.assertNotNull(e.getName()); + + TWithPreInsert e1 = Ebean.find(TWithPreInsert.class, e.getId()); + + e1.setTitle("Missus"); + Ebean.save(e1); + } + @Test public void testStatelessUpdate() { - + TWithPreInsert e = new TWithPreInsert(); e.setName("BeanForUpdateTest"); Ebean.save(e); - + TWithPreInsert bean2 = new TWithPreInsert(); bean2.setId(e.getId()); bean2.setName("stateless-update-name"); bean2.setTitle(null); - + Ebean.update(bean2); - + // title set on preUpdate Assert.assertNotNull(bean2.getTitle()); } - + } diff --git a/src/test/java/com/avaje/tests/basic/event/TestQueryAdapter.java b/src/test/java/com/avaje/tests/basic/event/TestQueryAdapter.java index 3aeed9058..4c0499f0a 100644 --- a/src/test/java/com/avaje/tests/basic/event/TestQueryAdapter.java +++ b/src/test/java/com/avaje/tests/basic/event/TestQueryAdapter.java @@ -1,36 +1,35 @@ package com.avaje.tests.basic.event; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.ResetBasicData; import com.avaje.tests.model.basic.TOne; +import org.junit.Assert; +import org.junit.Test; public class TestQueryAdapter extends BaseTestCase { @Test - public void testSimple() { - - ResetBasicData.reset(); - - TOne o = new TOne(); - o.setName("something"); - - Ebean.save(o); - - //Ebean.find(TOne.class, o.getId()); - - Query queryFindId = Ebean.find(TOne.class) - .setId(o.getId()); - - TOne one = queryFindId.findUnique(); - Assert.assertNotNull(one); - Assert.assertEquals(one.getId(), o.getId()); - String generatedSql = queryFindId.getGeneratedSql(); - Assert.assertTrue(generatedSql.contains(" 1=1")); - - } + public void testSimple() { + + ResetBasicData.reset(); + + TOne o = new TOne(); + o.setName("something"); + + Ebean.save(o); + + //Ebean.find(TOne.class, o.getId()); + + Query queryFindId = Ebean.find(TOne.class) + .setId(o.getId()); + + TOne one = queryFindId.findUnique(); + Assert.assertNotNull(one); + Assert.assertEquals(one.getId(), o.getId()); + String generatedSql = queryFindId.getGeneratedSql(); + Assert.assertTrue(generatedSql.contains(" 1=1")); + + } } diff --git a/src/test/java/com/avaje/tests/basic/join/TestSecondaryJoin.java b/src/test/java/com/avaje/tests/basic/join/TestSecondaryJoin.java index d878ad849..ef16a8ed7 100644 --- a/src/test/java/com/avaje/tests/basic/join/TestSecondaryJoin.java +++ b/src/test/java/com/avaje/tests/basic/join/TestSecondaryJoin.java @@ -1,14 +1,13 @@ package com.avaje.tests.basic.join; -import java.util.List; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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; +import org.junit.Test; + +import java.util.List; public class TestSecondaryJoin extends BaseTestCase { @@ -18,9 +17,9 @@ public class TestSecondaryJoin extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Order.class) - // .select("*") - // .join("customer") - .findList(); + // .select("*") + // .join("customer") + .findList(); Order o0 = list.get(0); o0.setCustomerName("Banan"); diff --git a/src/test/java/com/avaje/tests/basic/lob/TestBasicClobFetchEager.java b/src/test/java/com/avaje/tests/basic/lob/TestBasicClobFetchEager.java index 4486e809f..d5254e70b 100644 --- a/src/test/java/com/avaje/tests/basic/lob/TestBasicClobFetchEager.java +++ b/src/test/java/com/avaje/tests/basic/lob/TestBasicClobFetchEager.java @@ -1,16 +1,15 @@ package com.avaje.tests.basic.lob; -import java.util.List; - -import org.avaje.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.EBasicClobFetchEager; +import org.avaje.ebeantest.LoggedSqlCollector; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -25,9 +24,9 @@ public class TestBasicClobFetchEager extends BaseTestCase { EbeanServer server = Ebean.getServer(null); server.save(entity); - + String expectedSql = "select t0.id, t0.name, t0.title, t0.description, t0.last_update from ebasic_clob_fetch_eager t0 where t0.id = ?"; - + // Clob included in fetch as FetchType.EAGER set by annotation Query defaultQuery = Ebean.find(EBasicClobFetchEager.class).setId(entity.getId()); defaultQuery.findUnique(); @@ -35,9 +34,9 @@ public class TestBasicClobFetchEager extends BaseTestCase { assertThat(sql).contains(expectedSql); - + LoggedSqlCollector.start(); - + // Same as previous query - clob included by default based on annotation Ebean.find(EBasicClobFetchEager.class, entity.getId()); @@ -45,7 +44,6 @@ public class TestBasicClobFetchEager extends BaseTestCase { List loggedSql = LoggedSqlCollector.stop(); Assert.assertEquals(1, loggedSql.size()); assertThat(trimSql(loggedSql.get(0), 6)).contains(expectedSql); - // Explicitly select * including Clob @@ -57,22 +55,22 @@ public class TestBasicClobFetchEager extends BaseTestCase { assertThat(sql).contains(expectedSql); // Update description to test refresh - + EBasicClobFetchEager updateBean = new EBasicClobFetchEager(); updateBean.setId(entity.getId()); updateBean.setDescription("modified"); Ebean.update(updateBean); - - + + // Test refresh function - + Assert.assertEquals("initialClobValue", entity.getDescription()); LoggedSqlCollector.start(); - + // Refresh query includes all properties server.refresh(entity); - + // Assert all properties fetched in refresh loggedSql = LoggedSqlCollector.stop(); Assert.assertEquals(1, loggedSql.size()); diff --git a/src/test/java/com/avaje/tests/basic/lob/TestBasicClobNoVer.java b/src/test/java/com/avaje/tests/basic/lob/TestBasicClobNoVer.java index 9443d9205..4ed721ae9 100644 --- a/src/test/java/com/avaje/tests/basic/lob/TestBasicClobNoVer.java +++ b/src/test/java/com/avaje/tests/basic/lob/TestBasicClobNoVer.java @@ -1,16 +1,15 @@ package com.avaje.tests.basic.lob; -import java.util.List; - -import org.avaje.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.EBasicClobNoVer; +import org.avaje.ebeantest.LoggedSqlCollector; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -25,11 +24,11 @@ public class TestBasicClobNoVer extends BaseTestCase { EbeanServer server = Ebean.getServer(null); server.save(entity); - + String sqlNoClob = "select t0.id, t0.name from ebasic_clob_no_ver t0 where t0.id = ?"; String sqlWithClob = "select t0.id, t0.name, t0.description from ebasic_clob_no_ver t0 where t0.id = ?"; - - + + // Clob by default is Fetch Lazy Query defaultQuery = Ebean.find(EBasicClobNoVer.class).setId(entity.getId()); defaultQuery.findUnique(); @@ -37,7 +36,7 @@ public class TestBasicClobNoVer extends BaseTestCase { Assert.assertTrue("Clob is fetch lazy by default", sql.contains(sqlNoClob)); - + // Explicitly select * including Clob Query explicitQuery = Ebean.find(EBasicClobNoVer.class).setId(entity.getId()).select("*"); @@ -47,22 +46,22 @@ public class TestBasicClobNoVer extends BaseTestCase { Assert.assertTrue("Explicitly include Clob", sql.contains(sqlWithClob)); // Update description to test refresh - + EBasicClobNoVer updateBean = new EBasicClobNoVer(); updateBean.setId(entity.getId()); updateBean.setDescription("modified"); Ebean.update(updateBean); - - + + // Test refresh function - + Assert.assertEquals("initialClobValue", entity.getDescription()); LoggedSqlCollector.start(); - + // Refresh query includes all properties server.refresh(entity); - + // Assert all properties fetched in refresh List loggedSql = LoggedSqlCollector.stop(); Assert.assertEquals(1, loggedSql.size()); diff --git a/src/test/java/com/avaje/tests/basic/lob/TestByteOnly.java b/src/test/java/com/avaje/tests/basic/lob/TestByteOnly.java index df7da089c..f7c968950 100644 --- a/src/test/java/com/avaje/tests/basic/lob/TestByteOnly.java +++ b/src/test/java/com/avaje/tests/basic/lob/TestByteOnly.java @@ -1,23 +1,22 @@ package com.avaje.tests.basic.lob; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.TBytesOnly; +import org.junit.Test; public class TestByteOnly extends BaseTestCase { @Test public void test() { - byte[] content = new byte[] { 1, 1 }; + byte[] content = new byte[]{1, 1}; TBytesOnly e = new TBytesOnly(); e.setContent(content); Ebean.save(e); - byte[] content2 = new byte[] { 1, 1 }; + byte[] content2 = new byte[]{1, 1}; TBytesOnly e2 = Ebean.find(TBytesOnly.class, e.getId()); e2.setContent(content2); diff --git a/src/test/java/com/avaje/tests/basic/one2one/Booking.java b/src/test/java/com/avaje/tests/basic/one2one/Booking.java index 098a03116..5bed91968 100644 --- a/src/test/java/com/avaje/tests/basic/one2one/Booking.java +++ b/src/test/java/com/avaje/tests/basic/one2one/Booking.java @@ -17,37 +17,38 @@ import java.util.List; @Table(name = "drel_booking") public class Booking { - @Id @GeneratedValue(strategy = GenerationType.SEQUENCE) - private Long id; + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private Long id; @Column(unique = true) Long bookingUid; - @Version - private int version; + @Version + private int version; - @OneToOne(cascade = CascadeType.ALL) - @JoinColumn(name = "agent_invoice") - private Invoice agentInvoice; - - @OneToOne(cascade = CascadeType.ALL) - @JoinColumn(name = "client_invoice") - private Invoice clientInvoice; - - @OneToMany(mappedBy = "booking") - private List invoices; + @OneToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "agent_invoice") + private Invoice agentInvoice; - public Booking(Long bookingUid) { - this.bookingUid = bookingUid; - } + @OneToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "client_invoice") + private Invoice clientInvoice; - public Long getId() { - return id; - } + @OneToMany(mappedBy = "booking") + private List invoices; - public void setId(Long id) { - this.id = id; - } + public Booking(Long bookingUid) { + this.bookingUid = bookingUid; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } public Long getBookingUid() { return bookingUid; @@ -58,34 +59,34 @@ public class Booking { } public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public Invoice getAgentInvoice() { - return agentInvoice; - } - - public void setAgentInvoice(Invoice agentInvoice) { - this.agentInvoice = agentInvoice; - } - - public Invoice getClientInvoice() { - return clientInvoice; - } - - public void setClientInvoice(Invoice clientInvoice) { - this.clientInvoice = clientInvoice; - } - - public List getInvoices() { - return invoices; - } + return version; + } - public void setInvoices(List invoices) { - this.invoices= invoices; - } + public void setVersion(int version) { + this.version = version; + } + + public Invoice getAgentInvoice() { + return agentInvoice; + } + + public void setAgentInvoice(Invoice agentInvoice) { + this.agentInvoice = agentInvoice; + } + + public Invoice getClientInvoice() { + return clientInvoice; + } + + public void setClientInvoice(Invoice clientInvoice) { + this.clientInvoice = clientInvoice; + } + + public List getInvoices() { + return invoices; + } + + public void setInvoices(List invoices) { + this.invoices = invoices; + } } diff --git a/src/test/java/com/avaje/tests/basic/one2one/Invoice.java b/src/test/java/com/avaje/tests/basic/one2one/Invoice.java index 64f002a96..dd609be1a 100644 --- a/src/test/java/com/avaje/tests/basic/one2one/Invoice.java +++ b/src/test/java/com/avaje/tests/basic/one2one/Invoice.java @@ -11,40 +11,41 @@ import javax.persistence.Table; import javax.persistence.Version; @Entity -@Table(name="drel_invoice") +@Table(name = "drel_invoice") public class Invoice { - @Id @GeneratedValue(strategy = GenerationType.SEQUENCE) - private Long id; - - @Version - private int version; - - @ManyToOne(cascade = CascadeType.ALL) - @JoinColumn(name = "booking")//_xid", referencedColumnName = "booking_uid") - private Booking booking; + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private Long id; - public Long getId() { - return id; - } + @Version + private int version; - public void setId(Long id) { - this.id = id; - } + @ManyToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "booking")//_xid", referencedColumnName = "booking_uid") + private Booking booking; - public int getVersion() { - return version; - } + public Long getId() { + return id; + } - public void setVersion(int version) { - this.version = version; - } + public void setId(Long id) { + this.id = id; + } - public Booking getBooking() { - return booking; - } + public int getVersion() { + return version; + } - public void setBooking(Booking booking) { - this.booking = booking; - } + public void setVersion(int version) { + this.version = version; + } + + public Booking getBooking() { + return booking; + } + + public void setBooking(Booking booking) { + this.booking = booking; + } } diff --git a/src/test/java/com/avaje/tests/basic/one2one/TestOne2OneBookingInvoice.java b/src/test/java/com/avaje/tests/basic/one2one/TestOne2OneBookingInvoice.java index 6dddc3b8e..1361025f4 100644 --- a/src/test/java/com/avaje/tests/basic/one2one/TestOne2OneBookingInvoice.java +++ b/src/test/java/com/avaje/tests/basic/one2one/TestOne2OneBookingInvoice.java @@ -1,10 +1,9 @@ package com.avaje.tests.basic.one2one; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; +import org.junit.Assert; +import org.junit.Test; public class TestOne2OneBookingInvoice extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/one2one/Tire.java b/src/test/java/com/avaje/tests/basic/one2one/Tire.java index d67565d70..50ac16e82 100644 --- a/src/test/java/com/avaje/tests/basic/one2one/Tire.java +++ b/src/test/java/com/avaje/tests/basic/one2one/Tire.java @@ -13,40 +13,40 @@ import javax.persistence.Version; @Entity @Table(name = "tire") public class Tire { - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE) - private Long id; - @Version - private int version; - @OneToOne(cascade = CascadeType.ALL) - @JoinColumn(name = "wheel") - private Wheel wheel; + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private Long id; + @Version + private int version; + @OneToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "wheel") + private Wheel wheel; - public Tire() { - super(); - } + public Tire() { + super(); + } - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public int getVersion() { - return version; - } + public int getVersion() { + return version; + } - public void setVersion(int version) { - this.version = version; - } + public void setVersion(int version) { + this.version = version; + } - public Wheel getWheel() { - return wheel; - } + public Wheel getWheel() { + return wheel; + } - public void setWheel(Wheel wheel) { - this.wheel = wheel; - } -} \ No newline at end of file + public void setWheel(Wheel wheel) { + this.wheel = wheel; + } +} diff --git a/src/test/java/com/avaje/tests/basic/type/BSimpleWithGen.java b/src/test/java/com/avaje/tests/basic/type/BSimpleWithGen.java index 4776f7a2d..e51bec781 100644 --- a/src/test/java/com/avaje/tests/basic/type/BSimpleWithGen.java +++ b/src/test/java/com/avaje/tests/basic/type/BSimpleWithGen.java @@ -1,45 +1,44 @@ package com.avaje.tests.basic.type; -import java.util.List; -import java.util.Map; - import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Transient; +import java.util.List; +import java.util.Map; @Entity public class BSimpleWithGen { - @Id - Integer id; - - String name; - - @Transient - Map> someMap; + @Id + Integer id; - public Integer getId() { - return id; - } + String name; - public void setId(Integer id) { - this.id = id; - } + @Transient + Map> someMap; - public String getName() { - return name; - } + public Integer getId() { + return id; + } - public void setName(String name) { - this.name = name; - } + public void setId(Integer id) { + this.id = id; + } - public Map> getSomeMap() { - return someMap; - } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Map> getSomeMap() { + return someMap; + } + + public void setSomeMap(Map> someMap) { + this.someMap = someMap; + } - public void setSomeMap(Map> someMap) { - this.someMap = someMap; - } - } diff --git a/src/test/java/com/avaje/tests/basic/type/TestEnumValueAnnotation.java b/src/test/java/com/avaje/tests/basic/type/TestEnumValueAnnotation.java index 4e065707b..8134a3009 100644 --- a/src/test/java/com/avaje/tests/basic/type/TestEnumValueAnnotation.java +++ b/src/test/java/com/avaje/tests/basic/type/TestEnumValueAnnotation.java @@ -1,9 +1,5 @@ package com.avaje.tests.basic.type; -import com.avaje.tests.model.basic.EBasicEnumInt; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.SqlQuery; @@ -11,6 +7,9 @@ import com.avaje.ebean.SqlRow; import com.avaje.tests.model.basic.EBasic; import com.avaje.tests.model.basic.EBasic.Status; import com.avaje.tests.model.basic.EBasicEnumId; +import com.avaje.tests.model.basic.EBasicEnumInt; +import org.junit.Assert; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -90,9 +89,9 @@ public class TestEnumValueAnnotation extends BaseTestCase { EBasicEnumInt b2 = Ebean.find(EBasicEnumInt.class) - .where().eq("id", b.getId()) - .eq("status", EBasicEnumInt.Status.NEW) - .findUnique(); + .where().eq("id", b.getId()) + .eq("status", EBasicEnumInt.Status.NEW) + .findUnique(); assertNotNull(b2); } diff --git a/src/test/java/com/avaje/tests/basic/type/TestExtraScalarTypes.java b/src/test/java/com/avaje/tests/basic/type/TestExtraScalarTypes.java index d29750b0e..a1fad7d9c 100644 --- a/src/test/java/com/avaje/tests/basic/type/TestExtraScalarTypes.java +++ b/src/test/java/com/avaje/tests/basic/type/TestExtraScalarTypes.java @@ -1,17 +1,16 @@ package com.avaje.tests.basic.type; +import com.avaje.ebean.BaseTestCase; +import com.avaje.ebean.Ebean; +import com.avaje.tests.model.basic.ESomeType; +import org.junit.Assert; +import org.junit.Test; + import java.util.Currency; import java.util.List; import java.util.Locale; import java.util.TimeZone; -import org.junit.Assert; -import org.junit.Test; - -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.basic.ESomeType; - import static org.junit.Assert.assertTrue; public class TestExtraScalarTypes extends BaseTestCase { @@ -37,11 +36,11 @@ public class TestExtraScalarTypes extends BaseTestCase { Assert.assertNotNull(e2.getTimeZone()); List list = Ebean.find(ESomeType.class) - .setAutoTune(false).where() - .eq("locale", locale) - .eq("timeZone", tz.getID()) - .eq("currency", currency) - .findList(); + .setAutoTune(false).where() + .eq("locale", locale) + .eq("timeZone", tz.getID()) + .eq("currency", currency) + .findList(); assertTrue(!list.isEmpty()); } diff --git a/src/test/java/com/avaje/tests/basic/type/TestInetAddressType.java b/src/test/java/com/avaje/tests/basic/type/TestInetAddressType.java index 84eb3c21a..8f5107076 100644 --- a/src/test/java/com/avaje/tests/basic/type/TestInetAddressType.java +++ b/src/test/java/com/avaje/tests/basic/type/TestInetAddressType.java @@ -1,61 +1,60 @@ package com.avaje.tests.basic.type; -import java.net.InetAddress; -import java.net.UnknownHostException; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.EWithInetAddr; +import org.junit.Assert; +import org.junit.Test; + +import java.net.InetAddress; +import java.net.UnknownHostException; public class TestInetAddressType extends BaseTestCase { @Test public void testIp4() throws UnknownHostException { - + insertUpdateDeleteFind("120.12.12.56"); } @Test public void testIp6() throws UnknownHostException { - + insertUpdateDeleteFind("2001:db8:85a3:0:0:8a2e:370:7334"); } - + private void insertUpdateDeleteFind(String ipAddress) throws UnknownHostException { - + EWithInetAddr bean1 = new EWithInetAddr(); bean1.setName("jim"); - + InetAddress address1 = InetAddress.getByName(ipAddress); bean1.setInetAddress(address1); - + Ebean.save(bean1); - + EWithInetAddr bean2 = Ebean.find(EWithInetAddr.class, bean1.getId()); InetAddress address2 = bean2.getInetAddress(); Assert.assertNotNull(address2.getHostAddress()); Assert.assertEquals(address1.getHostAddress(), address2.getHostAddress()); - + bean2.setName("modJim"); bean2.setInetAddress(InetAddress.getByName("120.12.20.80")); Ebean.save(bean2); Ebean.delete(bean2); } - + @Test public void use_null() throws UnknownHostException { - + EWithInetAddr bean1 = new EWithInetAddr(); bean1.setName("jim"); - + Ebean.save(bean1); - + EWithInetAddr bean2 = Ebean.find(EWithInetAddr.class, bean1.getId()); InetAddress address2 = bean2.getInetAddress(); Assert.assertNull(address2); } - + } diff --git a/src/test/java/com/avaje/tests/basic/type/TestQueryBooleanProperty.java b/src/test/java/com/avaje/tests/basic/type/TestQueryBooleanProperty.java index ff3e9b5da..7726880e4 100644 --- a/src/test/java/com/avaje/tests/basic/type/TestQueryBooleanProperty.java +++ b/src/test/java/com/avaje/tests/basic/type/TestQueryBooleanProperty.java @@ -1,10 +1,9 @@ package com.avaje.tests.basic.type; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.TOne; +import org.junit.Test; public class TestQueryBooleanProperty extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/basic/type/TestSqlRowUUID.java b/src/test/java/com/avaje/tests/basic/type/TestSqlRowUUID.java index cfb91ee91..ab97f7b8f 100644 --- a/src/test/java/com/avaje/tests/basic/type/TestSqlRowUUID.java +++ b/src/test/java/com/avaje/tests/basic/type/TestSqlRowUUID.java @@ -1,15 +1,14 @@ package com.avaje.tests.basic.type; -import java.util.UUID; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.SqlQuery; import com.avaje.ebean.SqlRow; import com.avaje.tests.model.basic.TUuidEntity; +import org.junit.Assert; +import org.junit.Test; + +import java.util.UUID; public class TestSqlRowUUID extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertSimple.java b/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertSimple.java index 784958b30..919011958 100644 --- a/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertSimple.java +++ b/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertSimple.java @@ -53,7 +53,7 @@ public class TestBatchInsertSimple extends BaseTestCase { saveWithFullBatchMode(); } - @Transactional(batchSize=50) + @Transactional(batchSize = 50) public void saveWithFullBatchMode() { int numOfMasters = 4; @@ -162,9 +162,9 @@ public class TestBatchInsertSimple extends BaseTestCase { // escalate based on batchOnCascade value Ebean.saveAll(masters); - for (int i = 0; i < masters.size() ; i++) { + for (int i = 0; i < masters.size(); i++) { UTMaster utMaster = masters.get(i); - utMaster.setName(utMaster.getName()+"-Mod"); + utMaster.setName(utMaster.getName() + "-Mod"); if (i % 2 == 0) { // make the updates a little bit different utMaster.setDescription("Blah"); diff --git a/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java b/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java index 200dfc5bf..fb710a0c3 100644 --- a/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java +++ b/src/test/java/com/avaje/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java @@ -24,7 +24,7 @@ public class TestBatchInsertWithInitialisedCollection extends BaseTestCase { for (int i = 0; i < 3; i++) { OCachedBean bean = new OCachedBean(); - bean.setName("name "+i); + bean.setName("name " + i); list.add(bean); } diff --git a/src/test/java/com/avaje/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/src/test/java/com/avaje/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java index f7033f8c6..960613f51 100644 --- a/src/test/java/com/avaje/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java +++ b/src/test/java/com/avaje/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java @@ -9,13 +9,14 @@ import com.avaje.ebeaninternal.server.persist.BatchControl; import com.avaje.tests.model.basic.EBasicWithUniqueCon; import com.avaje.tests.model.basic.EOptOneB; import com.avaje.tests.model.basic.EOptOneC; +import org.assertj.core.api.Assertions; +import org.junit.Test; + import javax.persistence.PersistenceException; import java.sql.SQLException; import java.sql.Savepoint; -import org.assertj.core.api.Assertions; -import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.StrictAssertions.assertThat; public class TestBatchOnCascadeExceptionHandling extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/batchload/TestBasicLazy.java b/src/test/java/com/avaje/tests/batchload/TestBasicLazy.java index 773cc31dd..e6c389e08 100644 --- a/src/test/java/com/avaje/tests/batchload/TestBasicLazy.java +++ b/src/test/java/com/avaje/tests/batchload/TestBasicLazy.java @@ -1,13 +1,5 @@ package com.avaje.tests.batchload; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Expr; @@ -19,6 +11,13 @@ 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 org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; public class TestBasicLazy extends BaseTestCase { @@ -28,7 +27,7 @@ public class TestBasicLazy extends BaseTestCase { ResetBasicData.reset(); Order order = Ebean.find(Order.class).select("totalAmount").setMaxRows(1).order("id") - .findUnique(); + .findUnique(); Assert.assertNotNull(order); @@ -76,7 +75,7 @@ public class TestBasicLazy extends BaseTestCase { ResetBasicData.reset(); Order order = Ebean.find(Order.class).select("totalAmount").setMaxRows(1).order("id") - .findUnique(); + .findUnique(); Assert.assertNotNull(order); @@ -204,4 +203,4 @@ public class TestBasicLazy extends BaseTestCase { Assert.fail(); } } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/batchload/TestBasicNavOnEmpty.java b/src/test/java/com/avaje/tests/batchload/TestBasicNavOnEmpty.java index ac3aee73b..554881d5a 100644 --- a/src/test/java/com/avaje/tests/batchload/TestBasicNavOnEmpty.java +++ b/src/test/java/com/avaje/tests/batchload/TestBasicNavOnEmpty.java @@ -1,29 +1,28 @@ package com.avaje.tests.batchload; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Contact; import com.avaje.tests.model.basic.Customer; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestBasicNavOnEmpty extends BaseTestCase { @Test - public void test() { - - Customer c = new Customer(); - c.setName("HelloRob"); - - Ebean.save(c); - - c = Ebean.find(Customer.class, c.getId()); - - List contacts = c.getContacts(); - Assert.assertEquals(0,contacts.size()); - } - + public void test() { + + Customer c = new Customer(); + c.setName("HelloRob"); + + Ebean.save(c); + + c = Ebean.find(Customer.class, c.getId()); + + List contacts = c.getContacts(); + Assert.assertEquals(0, contacts.size()); + } + } diff --git a/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java b/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java index 71a6768d5..e668ae1b5 100644 --- a/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java @@ -47,13 +47,13 @@ public class TestBatchLazyWithCacheHits extends BaseTestCase { assertEquals(statistics.getHitCount(), 1); UUOne c = Ebean.find(UUOne.class) - .where().idEq(inserted.get(2).getId()) - .findUnique(); + .where().idEq(inserted.get(2).getId()) + .findUnique(); assertNotNull(c); UUOne c2 = Ebean.find(UUOne.class) - .where().idEq(inserted.get(2).getId()) - .findUnique(); + .where().idEq(inserted.get(2).getId()) + .findUnique(); assertNotNull(c2); statistics = beanCache.getStatistics(true); assertEquals(statistics.getHitCount(), 1); @@ -61,11 +61,11 @@ public class TestBatchLazyWithCacheHits extends BaseTestCase { LoggedSqlCollector.start(); List list = Ebean.find(UUOne.class) - //.setDefaultLazyLoadBatchSize(5) - .select("id") - .where().startsWith("name", "testBLWCH") - .order("name") - .findList(); + //.setDefaultLazyLoadBatchSize(5) + .select("id") + .where().startsWith("name", "testBLWCH") + .order("name") + .findList(); for (UUOne uuOne : list) { uuOne.getName(); diff --git a/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithDeleted.java b/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithDeleted.java index 76cc4bd87..46a856427 100644 --- a/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithDeleted.java +++ b/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithDeleted.java @@ -1,17 +1,15 @@ package com.avaje.tests.batchload; -import java.util.List; - -import javax.persistence.EntityNotFoundException; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.FetchConfig; import com.avaje.tests.model.basic.UUOne; import com.avaje.tests.model.basic.UUTwo; +import org.junit.Assert; +import org.junit.Test; + +import javax.persistence.EntityNotFoundException; +import java.util.List; public class TestBatchLazyWithDeleted extends BaseTestCase { @@ -46,10 +44,10 @@ public class TestBatchLazyWithDeleted extends BaseTestCase { Ebean.save(twoC); List list = Ebean.find(UUTwo.class) - .fetch("master", new FetchConfig().lazy(5)) - .where().startsWith("name", "two-bld-") - .order("name") - .findList(); + .fetch("master", new FetchConfig().lazy(5)) + .where().startsWith("name", "two-bld-") + .order("name") + .findList(); // delete a bean that will be batch lazy loaded but // is NOT the bean that will invoke the lazy loading diff --git a/src/test/java/com/avaje/tests/batchload/TestEmptyManyLazyLoad.java b/src/test/java/com/avaje/tests/batchload/TestEmptyManyLazyLoad.java index 810352e83..aba6a6bb4 100644 --- a/src/test/java/com/avaje/tests/batchload/TestEmptyManyLazyLoad.java +++ b/src/test/java/com/avaje/tests/batchload/TestEmptyManyLazyLoad.java @@ -1,13 +1,12 @@ package com.avaje.tests.batchload; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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; +import org.junit.Test; public class TestEmptyManyLazyLoad extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/batchload/TestLazyJoin.java b/src/test/java/com/avaje/tests/batchload/TestLazyJoin.java index 6ce8a02c6..7afa59ad5 100644 --- a/src/test/java/com/avaje/tests/batchload/TestLazyJoin.java +++ b/src/test/java/com/avaje/tests/batchload/TestLazyJoin.java @@ -1,10 +1,5 @@ package com.avaje.tests.batchload; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; @@ -12,6 +7,10 @@ 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; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestLazyJoin extends BaseTestCase { @@ -21,10 +20,10 @@ public class TestLazyJoin extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class) - .select("status") - .fetch("customer", "+lazy(10) name, status") - .fetch("customer.contacts") - .order().asc("id"); + .select("status") + .fetch("customer", "+lazy(10) name, status") + .fetch("customer.contacts") + .order().asc("id"); List list = query.findList(); diff --git a/src/test/java/com/avaje/tests/batchload/TestLazyJoin2.java b/src/test/java/com/avaje/tests/batchload/TestLazyJoin2.java index 9a9d81c23..27a832f8e 100644 --- a/src/test/java/com/avaje/tests/batchload/TestLazyJoin2.java +++ b/src/test/java/com/avaje/tests/batchload/TestLazyJoin2.java @@ -1,19 +1,17 @@ package com.avaje.tests.batchload; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.FetchConfig; -import com.avaje.ebean.Query; 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 org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestLazyJoin2 extends BaseTestCase { @@ -25,12 +23,12 @@ public class TestLazyJoin2 extends BaseTestCase { // This will use 3 SQL queries to build this object graph List l0 = Ebean.find(Order.class).select("status, shipDate") - .fetch("details", "orderQty, unitPrice", new FetchConfig().query()) - .fetch("details.product", "sku, name") + .fetch("details", "orderQty, unitPrice", new FetchConfig().query()) + .fetch("details.product", "sku, name") - .fetch("customer", "name", new FetchConfig().query(10)) - .fetch("customer.contacts", "firstName, lastName, mobile") - .fetch("customer.shippingAddress", "line1, city").order().asc("id").findList(); + .fetch("customer", "name", new FetchConfig().query(10)) + .fetch("customer.contacts", "firstName, lastName, mobile") + .fetch("customer.shippingAddress", "line1, city").order().asc("id").findList(); Order o0 = l0.get(0); Customer c0 = o0.getCustomer(); @@ -44,8 +42,8 @@ public class TestLazyJoin2 extends BaseTestCase { // where id in (?,?,?,?,?) List orders = Ebean.find(Order.class) - // .select("status") - .fetch("customer", new FetchConfig().query(3).lazy(10)).order().asc("id").findList(); + // .select("status") + .fetch("customer", new FetchConfig().query(3).lazy(10)).order().asc("id").findList(); // .join("customer.contacts"); // List list = query.findList(); @@ -62,8 +60,8 @@ public class TestLazyJoin2 extends BaseTestCase { Assert.assertNotNull(billingAddress); List list = Ebean.find(Order.class).fetch("customer", "name", new FetchConfig().lazy(5)) - .fetch("customer.contacts", "contactName, phone, email").fetch("customer.shippingAddress") - .where().eq("status", Order.Status.NEW).order().asc("id").findList(); + .fetch("customer.contacts", "contactName, phone, email").fetch("customer.shippingAddress") + .where().eq("status", Order.Status.NEW).order().asc("id").findList(); Order order2 = list.get(0); Customer customer2 = order2.getCustomer(); diff --git a/src/test/java/com/avaje/tests/batchload/TestLazyLoadEmptyCollection.java b/src/test/java/com/avaje/tests/batchload/TestLazyLoadEmptyCollection.java index 6a5196c50..9b1050b68 100644 --- a/src/test/java/com/avaje/tests/batchload/TestLazyLoadEmptyCollection.java +++ b/src/test/java/com/avaje/tests/batchload/TestLazyLoadEmptyCollection.java @@ -1,15 +1,14 @@ package com.avaje.tests.batchload; -import java.util.List; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.FetchConfig; import com.avaje.tests.model.basic.Contact; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Test; + +import java.util.List; public class TestLazyLoadEmptyCollection extends BaseTestCase { @@ -27,9 +26,9 @@ public class TestLazyLoadEmptyCollection extends BaseTestCase { Ebean.save(c); List list = Ebean.find(Customer.class) - .fetch("contacts", new FetchConfig().query(0)) - .fetch("contacts.notes", new FetchConfig().query(100)) - .findList(); + .fetch("contacts", new FetchConfig().query(0)) + .fetch("contacts.notes", new FetchConfig().query(100)) + .findList(); for (Customer customer : list) { List contacts = customer.getContacts(); diff --git a/src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistantBean.java b/src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistantBean.java index 2431dae7f..1b26c7938 100644 --- a/src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistantBean.java +++ b/src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistantBean.java @@ -1,15 +1,13 @@ package com.avaje.tests.batchload; -import java.util.UUID; - -import javax.persistence.EntityNotFoundException; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.UUOne; +import org.junit.Assert; +import org.junit.Test; + +import javax.persistence.EntityNotFoundException; +import java.util.UUID; public class TestLazyLoadNonExistantBean extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistentBean.java b/src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistentBean.java index 3ee53106a..63b03d406 100644 --- a/src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistentBean.java +++ b/src/test/java/com/avaje/tests/batchload/TestLazyLoadNonExistentBean.java @@ -1,15 +1,13 @@ package com.avaje.tests.batchload; -import java.util.UUID; - -import javax.persistence.EntityNotFoundException; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.UUOne; +import org.junit.Assert; +import org.junit.Test; + +import javax.persistence.EntityNotFoundException; +import java.util.UUID; public class TestLazyLoadNonExistentBean extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/batchload/TestLoadOnDirty.java b/src/test/java/com/avaje/tests/batchload/TestLoadOnDirty.java index a18014f2b..9be79a5b1 100644 --- a/src/test/java/com/avaje/tests/batchload/TestLoadOnDirty.java +++ b/src/test/java/com/avaje/tests/batchload/TestLoadOnDirty.java @@ -1,17 +1,16 @@ package com.avaje.tests.batchload; -import java.util.List; - -import com.avaje.ebean.bean.EntityBean; -import com.avaje.ebean.bean.EntityBeanIntercept; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.BeanState; import com.avaje.ebean.Ebean; +import com.avaje.ebean.bean.EntityBean; +import com.avaje.ebean.bean.EntityBeanIntercept; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestLoadOnDirty extends BaseTestCase { @@ -23,8 +22,8 @@ public class TestLoadOnDirty extends BaseTestCase { List custs = Ebean.find(Customer.class).findList(); Customer customer = Ebean.find(Customer.class).setId(custs.get(0).getId()).select("name") - .setUseCache(false) - .findUnique(); + .setUseCache(false) + .findUnique(); BeanState beanState = Ebean.getBeanState(customer); Assert.assertTrue(!beanState.isNew()); @@ -63,10 +62,10 @@ public class TestLoadOnDirty extends BaseTestCase { List custs = Ebean.find(Customer.class).order("id").findList(); Customer customer = Ebean.find(Customer.class) - .setId(custs.get(0).getId()) - .select("id") - .setUseCache(false) - .findUnique(); + .setId(custs.get(0).getId()) + .select("id") + .setUseCache(false) + .findUnique(); BeanState beanState = Ebean.getBeanState(customer); beanState.setDisableLazyLoad(true); diff --git a/src/test/java/com/avaje/tests/batchload/TestQueryDisableLazyLoad.java b/src/test/java/com/avaje/tests/batchload/TestQueryDisableLazyLoad.java index 6c465edb8..fdd35e3a9 100644 --- a/src/test/java/com/avaje/tests/batchload/TestQueryDisableLazyLoad.java +++ b/src/test/java/com/avaje/tests/batchload/TestQueryDisableLazyLoad.java @@ -24,9 +24,9 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { LoggedSqlCollector.start(); List l0 = Ebean.find(Order.class) - .setDisableLazyLoading(true) - .order().asc("id") - .findList(); + .setDisableLazyLoading(true) + .order().asc("id") + .findList(); assertThat(l0).isNotEmpty(); @@ -50,9 +50,9 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { LoggedSqlCollector.start(); List l0 = Ebean.find(Order.class) - .setDisableLazyLoading(true) - .order().asc("id") - .findList(); + .setDisableLazyLoading(true) + .order().asc("id") + .findList(); assertThat(l0).isNotEmpty(); @@ -73,10 +73,10 @@ public class TestQueryDisableLazyLoad extends BaseTestCase { LoggedSqlCollector.start(); List l0 = Ebean.find(Order.class) - .setDisableLazyLoading(true) - .fetch("customer","smallnote") - .order().asc("id") - .findList(); + .setDisableLazyLoading(true) + .fetch("customer", "smallnote") + .order().asc("id") + .findList(); assertThat(l0).isNotEmpty(); diff --git a/src/test/java/com/avaje/tests/batchload/TestQueryJoin.java b/src/test/java/com/avaje/tests/batchload/TestQueryJoin.java index d87a2d8fa..dd30a94e9 100644 --- a/src/test/java/com/avaje/tests/batchload/TestQueryJoin.java +++ b/src/test/java/com/avaje/tests/batchload/TestQueryJoin.java @@ -1,10 +1,5 @@ package com.avaje.tests.batchload; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.BeanState; import com.avaje.ebean.Ebean; @@ -14,6 +9,10 @@ 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; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestQueryJoin extends BaseTestCase { @@ -28,8 +27,8 @@ public class TestQueryJoin extends BaseTestCase { custCache.clear(); Query query = Ebean.find(Order.class).select("status") - // .join("details","+query(10)") - .fetch("customer", "+lazy(10) name, status").fetch("customer.contacts").orderBy().asc("id"); + // .join("details","+query(10)") + .fetch("customer", "+lazy(10) name, status").fetch("customer.contacts").orderBy().asc("id"); // .join("customer.billingAddress"); List list = query.findList(); diff --git a/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java b/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java index b4aadb6d5..315c5d40a 100644 --- a/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java +++ b/src/test/java/com/avaje/tests/batchload/TestQueryJoinToAssocOne.java @@ -24,9 +24,9 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { // This will use 2 SQL queries to build this object graph List l0 = Ebean.find(Order.class) - .fetch("details", "orderQty, unitPrice", new FetchConfig().query()) - .fetch("details.product", "sku, name") - .findList(); + .fetch("details", "orderQty, unitPrice", new FetchConfig().query()) + .fetch("details.product", "sku, name") + .findList(); assertThat(l0).isNotEmpty(); @@ -50,10 +50,10 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { // This will use 2 SQL queries to build this object graph List l0 = Ebean.find(Order.class) - .select("status, shipDate") - .fetch("details", "orderQty, unitPrice", new FetchConfig().query()) - .fetch("details.product", "sku, name") - .findList(); + .select("status, shipDate") + .fetch("details", "orderQty, unitPrice", new FetchConfig().query()) + .fetch("details.product", "sku, name") + .findList(); assertThat(l0).isNotEmpty(); @@ -76,12 +76,12 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { // This will use 2 SQL queries to build this object graph List l0 = Ebean.find(Order.class) - .setDisableLazyLoading(true) - .select("status, shipDate") - .fetch("details", "orderQty, unitPrice", new FetchConfig().query()) - .fetch("details.product", "sku, name") - .order().asc("id") - .findList(); + .setDisableLazyLoading(true) + .select("status, shipDate") + .fetch("details", "orderQty, unitPrice", new FetchConfig().query()) + .fetch("details.product", "sku, name") + .order().asc("id") + .findList(); assertThat(l0).isNotEmpty(); @@ -116,11 +116,11 @@ public class TestQueryJoinToAssocOne extends BaseTestCase { // This will use 2 SQL queries to build this object graph List l0 = Ebean.find(Order.class) - .setDisableLazyLoading(true) - .select("status, shipDate") - .fetch("details", "orderQty, unitPrice")//, new FetchConfig().query()) - .fetch("details.product", "sku, name") - .findList(); + .setDisableLazyLoading(true) + .select("status, shipDate") + .fetch("details", "orderQty, unitPrice")//, new FetchConfig().query()) + .fetch("details.product", "sku, name") + .findList(); assertThat(l0).isNotEmpty(); diff --git a/src/test/java/com/avaje/tests/batchload/TestSecondQueryNoRows.java b/src/test/java/com/avaje/tests/batchload/TestSecondQueryNoRows.java index 1c76187e8..64a588023 100644 --- a/src/test/java/com/avaje/tests/batchload/TestSecondQueryNoRows.java +++ b/src/test/java/com/avaje/tests/batchload/TestSecondQueryNoRows.java @@ -20,10 +20,10 @@ public class TestSecondQueryNoRows extends BaseTestCase { Ebean.save(cnew); Customer c = Ebean.find(Customer.class) - .setAutoTune(false) - .setId(cnew.getId()) - .fetch("contacts", new FetchConfig().query()) - .findUnique(); + .setAutoTune(false) + .setId(cnew.getId()) + .fetch("contacts", new FetchConfig().query()) + .findUnique(); assertNotNull(c); assertEquals(0, c.getContacts().size()); diff --git a/src/test/java/com/avaje/tests/batchload/TestSecondaryQueries.java b/src/test/java/com/avaje/tests/batchload/TestSecondaryQueries.java index 9cd1d4055..0c3fb7bfc 100644 --- a/src/test/java/com/avaje/tests/batchload/TestSecondaryQueries.java +++ b/src/test/java/com/avaje/tests/batchload/TestSecondaryQueries.java @@ -1,11 +1,5 @@ package com.avaje.tests.batchload; -import java.util.List; - -import org.avaje.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.FetchConfig; @@ -14,6 +8,11 @@ import com.avaje.ebeaninternal.api.SpiQuery; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; +import org.avaje.ebeantest.LoggedSqlCollector; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -27,9 +26,9 @@ public class TestSecondaryQueries extends BaseTestCase { LoggedSqlCollector.start(); Ebean.find(Order.class) - .select("status") - .fetchQuery("customer", "name") - .findList(); + .select("status") + .fetchQuery("customer", "name") + .findList(); List sql = LoggedSqlCollector.stop(); @@ -46,11 +45,11 @@ public class TestSecondaryQueries extends BaseTestCase { LoggedSqlCollector.start(); List orders = Ebean.find(Order.class) - .select("status") - .fetchLazy("customer", "name") - .setMaxRows(10) - .setUseCache(false) - .findList(); + .select("status") + .fetchLazy("customer", "name") + .setMaxRows(10) + .setUseCache(false) + .findList(); List sql = LoggedSqlCollector.stop(); @@ -77,83 +76,83 @@ public class TestSecondaryQueries extends BaseTestCase { Order testOrder = ResetBasicData.createOrderCustAndOrder("testSecQry10"); Integer custId = testOrder.getCustomer().getId(); - Query query = Ebean.find(Customer.class) - .select("name") - .fetch("contacts", "+query") - .setId(custId); + Query query = Ebean.find(Customer.class) + .select("name") + .fetch("contacts", "+query") + .setId(custId); - SpiQuery spiQuery = (SpiQuery)query; + SpiQuery spiQuery = (SpiQuery) query; spiQuery.setLogSecondaryQuery(true); - + Customer cust = query.findUnique(); - + Assert.assertNotNull(cust); String generatedSql = query.getGeneratedSql(); Assert.assertTrue(generatedSql.contains("from o_customer t0 where t0.id = ?")); - + List> loggedSecondaryQueries = spiQuery.getLoggedSecondaryQueries(); Assert.assertEquals(1, loggedSecondaryQueries.size()); - + SpiQuery secondaryQuery = loggedSecondaryQueries.get(0); String secondarySql = secondaryQuery.getGeneratedSql(); - + Assert.assertTrue(secondarySql.contains("from contact t0 where (t0.customer_id) in (?)")); } - - + + @Test public void testManyToOneWithManyPlusOneToMany() { ResetBasicData.reset(); Query query = Ebean.find(Order.class) - .select("status") - .fetch("customer", "name, status", new FetchConfig().query()) - .fetch("customer.contacts") - .fetch("details", new FetchConfig().query()) - .where().eq("status", Order.Status.NEW) - .query(); + .select("status") + .fetch("customer", "name, status", new FetchConfig().query()) + .fetch("customer.contacts") + .fetch("details", new FetchConfig().query()) + .where().eq("status", Order.Status.NEW) + .query(); // .fetch("customer", "+query name, status") // .fetch("details", "+query(10)") - - SpiQuery spiQuery = (SpiQuery)query; + + SpiQuery spiQuery = (SpiQuery) query; spiQuery.setLogSecondaryQuery(true); - + List list = query.findList(); Assert.assertTrue(!list.isEmpty()); for (Order order : list) { order.getCustomer().getStatus(); } - - + + String generatedSql = sqlOf(spiQuery, 2); //select t0.id c0, t0.status c1, t0.kcustomer_id c2 from o_order t0 where t0.status = ? ; --bind(NEW) Assert.assertEquals("select t0.id, t0.status, t0.kcustomer_id from o_order t0 where t0.status = ? ", generatedSql); - + List> secondaryQueries = spiQuery.getLoggedSecondaryQueries(); Assert.assertEquals(2, secondaryQueries.size()); - + SpiQuery custSecondaryQuery = secondaryQueries.get(0); String custSecondarySql = custSecondaryQuery.getGeneratedSql(); - - // select t0.id c0, t0.name c1, t0.status c2, - // t1.id c3, t1.first_name c4, t1.last_name c5, t1.phone c6, t1.mobile c7, t1.email c8, t1.cretime c9, t1.updtime c10, t1.customer_id c11, t1.group_id c12 - // from o_customer t0 + + // select t0.id c0, t0.name c1, t0.status c2, + // t1.id c3, t1.first_name c4, t1.last_name c5, t1.phone c6, t1.mobile c7, t1.email c8, t1.cretime c9, t1.updtime c10, t1.customer_id c11, t1.group_id c12 + // from o_customer t0 // left join contact t1 on t1.customer_id = t0.id // where t0.id = ? order by t0.id; --bind(1) - + Assert.assertTrue(custSecondarySql.contains("from o_customer t0 ")); Assert.assertTrue(custSecondarySql.contains("left join contact t1 on t1.customer_id = t0.id ")); Assert.assertTrue(custSecondarySql.contains("where t0.id ")); - + SpiQuery orderDetailsSecondaryQuery = secondaryQueries.get(1); String ordSecondarySql = orderDetailsSecondaryQuery.getGeneratedSql(); - // select ... - // from o_order_detail t0 + // select ... + // from o_order_detail t0 // where (t0.order_id) in (?,?,?,?,?) ; --bind(1,4,1,1,1) Assert.assertTrue(ordSecondarySql.contains(" from o_order_detail t0 where t0.id > 0 and (t0.order_id) in (?")); diff --git a/src/test/java/com/avaje/tests/cache/TestCacheBasic.java b/src/test/java/com/avaje/tests/cache/TestCacheBasic.java index 54fa403bd..3995f1d24 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheBasic.java +++ b/src/test/java/com/avaje/tests/cache/TestCacheBasic.java @@ -1,14 +1,13 @@ package com.avaje.tests.cache; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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; +import org.junit.Assert; +import org.junit.Test; public class TestCacheBasic extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java b/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java index f02b97796..8272c3ab3 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java +++ b/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java @@ -1,11 +1,5 @@ package com.avaje.tests.cache; -import java.util.ArrayList; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.cache.ServerCache; @@ -16,11 +10,16 @@ import com.avaje.tests.model.basic.Country; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.OCachedBean; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; public class TestCacheCollectionIds extends BaseTestCase { ServerCacheManager cacheManager = Ebean.getServerCacheManager(); - + @Test public void test() { @@ -38,7 +37,7 @@ public class TestCacheCollectionIds extends BaseTestCase { custManyIdsCache.clear(); List list = Ebean.find(Customer.class).setAutoTune(false).setLoadBeanCache(true) - .order().asc("id").findList(); + .order().asc("id").findList(); Assert.assertTrue(list.size() > 1); // Assert.assertEquals(list.size(), @@ -104,18 +103,18 @@ public class TestCacheCollectionIds extends BaseTestCase { Ebean.save(cachedBean); - // used to just load the cache - trigger loading + // used to just load the cache - trigger loading OCachedBean dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); dummyToLoad.getCountries().size(); - + ServerCache cachedBeanCountriesCache = cacheManager.getCollectionIdsCache(OCachedBean.class, "countries"); CachedManyIds cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(cachedBean.getId()); - + // confirm the starting data and cache entry Assert.assertEquals(2, dummyToLoad.getCountries().size()); Assert.assertEquals(2, cachedManyIds.getIdList().size()); - + // act OCachedBean loadedBean = Ebean.find(OCachedBean.class, cachedBean.getId()); loadedBean.getCountries().clear(); @@ -135,7 +134,7 @@ public class TestCacheCollectionIds extends BaseTestCase { Assert.assertTrue(cachedManyIds.getIdList().contains("AU")); } - + /** * When updating a ManyToMany relations also the collection cache must be updated. * Alternate to above test where in this case the bean is dirty - loadedBean.setName("goodbye");. @@ -152,18 +151,18 @@ public class TestCacheCollectionIds extends BaseTestCase { Ebean.save(cachedBean); - // used to just load the cache - trigger loading + // used to just load the cache - trigger loading OCachedBean dummyToLoad = Ebean.find(OCachedBean.class, cachedBean.getId()); dummyToLoad.getCountries().size(); - + ServerCache cachedBeanCountriesCache = cacheManager.getCollectionIdsCache(OCachedBean.class, "countries"); CachedManyIds cachedManyIds = (CachedManyIds) cachedBeanCountriesCache.get(cachedBean.getId()); - + // confirm the starting data and cache entry Assert.assertEquals(2, dummyToLoad.getCountries().size()); Assert.assertEquals(2, cachedManyIds.getIdList().size()); - + // act - this time update the name property so the bean is dirty OCachedBean loadedBean = Ebean.find(OCachedBean.class, cachedBean.getId()); loadedBean.setName("goodbye"); @@ -216,8 +215,8 @@ public class TestCacheCollectionIds extends BaseTestCase { Assert.assertEquals("2 ids in the entry", 2, dummyEntry.getIdList().size()); Assert.assertTrue(dummyEntry.getIdList().contains("NZ")); Assert.assertTrue(dummyEntry.getIdList().contains("AU")); - - + + // act - this should invalidate our cache entry OCachedBean update = new OCachedBean(); update.setId(cachedBean.getId()); @@ -235,7 +234,7 @@ public class TestCacheCollectionIds extends BaseTestCase { Assert.assertEquals(1, cachedManyIds.getIdList().size()); Assert.assertFalse(cachedManyIds.getIdList().contains("NZ")); Assert.assertTrue(cachedManyIds.getIdList().contains("AU")); - + // assert countries good OCachedBean result = Ebean.find(OCachedBean.class, cachedBean.getId()); Assert.assertEquals(1, result.getCountries().size()); diff --git a/src/test/java/com/avaje/tests/cache/TestCacheCustomer.java b/src/test/java/com/avaje/tests/cache/TestCacheCustomer.java index 5682b8353..2746911aa 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheCustomer.java +++ b/src/test/java/com/avaje/tests/cache/TestCacheCustomer.java @@ -1,17 +1,16 @@ package com.avaje.tests.cache; -import java.util.List; - -import com.avaje.tests.model.basic.Country; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Address; import com.avaje.tests.model.basic.Contact; +import com.avaje.tests.model.basic.Country; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestCacheCustomer extends BaseTestCase { @@ -40,7 +39,7 @@ public class TestCacheCustomer extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Customer.class).setAutoTune(false).setLoadBeanCache(true) - .findList(); + .findList(); Assert.assertTrue(list.size() > 1); diff --git a/src/test/java/com/avaje/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java b/src/test/java/com/avaje/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java index 680842972..ba0c82bf8 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java +++ b/src/test/java/com/avaje/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java @@ -27,15 +27,15 @@ public class TestCacheInterceptSaveWhenLazyLoaded extends BaseTestCase { try { Order foundOrder = Ebean.find(Order.class) - .where().eq("id", order.getId()) - .findUnique(); + .where().eq("id", order.getId()) + .findUnique(); foundOrder.setStatus(Order.Status.APPROVED); assertTrue(Ebean.getBeanState(foundOrder).isDirty()); Customer foundCustomer = Ebean.find(Customer.class) - .where().eq("id", customer.getId()) - .findUnique(); + .where().eq("id", customer.getId()) + .findUnique(); // the foundOrder is in this list foundCustomer.getOrders().size(); diff --git a/src/test/java/com/avaje/tests/cache/TestCacheNaturalId.java b/src/test/java/com/avaje/tests/cache/TestCacheNaturalId.java index 21727cd2a..4fcc7a778 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheNaturalId.java +++ b/src/test/java/com/avaje/tests/cache/TestCacheNaturalId.java @@ -10,9 +10,7 @@ import org.junit.Test; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class TestCacheNaturalId extends BaseTestCase { @@ -56,7 +54,7 @@ public class TestCacheNaturalId extends BaseTestCase { awaitL2Cache(); Contact c2 = Ebean.find(Contact.class).where().eq("email", "mychangedemail@what.com") - .findUnique(); + .findUnique(); ServerCacheStatistics stats2 = contactCache.getStatistics(false); diff --git a/src/test/java/com/avaje/tests/cache/TestCacheReferenceLazyLoad.java b/src/test/java/com/avaje/tests/cache/TestCacheReferenceLazyLoad.java index 79b873689..5249a48f3 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheReferenceLazyLoad.java +++ b/src/test/java/com/avaje/tests/cache/TestCacheReferenceLazyLoad.java @@ -1,13 +1,12 @@ package com.avaje.tests.cache; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.cache.ServerCacheManager; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; public class TestCacheReferenceLazyLoad extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/cache/TestExternalNotification.java b/src/test/java/com/avaje/tests/cache/TestExternalNotification.java index 4ea3cfb47..1f3a1bea5 100644 --- a/src/test/java/com/avaje/tests/cache/TestExternalNotification.java +++ b/src/test/java/com/avaje/tests/cache/TestExternalNotification.java @@ -58,7 +58,7 @@ public class TestExternalNotification extends BaseTestCase { assertTrue("cacheSize: " + cacheSize, cacheSize > 0); SqlUpdate sqlUpdate = Ebean - .createSqlUpdate("update o_country set name = :name where code = :code"); + .createSqlUpdate("update o_country set name = :name where code = :code"); sqlUpdate.setParameter("name", "Aotearoa"); sqlUpdate.setParameter("code", "NZ"); diff --git a/src/test/java/com/avaje/tests/cache/TestL2CacheWithSharedBean.java b/src/test/java/com/avaje/tests/cache/TestL2CacheWithSharedBean.java index 9fbd01a43..b2e746ee6 100644 --- a/src/test/java/com/avaje/tests/cache/TestL2CacheWithSharedBean.java +++ b/src/test/java/com/avaje/tests/cache/TestL2CacheWithSharedBean.java @@ -1,18 +1,17 @@ package com.avaje.tests.cache; -import com.avaje.ebeaninternal.server.autotune.model.Origin; -import org.jetbrains.annotations.NotNull; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.ebean.cache.ServerCache; import com.avaje.ebeaninternal.api.SpiQuery; +import com.avaje.ebeaninternal.server.autotune.model.Origin; import com.avaje.ebeaninternal.server.autotune.service.TunedQueryInfo; import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail; import com.avaje.tests.model.basic.FeatureDescription; +import org.jetbrains.annotations.NotNull; +import org.junit.Assert; +import org.junit.Test; public class TestL2CacheWithSharedBean extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/cache/TestQueryCache.java b/src/test/java/com/avaje/tests/cache/TestQueryCache.java index 756295632..a9552e4fc 100644 --- a/src/test/java/com/avaje/tests/cache/TestQueryCache.java +++ b/src/test/java/com/avaje/tests/cache/TestQueryCache.java @@ -1,17 +1,16 @@ package com.avaje.tests.cache; -import java.util.List; - -import com.avaje.tests.model.cache.EColAB; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.bean.BeanCollection; import com.avaje.ebean.cache.ServerCache; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import com.avaje.tests.model.cache.EColAB; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -24,22 +23,22 @@ public class TestQueryCache extends BaseTestCase { new EColAB("02", "10").save(); List list1 = - Ebean.getServer(null) - .find(EColAB.class) - .setUseQueryCache(true) - .where() - .eq("columnA", "01") - .eq("columnB", "20") - .findList(); + Ebean.getServer(null) + .find(EColAB.class) + .setUseQueryCache(true) + .where() + .eq("columnA", "01") + .eq("columnB", "20") + .findList(); List list2 = - Ebean.getServer(null) - .find(EColAB.class) - .setUseQueryCache(true) - .where() - .eq("columnA", "02") - .eq("columnB", "10") - .findList(); + Ebean.getServer(null) + .find(EColAB.class) + .setUseQueryCache(true) + .where() + .eq("columnA", "02") + .eq("columnB", "10") + .findList(); assertThat(list1.get(0).getColumnA()).isEqualTo("01"); assertThat(list1.get(0).getColumnB()).isEqualTo("20"); @@ -58,7 +57,7 @@ public class TestQueryCache extends BaseTestCase { customerCache.clear(); List list = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true).where() - .ilike("name", "Rob").findList(); + .ilike("name", "Rob").findList(); BeanCollection bc = (BeanCollection) list; Assert.assertFalse(bc.isReadOnly()); @@ -67,24 +66,24 @@ public class TestQueryCache extends BaseTestCase { Assert.assertTrue(Ebean.getBeanState(list.get(0)).isReadOnly()); List list2 = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(true).where() - .ilike("name", "Rob").findList(); + .ilike("name", "Rob").findList(); List list2B = Ebean.find(Customer.class).setUseQueryCache(true) - // .setReadOnly(true) - .where().ilike("name", "Rob").findList(); + // .setReadOnly(true) + .where().ilike("name", "Rob").findList(); Assert.assertSame(list, list2); // readOnly defaults to true for query cache Assert.assertSame(list, list2B); - + // TODO: At this stage setReadOnly(false) does not // create a shallow copy of the List/Set/Map - + // List list3 = Ebean.find(Customer.class).setUseQueryCache(true).setReadOnly(false).where() // .ilike("name", "Rob").findList(); -// +// // Assert.assertNotSame(list, list3); // BeanCollection bc3 = (BeanCollection) list3; // Assert.assertFalse(bc3.isReadOnly()); diff --git a/src/test/java/com/avaje/tests/cache/TestQueryCacheCountry.java b/src/test/java/com/avaje/tests/cache/TestQueryCacheCountry.java index bf1366a86..02a1e9d54 100644 --- a/src/test/java/com/avaje/tests/cache/TestQueryCacheCountry.java +++ b/src/test/java/com/avaje/tests/cache/TestQueryCacheCountry.java @@ -1,25 +1,24 @@ package com.avaje.tests.cache; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; public class TestQueryCacheCountry extends BaseTestCase { - + @Test public void test() { - + ResetBasicData.reset(); awaitL2Cache(); @@ -31,25 +30,25 @@ public class TestQueryCacheCountry extends BaseTestCase { beanCache.clear(); assertEquals(0, queryCache.getStatistics(false).getSize()); - + List countryList0 = Ebean.find(Country.class) .setUseQueryCache(true) .order().asc("name") .findList(); - + assertEquals(1, queryCache.getStatistics(false).getSize()); assertTrue(!countryList0.isEmpty()); - + List countryList1 = Ebean.find(Country.class) - .setUseQueryCache(true) - .order().asc("name") - .findList(); - + .setUseQueryCache(true) + .order().asc("name") + .findList(); + ServerCacheStatistics statistics = queryCache.getStatistics(false); assertEquals(1, statistics.getSize()); assertEquals(1, statistics.getHitCount()); Assert.assertSame(countryList1, countryList0); - + Country nz = Ebean.find(Country.class, "NZ"); nz.setName("New Zealandia"); Ebean.save(nz); @@ -57,12 +56,12 @@ public class TestQueryCacheCountry extends BaseTestCase { statistics = queryCache.getStatistics(false); assertEquals(0, statistics.getSize()); - + List countryList2 = Ebean.find(Country.class) - .setUseQueryCache(true) - .order().asc("name") - .findList(); - + .setUseQueryCache(true) + .order().asc("name") + .findList(); + Assert.assertNotSame(countryList2, countryList0); } diff --git a/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java b/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java index 7b58eb9ca..a172b09a1 100644 --- a/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java +++ b/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java @@ -1,34 +1,33 @@ package com.avaje.tests.cascade; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.TSDetail; import com.avaje.tests.model.basic.TSMaster; +import org.junit.Assert; +import org.junit.Test; public class TestPrivateOwnedAddRemoveOrphan extends BaseTestCase { - - @Test - public void test(){ - - // setup - TSMaster master0 = new TSMaster(); - Ebean.save(master0); - - // act - TSMaster master1 = Ebean.find(master0.getClass(), master0.getId()); - - TSDetail tsDetail = new TSDetail(); - // Add then remove a bean that was never saved (to the DB) - master1.getDetails().add(tsDetail); - master1.getDetails().remove(tsDetail); - Ebean.save(master1); - - TSMaster master2 = Ebean.find(master1.getClass(), master1.getId()); - - Assert.assertTrue(master2.getDetails().isEmpty()); - } + @Test + public void test() { + + // setup + TSMaster master0 = new TSMaster(); + Ebean.save(master0); + + // act + TSMaster master1 = Ebean.find(master0.getClass(), master0.getId()); + + TSDetail tsDetail = new TSDetail(); + // Add then remove a bean that was never saved (to the DB) + master1.getDetails().add(tsDetail); + master1.getDetails().remove(tsDetail); + + Ebean.save(master1); + + TSMaster master2 = Ebean.find(master1.getClass(), master1.getId()); + + Assert.assertTrue(master2.getDetails().isEmpty()); + } } diff --git a/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java b/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java index c61047da5..c30823498 100644 --- a/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java +++ b/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java @@ -1,47 +1,46 @@ package com.avaje.tests.cascade; -import javax.persistence.OptimisticLockException; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.TSDetail; import com.avaje.tests.model.basic.TSMaster; +import org.junit.Assert; +import org.junit.Test; + +import javax.persistence.OptimisticLockException; public class TestPrivateOwnedIgnoreTransientOrphan extends BaseTestCase { - - @Test - public void test(){ - - /** new object **/ - TSMaster master0 = new TSMaster(); - - /** recovered after first save **/ - TSMaster master1 = null; - - /** recovered after transient child ignored **/ - TSMaster master2 = null; - - Ebean.save(master0); - - master1 = Ebean.find(master0.getClass(), master0.getId()); - - // Add then remove a bean that was never saved (to the DB) - master1.getDetails().add(new TSDetail()); - master1.getDetails().clear(); - try{ - Ebean.save(master1); - } catch (OptimisticLockException exception) { - // Occured when the "unsaved" bean was wrongly being deleted - Assert.fail("Optimistic lock exception wrongly thrown: " + exception.getMessage()); - return; - } - - master2 = master1 = Ebean.find(master1.getClass(), master1.getId()); - - Assert.assertTrue(master2.getDetails().isEmpty()); - } + @Test + public void test() { + + /** new object **/ + TSMaster master0 = new TSMaster(); + + /** recovered after first save **/ + TSMaster master1 = null; + + /** recovered after transient child ignored **/ + TSMaster master2 = null; + + Ebean.save(master0); + + master1 = Ebean.find(master0.getClass(), master0.getId()); + + // Add then remove a bean that was never saved (to the DB) + master1.getDetails().add(new TSDetail()); + master1.getDetails().clear(); + + try { + Ebean.save(master1); + } catch (OptimisticLockException exception) { + // Occured when the "unsaved" bean was wrongly being deleted + Assert.fail("Optimistic lock exception wrongly thrown: " + exception.getMessage()); + return; + } + + master2 = master1 = Ebean.find(master1.getClass(), master1.getId()); + + Assert.assertTrue(master2.getDetails().isEmpty()); + } } diff --git a/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedNoCascadeRemove.java b/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedNoCascadeRemove.java index f69f9ccac..e34df8bb7 100644 --- a/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedNoCascadeRemove.java +++ b/src/test/java/com/avaje/tests/cascade/TestPrivateOwnedNoCascadeRemove.java @@ -1,16 +1,15 @@ package com.avaje.tests.cascade; -import java.util.List; -import java.util.Set; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.bean.BeanCollection; import com.avaje.tests.model.basic.TSDetailTwo; import com.avaje.tests.model.basic.TSMasterTwo; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; +import java.util.Set; public class TestPrivateOwnedNoCascadeRemove extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/compositekeys/TestCKeyDelete.java b/src/test/java/com/avaje/tests/compositekeys/TestCKeyDelete.java index f932229a5..bbba58725 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestCKeyDelete.java +++ b/src/test/java/com/avaje/tests/compositekeys/TestCKeyDelete.java @@ -1,12 +1,11 @@ package com.avaje.tests.compositekeys; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.CKeyParent; import com.avaje.tests.model.basic.CKeyParentId; +import org.junit.Assert; +import org.junit.Test; public class TestCKeyDelete extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java b/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java index 818f9372c..94302bb6d 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java +++ b/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java @@ -1,19 +1,18 @@ package com.avaje.tests.compositekeys; -import java.util.ArrayList; -import java.util.List; - -import com.avaje.ebean.PagedList; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; +import com.avaje.ebean.PagedList; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.CKeyAssoc; import com.avaje.tests.model.basic.CKeyDetail; import com.avaje.tests.model.basic.CKeyParent; import com.avaje.tests.model.basic.CKeyParentId; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; public class TestCKeyLazyLoad extends BaseTestCase { @@ -59,7 +58,7 @@ public class TestCKeyLazyLoad extends BaseTestCase { CKeyParent found = Ebean.find(CKeyParent.class).where().idEq(searchId).findUnique(); Assert.assertNotNull(found); - Assert.assertEquals(2,found.getDetails().size()); + Assert.assertEquals(2, found.getDetails().size()); List list = Ebean.find(CKeyParent.class).findList(); @@ -89,9 +88,9 @@ public class TestCKeyLazyLoad extends BaseTestCase { private void exerciseMaxRowsQuery_with_embeddedId() { PagedList siteUserPage = Ebean.find(CKeyParent.class).where() - .orderBy("name asc") - .setMaxRows(10) - .findPagedList(); + .orderBy("name asc") + .setMaxRows(10) + .findPagedList(); siteUserPage.getList(); } } diff --git a/src/test/java/com/avaje/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java b/src/test/java/com/avaje/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java index af4036962..e4795aab2 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java +++ b/src/test/java/com/avaje/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java @@ -1,11 +1,10 @@ package com.avaje.tests.compositekeys; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.compositekeys.db.CaoBean; import com.avaje.tests.compositekeys.db.CaoKey; +import org.junit.Test; public class TestCaoCompositeKeyWithAnnotationOverrides extends BaseTestCase { @@ -17,12 +16,12 @@ public class TestCaoCompositeKeyWithAnnotationOverrides extends BaseTestCase { CaoKey key = new CaoKey(); key.setCustomer(123); key.setType(1); - + CaoBean bean = new CaoBean(); bean.setKey(key); bean.setDescription("some desc"); Ebean.save(bean); } - + } diff --git a/src/test/java/com/avaje/tests/compositekeys/TestCore.java b/src/test/java/com/avaje/tests/compositekeys/TestCore.java index 6b3bab57d..5c4e7f302 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestCore.java +++ b/src/test/java/com/avaje/tests/compositekeys/TestCore.java @@ -3,7 +3,14 @@ package com.avaje.tests.compositekeys; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.ebean.Transaction; -import com.avaje.tests.compositekeys.db.*; +import com.avaje.tests.compositekeys.db.Item; +import com.avaje.tests.compositekeys.db.ItemKey; +import com.avaje.tests.compositekeys.db.Region; +import com.avaje.tests.compositekeys.db.RegionKey; +import com.avaje.tests.compositekeys.db.SubType; +import com.avaje.tests.compositekeys.db.SubTypeKey; +import com.avaje.tests.compositekeys.db.Type; +import com.avaje.tests.compositekeys.db.TypeKey; import com.avaje.tests.lib.EbeanTestCase; import java.util.List; @@ -158,4 +165,4 @@ public class TestCore extends EbeanTestCase { assertNotNull(items); assertEquals(2, items.size()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/src/test/java/com/avaje/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java index c425d7f9e..eeefced8d 100644 --- a/src/test/java/com/avaje/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/src/test/java/com/avaje/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -8,7 +8,15 @@ import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; import org.junit.Before; import org.junit.Test; -import javax.persistence.*; +import javax.persistence.CascadeType; +import javax.persistence.Embeddable; +import javax.persistence.EmbeddedId; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -22,8 +30,8 @@ import static org.junit.Assert.assertEquals; public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { - - @Before public void before() { + @Before + public void before() { if (isMsSqlServer()) return; @@ -38,7 +46,8 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { /** * work fine when delete User one by one */ - @Test public void testDeleteById() { + @Test + public void testDeleteById() { if (isMsSqlServer()) return; @@ -52,7 +61,8 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { * Wrong SQL is generated when deleting user by list of ID * SQL generated: delete from user_role where (user_id) in ((?,?),(?,?)) */ - @Test public void testDeleteByIdList() { + @Test + public void testDeleteByIdList() { if (isMsSqlServer()) return; @@ -64,20 +74,20 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { Ebean.deleteAll(User.class, ids); // PersistenceException would be thrown here assertEquals(0, Ebean.find(User.class).findList().size()); } - + @Test public void testFindByParentIdList() { if (isMsSqlServer()) return; assertEquals(2, Ebean.find(User.class).findList().size()); - - SpiEbeanServer spiServer = (SpiEbeanServer)Ebean.getServer(null); - - BeanDescriptor beanDescriptor = - spiServer.getBeanDescriptor(TestOnCascadeDeleteChildrenWithCompositeKeys.User.class); - - BeanPropertyAssocMany beanProperty = (BeanPropertyAssocMany)beanDescriptor.getBeanProperty("userRoles"); + + SpiEbeanServer spiServer = (SpiEbeanServer) Ebean.getServer(null); + + BeanDescriptor beanDescriptor = + spiServer.getBeanDescriptor(TestOnCascadeDeleteChildrenWithCompositeKeys.User.class); + + BeanPropertyAssocMany beanProperty = (BeanPropertyAssocMany) beanDescriptor.getBeanProperty("userRoles"); List ids = new ArrayList<>(); ids.add(1L); @@ -87,18 +97,22 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { beanProperty.findIdsByParentId(1L, null, null, null); } - @Entity @Table(name = "em_user") public static class User { + @Entity + @Table(name = "em_user") + public static class User { private Long id; private String name; private Set userRoles; - public User() {} + public User() { + } public User(Long id) { this.id = id; } - @Id public Long getId() { + @Id + public Long getId() { return id; } @@ -114,7 +128,8 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { this.name = name; } - @OneToMany(cascade = CascadeType.REMOVE) public Set getUserRoles() { + @OneToMany(cascade = CascadeType.REMOVE) + public Set getUserRoles() { return userRoles; } @@ -123,13 +138,16 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { } } - @Entity @Table(name = "em_user_role") public static class UserRole implements Serializable { + @Entity + @Table(name = "em_user_role") + public static class UserRole implements Serializable { private static final long serialVersionUID = 1L; private UserRolePK pk; private User user; private Role role; - @EmbeddedId public UserRolePK getPk() { + @EmbeddedId + public UserRolePK getPk() { return pk; } @@ -137,7 +155,9 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { this.pk = pk; } - @ManyToOne @JoinColumn(name = "user_id", nullable = false, insertable = false, updatable = false) public User getUser() { + @ManyToOne + @JoinColumn(name = "user_id", nullable = false, insertable = false, updatable = false) + public User getUser() { return user; } @@ -145,7 +165,9 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { this.user = user; } - @ManyToOne @JoinColumn(name = "role_id", nullable = false, insertable = false, updatable = false) public Role getRole() { + @ManyToOne + @JoinColumn(name = "role_id", nullable = false, insertable = false, updatable = false) + public Role getRole() { return role; } @@ -153,16 +175,19 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { this.role = role; } - @Embeddable public static class UserRolePK implements Serializable { + @Embeddable + public static class UserRolePK implements Serializable { private static final long serialVersionUID = 1L; private Long userId; private Long roleId; - @Override public int hashCode() { + @Override + public int hashCode() { return userId == null || roleId == null ? 0 : (int) (userId + roleId); } - @Override public boolean equals(Object other) { + @Override + public boolean equals(Object other) { if (userId == null || roleId == null) return false; if (other instanceof UserRolePK) { UserRolePK otherPk = (UserRolePK) other; @@ -189,12 +214,15 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { } } - @Entity @Table(name = "em_role") public static class Role { + @Entity + @Table(name = "em_role") + public static class Role { private Long id; private String name; private Set userRoles; - @Id public Long getId() { + @Id + public Long getId() { return id; } @@ -210,7 +238,8 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { this.name = name; } - @OneToMany(cascade = CascadeType.REMOVE) public Set getUserRoles() { + @OneToMany(cascade = CascadeType.REMOVE) + public Set getUserRoles() { return userRoles; } @@ -218,4 +247,4 @@ public class TestOnCascadeDeleteChildrenWithCompositeKeys extends BaseTestCase { this.userRoles = userRoles; } } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/compositekeys/db/AuditInfo.java b/src/test/java/com/avaje/tests/compositekeys/db/AuditInfo.java index b07a40b1f..1986bb26c 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/AuditInfo.java +++ b/src/test/java/com/avaje/tests/compositekeys/db/AuditInfo.java @@ -1,60 +1,49 @@ package com.avaje.tests.compositekeys.db; +import javax.persistence.Embeddable; 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 class AuditInfo { + private Date lastUpdated; + private Date created; + private String updatedBy; + private String createdBy; - public AuditInfo() - { - created = new Date(); - createdBy = "dummy"; - } + public AuditInfo() { + created = new Date(); + createdBy = "dummy"; + } - public Date getLastUpdated() - { - return lastUpdated; - } + public Date getLastUpdated() { + return lastUpdated; + } - public void setLastUpdated(Date lastUpdated) - { - this.lastUpdated = lastUpdated; - } + public void setLastUpdated(Date lastUpdated) { + this.lastUpdated = lastUpdated; + } - public Date getCreated() - { - return created; - } + public Date getCreated() { + return created; + } - public void setCreated(Date created) - { - this.created = created; - } + public void setCreated(Date created) { + this.created = created; + } - public String getUpdatedBy() - { - return updatedBy; - } + public String getUpdatedBy() { + return updatedBy; + } - public void setUpdatedBy(String updatedBy) - { - this.updatedBy = updatedBy; - } + public void setUpdatedBy(String updatedBy) { + this.updatedBy = updatedBy; + } - public String getCreatedBy() - { - return createdBy; - } + public String getCreatedBy() { + return createdBy; + } - public void setCreatedBy(String createdBy) - { - this.createdBy = createdBy; - } + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } } diff --git a/src/test/java/com/avaje/tests/compositekeys/db/CaoBean.java b/src/test/java/com/avaje/tests/compositekeys/db/CaoBean.java index 647640d93..2d46b86a4 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/CaoBean.java +++ b/src/test/java/com/avaje/tests/compositekeys/db/CaoBean.java @@ -11,9 +11,9 @@ import javax.persistence.Version; public class CaoBean { @Id - @AttributeOverrides({ - @AttributeOverride(name = "customer", column = @Column(name = "x_cust_id")) , - @AttributeOverride(name = "type", column = @Column(name = "x_type_id")) + @AttributeOverrides({ + @AttributeOverride(name = "customer", column = @Column(name = "x_cust_id")), + @AttributeOverride(name = "type", column = @Column(name = "x_type_id")) }) private CaoKey key; @@ -46,4 +46,4 @@ public class CaoBean { this.version = version; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/compositekeys/db/CaoKey.java b/src/test/java/com/avaje/tests/compositekeys/db/CaoKey.java index 2bb97b72e..6a32dadc9 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/CaoKey.java +++ b/src/test/java/com/avaje/tests/compositekeys/db/CaoKey.java @@ -3,42 +3,41 @@ package com.avaje.tests.compositekeys.db; import javax.persistence.Embeddable; @Embeddable -public class CaoKey -{ - private int customer; +public class CaoKey { + private int customer; - private int type; + private int type; - public int getCustomer() { - return customer; - } + public int getCustomer() { + return customer; + } - public void setCustomer(int customer) { - this.customer = customer; - } + public void setCustomer(int customer) { + this.customer = customer; + } - public int getType() { - return type; - } + public int getType() { + return type; + } - public void setType(int type) { - this.type = type; + public void setType(int type) { + this.type = type; + } + + public int hashCode() { + int hc = 31 * 7 + customer; + hc = 31 * hc + type; + return hc; + } + + public boolean equals(Object o) { + if (this == o) { + return true; } - - public int hashCode() { - int hc = 31 * 7 + customer; - hc = 31 * hc + type; - return hc; + if (o instanceof CaoKey) { + CaoKey k = (CaoKey) o; + return k.customer == customer && k.type == type; } - - public boolean equals(Object o){ - if (this == o){ - return true; - } - if (o instanceof CaoKey){ - CaoKey k = (CaoKey)o; - return k.customer == customer && k.type == type; - } - return false; - } -} \ No newline at end of file + return false; + } +} diff --git a/src/test/java/com/avaje/tests/compositekeys/db/Item.java b/src/test/java/com/avaje/tests/compositekeys/db/Item.java index 64537cf8d..972485d0d 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/Item.java +++ b/src/test/java/com/avaje/tests/compositekeys/db/Item.java @@ -12,116 +12,109 @@ import javax.persistence.ManyToOne; import javax.persistence.Version; @Entity -public class Item -{ - @Id - private ItemKey key; +public class Item { + @Id + private ItemKey key; - private String description; + private String description; - private String units; + private String units; - private int type; + private int type; - private int region; + 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(); + @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; + @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 = "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; + @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 ItemKey getKey() { + return key; + } - public void setKey(ItemKey key) { - this.key = key; - } + public void setKey(ItemKey key) { + this.key = key; + } - public String getUnits() - { - return units; - } + public String getUnits() { + return units; + } - public void setUnits(String units) - { - this.units = units; - } + public void setUnits(String units) { + this.units = units; + } - public String getDescription() { - return description; - } + public String getDescription() { + return description; + } - public void setDescription(String description) { - this.description = description; - } + public void setDescription(String description) { + this.description = description; + } - public int getType() { - return type; - } + public int getType() { + return type; + } - public void setType(int type) { - this.type = type; - } + public void setType(int type) { + this.type = type; + } - public int getRegion() { - return region; - } + public int getRegion() { + return region; + } - public void setRegion(int region) { - this.region = region; - } + public void setRegion(int region) { + this.region = region; + } - public Long getVersion() { - return version; - } + public Long getVersion() { + return version; + } - public Type getEType() { - return eType; - } + public Type getEType() { + return eType; + } - public Region getERegion() { - return eRegion; - } + public Region getERegion() { + return eRegion; + } - public void setVersion(Long version) - { - this.version = version; - } + public void setVersion(Long version) { + this.version = version; + } - public void setEType(Type eType) - { - this.eType = eType; - } + public void setEType(Type eType) { + this.eType = eType; + } - public void setERegion(Region eRegion) - { - this.eRegion = eRegion; - } + public void setERegion(Region eRegion) { + this.eRegion = eRegion; + } - public AuditInfo getAuditInfo() - { - return auditInfo; - } + public AuditInfo getAuditInfo() { + return auditInfo; + } } diff --git a/src/test/java/com/avaje/tests/compositekeys/db/ItemKey.java b/src/test/java/com/avaje/tests/compositekeys/db/ItemKey.java index 34cf782d2..01a4cb07d 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/ItemKey.java +++ b/src/test/java/com/avaje/tests/compositekeys/db/ItemKey.java @@ -4,60 +4,53 @@ import javax.persistence.Column; import javax.persistence.Embeddable; @Embeddable -public class ItemKey -{ - private int customer; +public class ItemKey { + private int customer; - @Column(name = "itemNumber") - private String itemNumber; + @Column(name = "itemNumber") + private String itemNumber; - public int getCustomer() { - return customer; + 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; } - public void setCustomer(int customer) { - this.customer = customer; + ItemKey itemKey = (ItemKey) o; + + if (customer != itemKey.customer) { + return false; + } + if (!itemNumber.equals(itemKey.itemNumber)) { + return false; } - public String getItemNumber() { - return itemNumber; - } + return true; + } - 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; - } + @Override + public int hashCode() { + int result = customer; + result = 31 * result + itemNumber.hashCode(); + return result; + } } diff --git a/src/test/java/com/avaje/tests/compositekeys/db/Parcel.java b/src/test/java/com/avaje/tests/compositekeys/db/Parcel.java index d1688ac38..6d6a0e655 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/Parcel.java +++ b/src/test/java/com/avaje/tests/compositekeys/db/Parcel.java @@ -5,31 +5,26 @@ import javax.persistence.Entity; import javax.persistence.Id; @Entity -public class Parcel -{ - @Id - @Column(name="parcelId") - private Long parcelId; +public class Parcel { + @Id + @Column(name = "parcelId") + private Long parcelId; - private String description; + private String description; - public Long getParcelId() - { - return parcelId; - } + public Long getParcelId() { + return parcelId; + } - public void setParcelId(Long parcelId) - { - this.parcelId = parcelId; - } + public void setParcelId(Long parcelId) { + this.parcelId = parcelId; + } - public String getDescription() - { - return description; - } + public String getDescription() { + return description; + } - public void setDescription(String description) - { - this.description = description; - } -} \ No newline at end of file + public void setDescription(String description) { + this.description = description; + } +} diff --git a/src/test/java/com/avaje/tests/compositekeys/db/ParcelLocation.java b/src/test/java/com/avaje/tests/compositekeys/db/ParcelLocation.java index d0045eb9f..7671e1157 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/ParcelLocation.java +++ b/src/test/java/com/avaje/tests/compositekeys/db/ParcelLocation.java @@ -7,46 +7,39 @@ import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @Entity -public class ParcelLocation -{ - @Id - @Column(name="parcelLocId") - private Long parcelLocId; +public class ParcelLocation { + @Id + @Column(name = "parcelLocId") + private Long parcelLocId; - private String location; + private String location; - @OneToOne - @JoinColumn(name="parcelId", referencedColumnName = "parcelId") - private Parcel parcel; + @OneToOne + @JoinColumn(name = "parcelId", referencedColumnName = "parcelId") + private Parcel parcel; - public Long getParcelLocId() - { - return parcelLocId; - } + public Long getParcelLocId() { + return parcelLocId; + } - public void setParcelLocId(Long parcelLocId) - { - this.parcelLocId = parcelLocId; - } + public void setParcelLocId(Long parcelLocId) { + this.parcelLocId = parcelLocId; + } - public String getLocation() - { - return location; - } + public String getLocation() { + return location; + } - public void setLocation(String location) - { - this.location = location; - } + public void setLocation(String location) { + this.location = location; + } - public Parcel getParcel() - { - return parcel; - } + public Parcel getParcel() { + return parcel; + } - public void setParcel(Parcel parcel) - { - this.parcel = parcel; - } + public void setParcel(Parcel parcel) { + this.parcel = parcel; + } } diff --git a/src/test/java/com/avaje/tests/compositekeys/db/Region.java b/src/test/java/com/avaje/tests/compositekeys/db/Region.java index 2b39aa47e..6d65c9005 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/Region.java +++ b/src/test/java/com/avaje/tests/compositekeys/db/Region.java @@ -1,57 +1,55 @@ 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; +import java.util.List; @Entity -public class Region -{ - @Id - private RegionKey key; +public class Region { + @Id + private RegionKey key; - private String description; + private String description; - @Version - private Long version; + @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 items; - - public RegionKey getKey() { - return key; - } + @OneToMany + @JoinColumns({ + @JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false), + @JoinColumn(name = "region", referencedColumnName = "type", insertable = false, updatable = false) + }) + private List items; - public void setKey(RegionKey key) { - this.key = key; - } + public RegionKey getKey() { + return key; + } - public String getDescription() { - return description; - } + public void setKey(RegionKey key) { + this.key = key; + } - public void setDescription(String description) { - this.description = description; - } + public String getDescription() { + return description; + } - public Long getVersion() { - return version; - } + public void setDescription(String description) { + this.description = description; + } - public void setVersion(Long version) { - this.version = version; - } + public Long getVersion() { + return version; + } - public List getItems() { - return items; - } -} \ No newline at end of file + public void setVersion(Long version) { + this.version = version; + } + + public List getItems() { + return items; + } +} diff --git a/src/test/java/com/avaje/tests/compositekeys/db/RegionKey.java b/src/test/java/com/avaje/tests/compositekeys/db/RegionKey.java index 1b7f4c795..263ebc044 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/RegionKey.java +++ b/src/test/java/com/avaje/tests/compositekeys/db/RegionKey.java @@ -3,42 +3,41 @@ package com.avaje.tests.compositekeys.db; import javax.persistence.Embeddable; @Embeddable -public class RegionKey -{ - private int customer; +public class RegionKey { + private int customer; - private int type; + private int type; - public int getCustomer() { - return customer; - } + public int getCustomer() { + return customer; + } - public void setCustomer(int customer) { - this.customer = customer; - } + public void setCustomer(int customer) { + this.customer = customer; + } - public int getType() { - return type; - } + public int getType() { + return type; + } - public void setType(int type) { - this.type = type; + public void setType(int type) { + this.type = type; + } + + public int hashCode() { + int hc = 31 * 7 + customer; + hc = 31 * hc + type; + return hc; + } + + public boolean equals(Object o) { + if (this == o) { + return true; } - - public int hashCode() { - int hc = 31 * 7 + customer; - hc = 31 * hc + type; - return hc; + if (o instanceof RegionKey) { + RegionKey k = (RegionKey) o; + return k.customer == customer && k.type == type; } - - public boolean equals(Object o){ - if (this == o){ - return true; - } - if (o instanceof RegionKey){ - RegionKey k = (RegionKey)o; - return k.customer == customer && k.type == type; - } - return false; - } -} \ No newline at end of file + return false; + } +} diff --git a/src/test/java/com/avaje/tests/compositekeys/db/SubType.java b/src/test/java/com/avaje/tests/compositekeys/db/SubType.java index 6a4adf26b..73fa69912 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/SubType.java +++ b/src/test/java/com/avaje/tests/compositekeys/db/SubType.java @@ -5,37 +5,36 @@ import javax.persistence.Entity; import javax.persistence.Version; @Entity -public class SubType -{ - @EmbeddedId - private SubTypeKey key; +public class SubType { + @EmbeddedId + private SubTypeKey key; - private String description; + private String description; - @Version - private Long version; + @Version + private Long version; - public SubTypeKey getKey() { - return key; - } + public SubTypeKey getKey() { + return key; + } - public void setKey(SubTypeKey key) { - this.key = key; - } + public void setKey(SubTypeKey key) { + this.key = key; + } - public String getDescription() { - return description; - } + public String getDescription() { + return description; + } - public void setDescription(String description) { - this.description = description; - } + public void setDescription(String description) { + this.description = description; + } - public Long getVersion() { - return version; - } + public Long getVersion() { + return version; + } - public void setVersion(Long version) { - this.version = version; - } -} \ No newline at end of file + public void setVersion(Long version) { + this.version = version; + } +} diff --git a/src/test/java/com/avaje/tests/compositekeys/db/SubTypeKey.java b/src/test/java/com/avaje/tests/compositekeys/db/SubTypeKey.java index 4ebc5ca27..a732ca06f 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/SubTypeKey.java +++ b/src/test/java/com/avaje/tests/compositekeys/db/SubTypeKey.java @@ -3,32 +3,29 @@ package com.avaje.tests.compositekeys.db; import javax.persistence.Embeddable; @Embeddable -public class SubTypeKey -{ - private int subTypeId; +public class SubTypeKey { + private int subTypeId; - public int getSubTypeId() - { - return subTypeId; - } + public int getSubTypeId() { + return subTypeId; + } - public void setSubTypeId(int subTypeId) - { - this.subTypeId = subTypeId; - } - - public int hashCode() { - return 31 * 7 + subTypeId; - } - - public boolean equals(Object o){ - if (this == o){ - return true; - } - if (!(o instanceof SubTypeKey)) { - return false; - } - return subTypeId == ((SubTypeKey)o).subTypeId; - } - -} \ No newline at end of file + public void setSubTypeId(int subTypeId) { + this.subTypeId = subTypeId; + } + + public int hashCode() { + return 31 * 7 + subTypeId; + } + + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (!(o instanceof SubTypeKey)) { + return false; + } + return subTypeId == ((SubTypeKey) o).subTypeId; + } + +} diff --git a/src/test/java/com/avaje/tests/compositekeys/db/Type.java b/src/test/java/com/avaje/tests/compositekeys/db/Type.java index 135259bc5..8d818ce16 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/Type.java +++ b/src/test/java/com/avaje/tests/compositekeys/db/Type.java @@ -1,7 +1,5 @@ package com.avaje.tests.compositekeys.db; -import java.util.List; - import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.JoinColumn; @@ -9,61 +7,61 @@ import javax.persistence.JoinColumns; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Version; +import java.util.List; @Entity -public class Type -{ - @Id - private TypeKey key; +public class Type { + @Id + private TypeKey key; - private String description; + private String description; - @Version - private Long version; + @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 items; + @OneToMany + @JoinColumns({ + @JoinColumn(name = "customer", referencedColumnName = "customer", insertable = false, updatable = false), + @JoinColumn(name = "type", referencedColumnName = "type", insertable = false, updatable = false) + }) + private List items; - @ManyToOne - private SubType subType; + @ManyToOne + private SubType subType; - public TypeKey getKey() { - return key; - } + public TypeKey getKey() { + return key; + } - public void setKey(TypeKey key) { - this.key = key; - } + public void setKey(TypeKey key) { + this.key = key; + } - public String getDescription() { - return description; - } + public String getDescription() { + return description; + } - public void setDescription(String description) { - this.description = description; - } + public void setDescription(String description) { + this.description = description; + } - public Long getVersion() { - return version; - } + public Long getVersion() { + return version; + } - public void setVersion(Long version) { - this.version = version; - } + public void setVersion(Long version) { + this.version = version; + } - public List getItems() { - return items; - } + public List getItems() { + return items; + } - public SubType getSubType() { - return subType; - } + public SubType getSubType() { + return subType; + } - public void setSubType(SubType subType) { - this.subType = subType; - } -} \ No newline at end of file + public void setSubType(SubType subType) { + this.subType = subType; + } +} diff --git a/src/test/java/com/avaje/tests/compositekeys/db/TypeKey.java b/src/test/java/com/avaje/tests/compositekeys/db/TypeKey.java index 06ce60478..9963b5196 100644 --- a/src/test/java/com/avaje/tests/compositekeys/db/TypeKey.java +++ b/src/test/java/com/avaje/tests/compositekeys/db/TypeKey.java @@ -3,42 +3,41 @@ package com.avaje.tests.compositekeys.db; import javax.persistence.Embeddable; @Embeddable -public class TypeKey -{ - private int customer; +public class TypeKey { + private int customer; - private int type; + private int type; - public int getCustomer() { - return customer; - } + public int getCustomer() { + return customer; + } - public void setCustomer(int customer) { - this.customer = customer; - } + public void setCustomer(int customer) { + this.customer = customer; + } - public int getType() { - return type; - } + public int getType() { + return type; + } - public void setType(int type) { - this.type = type; + public void setType(int type) { + this.type = type; + } + + public int hashCode() { + int hc = 31 + customer; + hc = hc * 31 + type; + return hc; + } + + public boolean equals(Object o) { + if (this == o) { + return true; } - - public int hashCode() { - int hc = 31+customer; - hc = hc * 31 + type; - return hc; + if (o instanceof TypeKey) { + TypeKey k = (TypeKey) o; + return k.customer == customer && k.type == type; } - - public boolean equals(Object o){ - if (this == o){ - return true; - } - if (o instanceof TypeKey){ - TypeKey k = (TypeKey)o; - return k.customer == customer && k.type == type; - } - return false; - } -} \ No newline at end of file + return false; + } +} diff --git a/src/test/java/com/avaje/tests/config/TestTableName.java b/src/test/java/com/avaje/tests/config/TestTableName.java index a1ba89548..196691fd8 100644 --- a/src/test/java/com/avaje/tests/config/TestTableName.java +++ b/src/test/java/com/avaje/tests/config/TestTableName.java @@ -1,31 +1,30 @@ package com.avaje.tests.config; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.config.TableName; +import org.junit.Assert; +import org.junit.Test; public class TestTableName extends BaseTestCase { @Test - public void test() { - - TableName t = new TableName("a"); - Assert.assertEquals("a", t.getName()); - Assert.assertNull(t.getCatalog()); - Assert.assertNull(t.getSchema()); + public void test() { - t = new TableName("b.a"); - Assert.assertEquals("a", t.getName()); - Assert.assertEquals("b", t.getSchema()); - Assert.assertNull(t.getCatalog()); + TableName t = new TableName("a"); + Assert.assertEquals("a", t.getName()); + Assert.assertNull(t.getCatalog()); + Assert.assertNull(t.getSchema()); + + t = new TableName("b.a"); + Assert.assertEquals("a", t.getName()); + Assert.assertEquals("b", t.getSchema()); + Assert.assertNull(t.getCatalog()); + + t = new TableName("c.b.a"); + Assert.assertEquals("a", t.getName()); + Assert.assertEquals("b", t.getSchema()); + Assert.assertEquals("c", t.getCatalog()); - t = new TableName("c.b.a"); - Assert.assertEquals("a", t.getName()); - Assert.assertEquals("b", t.getSchema()); - Assert.assertEquals("c", t.getCatalog()); - // try { // TableName t2 = new TableName("d.c.b.a"); // Assert.assertNotNull(t2); @@ -33,16 +32,16 @@ public class TestTableName extends BaseTestCase { // } catch (RuntimeException e){ // Assert.assertTrue(true); // } - - + + // TableName lhs = new TableName("test.oe_order"); // TableName rhs = new TableName("test.oe_cust"); -// +// // UnderscoreNamingConvention nc = new UnderscoreNamingConvention(); // TableName intTab = nc.getM2MJoinTableName(lhs, rhs); -// +// // Assert.assertNull(intTab.getCatalog()); // Assert.assertEquals("test", intTab.getSchema()); // Assert.assertEquals("oe_order_cust", intTab.getName()); - } + } } diff --git a/src/test/java/com/avaje/tests/contructor/TestProtectedConstructor.java b/src/test/java/com/avaje/tests/contructor/TestProtectedConstructor.java index 4983a7140..668ab67a5 100644 --- a/src/test/java/com/avaje/tests/contructor/TestProtectedConstructor.java +++ b/src/test/java/com/avaje/tests/contructor/TestProtectedConstructor.java @@ -1,38 +1,37 @@ package com.avaje.tests.contructor; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.BeanState; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.ebean.bean.EntityBean; import com.avaje.tests.model.basic.MProtectedConstructBean; +import org.junit.Assert; +import org.junit.Test; public class TestProtectedConstructor extends BaseTestCase { @Test public void test() { - + EbeanServer server = Ebean.getServer(null); - + // check that we can construc a bean with a protected constructor MProtectedConstructBean bean = server.createEntityBean(MProtectedConstructBean.class); Assert.assertNotNull(bean); // Note1 that the enhancement ClassAdapterEntity line 239 makes a default constructor publically accessible // Note2 the ClassAdpater will call DefaultConstructor.add() to add a default constructor if it doesn't exist - - - EntityBean entityBean = (EntityBean)bean; + + + EntityBean entityBean = (EntityBean) bean; Object newBeanInstance = entityBean._ebean_newInstance(); - + Assert.assertNotNull(newBeanInstance); BeanState beanState = Ebean.getBeanState(newBeanInstance); Assert.assertTrue(beanState.isNew()); Assert.assertNotSame(entityBean, newBeanInstance); - + } - + } diff --git a/src/test/java/com/avaje/tests/ddd/iud/TestDExhEntityEl.java b/src/test/java/com/avaje/tests/ddd/iud/TestDExhEntityEl.java index a2ca49cfd..5510a7e44 100644 --- a/src/test/java/com/avaje/tests/ddd/iud/TestDExhEntityEl.java +++ b/src/test/java/com/avaje/tests/ddd/iud/TestDExhEntityEl.java @@ -4,48 +4,48 @@ import junit.framework.TestCase; public class TestDExhEntityEl extends TestCase { - public void test() { - + public void test() { + // GlobalProperties.put("classes", DExhEntity.class.toString()); - + // Currency NZD = Currency.getInstance("NZD"); -// +// // CMoney cm = new CMoney(new Money("12"), NZD); -// +// // Rate rate = new Rate(0.1); // ExhangeCMoneyRate exh = new ExhangeCMoneyRate(rate, cm); -// +// // DExhEntity p = new DExhEntity(); // p.setExhange(exh); -// +// // SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null); -// +// // BeanDescriptor descriptor = server.getBeanDescriptor(DExhEntity.class); -// +// // ElPropertyValue elExh = descriptor.getElGetValue("exhange"); // ElPropertyValue elExhRate = descriptor.getElGetValue("exhange.rate"); // ElPropertyValue elExhCMoney = descriptor.getElGetValue("exhange.cmoney"); // ElPropertyValue elExhCMoneyCur = descriptor.getElGetValue("exhange.cmoney.currency"); // ElPropertyValue elExhCMoneyAmt = descriptor.getElGetValue("exhange.cmoney.amount"); -// +// // EntityBean entityBean = (EntityBean)p; // Object e = elExh.elGetValue(entityBean); // Object er = elExhRate.elGetValue(entityBean); // Object ecm = elExhCMoney.elGetValue(entityBean); // Object ecmCurr = elExhCMoneyCur.elGetValue(entityBean); // Object ecmAmt = elExhCMoneyAmt.elGetValue(entityBean); -// +// // Assert.assertNotNull(e); // Assert.assertNotNull(er); // Assert.assertNotNull(ecm); -// +// // Assert.assertEquals(new Rate("0.1"), er); // Assert.assertEquals(NZD, ecmCurr); // Assert.assertEquals(new Money("12"), ecmAmt); -// +// // p.setExhange(null); // Assert.assertNull(p.getExhange()); -// +// // // won't trigger CMoney build as not all properties // // have been set yet... // elExhCMoneyAmt.elSetValue(entityBean, new Money("13"), true, false); @@ -60,6 +60,6 @@ public class TestDExhEntityEl extends TestCase { // // the compound object have been collected // Assert.assertNotNull(p.getExhange()); - } - + } + } diff --git a/src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java b/src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java index 7d91b8be9..35825ceda 100644 --- a/src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java +++ b/src/test/java/com/avaje/tests/ddd/iud/TestDPersonEl.java @@ -14,9 +14,7 @@ import org.junit.Test; import java.io.IOException; import java.util.Currency; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.*; public class TestDPersonEl { diff --git a/src/test/java/com/avaje/tests/ddd/iud/TestDPersonIUD.java b/src/test/java/com/avaje/tests/ddd/iud/TestDPersonIUD.java index 1b128dd46..f08ecd836 100644 --- a/src/test/java/com/avaje/tests/ddd/iud/TestDPersonIUD.java +++ b/src/test/java/com/avaje/tests/ddd/iud/TestDPersonIUD.java @@ -4,47 +4,47 @@ import junit.framework.TestCase; public class TestDPersonIUD extends TestCase { - - public void test() { - + + 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)); -// +// // p.setInterval(new Interval(System.currentTimeMillis()-20000, System.currentTimeMillis())); -// +// // Ebean.save(p); -// +// // Oid id = p.getId(); // Assert.assertNotNull(id); -// +// // DPerson p2 = Ebean.find(DPerson.class) // .setAutoTune(false) // .where().idEq(id) // .findUnique(); -// +// // Assert.assertNotNull(p2); // System.out.println(p2); // Assert.assertEquals(new Money(12200d), p2.getSalary()); // Assert.assertNotNull(p2.getCmoney()); // Assert.assertEquals(new Money("12"), p2.getCmoney().getAmount()); // Assert.assertEquals(NZD, p2.getCmoney().getCurrency()); -// -// +// +// // Query query = Ebean.find(DPerson.class) // .setAutoTune(false) // .where().gt("cmoney.amount",1) // .query(); -// +// // List list = query.findList(); // Assert.assertTrue(list.size() >= 1); - - - } + + + } } diff --git a/src/test/java/com/avaje/tests/ddl/MainDdlWithSchema.java b/src/test/java/com/avaje/tests/ddl/MainDdlWithSchema.java index fcfac1def..87cecce69 100644 --- a/src/test/java/com/avaje/tests/ddl/MainDdlWithSchema.java +++ b/src/test/java/com/avaje/tests/ddl/MainDdlWithSchema.java @@ -7,21 +7,21 @@ import com.avaje.tests.model.basic.EBasic; public class MainDdlWithSchema { - public static void main(String[] args) { + public static void main(String[] args) { - ServerConfig cfg = new ServerConfig(); - cfg.setName("h2"); - cfg.loadFromProperties(); - cfg.addClass(EBasic.class); + ServerConfig cfg = new ServerConfig(); + cfg.setName("h2"); + cfg.loadFromProperties(); + cfg.addClass(EBasic.class); - // .... other settings ... - //UnderscoreNamingConvention naming = new UnderscoreNamingConvention(); - //naming.setSchema("test"); - //cfg.setNamingConvention(naming); - cfg.setDdlGenerate(true); - cfg.setDdlRun(true); - EbeanServer ebean = EbeanServerFactory.create(cfg); - //ebean.createSqlUpdate("create schema foo").execute(); - System.out.println(ebean); - } + // .... other settings ... + //UnderscoreNamingConvention naming = new UnderscoreNamingConvention(); + //naming.setSchema("test"); + //cfg.setNamingConvention(naming); + cfg.setDdlGenerate(true); + cfg.setDdlRun(true); + EbeanServer ebean = EbeanServerFactory.create(cfg); + //ebean.createSqlUpdate("create schema foo").execute(); + System.out.println(ebean); + } } diff --git a/src/test/java/com/avaje/tests/delete/TestDeleteByIdWithPersistenceContext.java b/src/test/java/com/avaje/tests/delete/TestDeleteByIdWithPersistenceContext.java index d6aaaa490..9cf9172fa 100644 --- a/src/test/java/com/avaje/tests/delete/TestDeleteByIdWithPersistenceContext.java +++ b/src/test/java/com/avaje/tests/delete/TestDeleteByIdWithPersistenceContext.java @@ -1,15 +1,14 @@ package com.avaje.tests.delete; -import java.util.Arrays; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.tests.model.basic.Product; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Arrays; public class TestDeleteByIdWithPersistenceContext extends BaseTestCase { @@ -24,34 +23,34 @@ public class TestDeleteByIdWithPersistenceContext extends BaseTestCase { Ebean.delete(Product.class, 101); EbeanServer server = Ebean.getServer(null); - Product prod1 = createProduct(100,"apples"); + Product prod1 = createProduct(100, "apples"); server.insert(prod1); Product prod2 = createProduct(101, "bananas"); server.insert(prod2); - + server.beginTransaction(); // effectively load these into the persistence context server.find(Product.class, prod1.getId()); server.find(Product.class, prod2.getId()); - + server.deleteAll(Product.class, Arrays.asList(prod1.getId(), prod2.getId())); - + // are these found in the persistence context? Product shadow1 = server.find(Product.class, prod1.getId()); Product shadow2 = server.find(Product.class, prod2.getId()); - + Assert.assertNull(shadow1); Assert.assertNull(shadow2); - + server.endTransaction(); - + } - + private Product createProduct(Integer id, String name) { Product prod = new Product(); prod.setId(id); prod.setName(name); return prod; } - + } diff --git a/src/test/java/com/avaje/tests/delete/TestDeleteByQuery.java b/src/test/java/com/avaje/tests/delete/TestDeleteByQuery.java index b1963b0ba..1998bcb34 100644 --- a/src/test/java/com/avaje/tests/delete/TestDeleteByQuery.java +++ b/src/test/java/com/avaje/tests/delete/TestDeleteByQuery.java @@ -57,9 +57,9 @@ public class TestDeleteByQuery extends BaseTestCase { LoggedSqlCollector.start(); Ebean.find(Customer.class) - .where().eq("name","Don Roberto") - .query().setForUpdate(true) - .delete(); + .where().eq("name", "Don Roberto") + .query().setForUpdate(true) + .delete(); List sql = LoggedSqlCollector.stop(); assertThat(sql).hasSize(1); diff --git a/src/test/java/com/avaje/tests/draftable/DocLinkTest.java b/src/test/java/com/avaje/tests/draftable/DocLinkTest.java index d5fe60989..67a11b18c 100644 --- a/src/test/java/com/avaje/tests/draftable/DocLinkTest.java +++ b/src/test/java/com/avaje/tests/draftable/DocLinkTest.java @@ -28,9 +28,9 @@ public class DocLinkTest extends BaseTestCase { Ebean.getDefaultServer().publish(Link.class, link1.getId()); Link link = Ebean.find(Link.class) - .setId(link1.getId()) - .select("name") - .findUnique(); + .setId(link1.getId()) + .select("name") + .findUnique(); assertThat(link).isNotNull(); @@ -103,7 +103,7 @@ public class DocLinkTest extends BaseTestCase { try { Ebean.deletePermanent(live); - assertTrue("never get here",false); + assertTrue("never get here", false); } catch (PersistenceException e) { // assert nice message when trying to delete live bean @@ -149,7 +149,7 @@ public class DocLinkTest extends BaseTestCase { // Expect a nice try { live.save(); - assertTrue("Never get here",false); + assertTrue("Never get here", false); } catch (PersistenceException e) { // we want to assert the message is nice and meaningful (and not a optimistic locking exception etc) @@ -207,9 +207,9 @@ public class DocLinkTest extends BaseTestCase { doc1.save(); Doc draftDoc1 = server.find(Doc.class) - .setId(doc1.getId()) - .asDraft() - .findUnique(); + .setId(doc1.getId()) + .asDraft() + .findUnique(); assertThat(draftDoc1.getLinks()).hasSize(2); @@ -248,9 +248,9 @@ public class DocLinkTest extends BaseTestCase { StrictAssertions.assertThat(live.isDraft()).isFalse(); Link draftLink = Ebean.find(Link.class) - .setId(link1.getId()) - .asDraft() - .findUnique(); + .setId(link1.getId()) + .asDraft() + .findUnique(); draftLink.setLocation("secondLocation"); draftLink.save(); @@ -258,9 +258,9 @@ public class DocLinkTest extends BaseTestCase { server.draftRestore(Link.class, link1.getId(), null); draftLink = Ebean.find(Link.class) - .setId(link1.getId()) - .asDraft() - .findUnique(); + .setId(link1.getId()) + .asDraft() + .findUnique(); StrictAssertions.assertThat(draftLink.getLocation()).isEqualTo("firstLocation"); @@ -279,9 +279,9 @@ public class DocLinkTest extends BaseTestCase { server.publish(Link.class, link1.getId(), null); Link draftLink = Ebean.find(Link.class) - .setId(link1.getId()) - .asDraft() - .findUnique(); + .setId(link1.getId()) + .asDraft() + .findUnique(); draftLink.setLocation("secondLocation"); draftLink.setComment("A good change"); @@ -296,4 +296,4 @@ public class DocLinkTest extends BaseTestCase { StrictAssertions.assertThat(links.get(0).getComment()).isNull(); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/draftable/LinkQueryPublishTest.java b/src/test/java/com/avaje/tests/draftable/LinkQueryPublishTest.java index 65574a832..abc3491da 100644 --- a/src/test/java/com/avaje/tests/draftable/LinkQueryPublishTest.java +++ b/src/test/java/com/avaje/tests/draftable/LinkQueryPublishTest.java @@ -34,7 +34,7 @@ public class LinkQueryPublishTest { ids.add(link3.getId()); PagedList pagedList = - server.find(Link.class).asDraft() + server.find(Link.class).asDraft() .where().idIn(ids) .setMaxRows(10) .findPagedList(); @@ -44,8 +44,8 @@ public class LinkQueryPublishTest { Query pubQuery = server.find(Link.class) - .where().idIn(ids) - .order().asc("id"); + .where().idIn(ids) + .order().asc("id"); List pubList = server.publish(pubQuery); @@ -56,4 +56,4 @@ public class LinkQueryPublishTest { } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/draftable/OrganisationTest.java b/src/test/java/com/avaje/tests/draftable/OrganisationTest.java index a02d8c1b5..dc097c05a 100644 --- a/src/test/java/com/avaje/tests/draftable/OrganisationTest.java +++ b/src/test/java/com/avaje/tests/draftable/OrganisationTest.java @@ -39,15 +39,15 @@ public class OrganisationTest { EbeanServer server = Ebean.getDefaultServer(); Document draftDoc = server.find(Document.class) - .asDraft() - .setId(doc.getId()) - .findUnique(); + .asDraft() + .setId(doc.getId()) + .findUnique(); assertNotNull(draftDoc); Document liveDoc = server.find(Document.class) - .setId(doc.getId()) - .findUnique(); + .setId(doc.getId()) + .findUnique(); assertNull(liveDoc); @@ -61,7 +61,6 @@ public class OrganisationTest { } - @Test public void testSaveWithCascade() { @@ -103,7 +102,7 @@ public class OrganisationTest { Document liveBean = server.publish(Document.class, doc.getId(), null); StrictAssertions.assertThat(liveBean.getBody()).isEqualTo("Body2"); StrictAssertions.assertThat(liveBean.getMedia().size()).isEqualTo(2); - assertThat(liveBean.getMedia()).extracting("name").contains("media2","media3"); + assertThat(liveBean.getMedia()).extracting("name").contains("media2", "media3"); } @@ -113,4 +112,4 @@ public class OrganisationTest { media.setName(name); return media; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/el/TestELBasic.java b/src/test/java/com/avaje/tests/el/TestELBasic.java index c73f54b7f..ade408b0e 100644 --- a/src/test/java/com/avaje/tests/el/TestELBasic.java +++ b/src/test/java/com/avaje/tests/el/TestELBasic.java @@ -1,8 +1,5 @@ package com.avaje.tests.el; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebeaninternal.api.SpiEbeanServer; @@ -14,59 +11,60 @@ import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; import com.avaje.ebeaninternal.server.el.ElPropertyChain; import com.avaje.ebeaninternal.server.el.ElPropertyDeploy; import com.avaje.tests.model.basic.Customer; +import org.junit.Assert; +import org.junit.Test; public class TestELBasic extends BaseTestCase { @Test - public void testEl() { - - SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null); - BeanDescriptor descriptor = server.getBeanDescriptor(Customer.class); - - ElPropertyDeploy elId = descriptor.getElPropertyDeploy("id"); - Assert.assertTrue(elId instanceof BeanProperty); - - ElPropertyDeploy elBillAddress = descriptor.getElPropertyDeploy("billingAddress"); - Assert.assertTrue(elBillAddress instanceof BeanPropertyAssocOne); - - ElPropertyDeploy elBillAddressId = descriptor.getElPropertyDeploy("billingAddress.id"); - Assert.assertTrue(elBillAddressId instanceof BeanFkeyProperty); - Assert.assertEquals("billing_address_id", elBillAddressId.getDbColumn()); - Assert.assertEquals("billingAddress.id", elBillAddressId.getName()); - Assert.assertNull(elBillAddressId.getElPrefix()); - - - ElPropertyDeploy elBillAddressCity = descriptor.getElPropertyDeploy("billingAddress.city"); - Assert.assertTrue(elBillAddressCity instanceof ElPropertyChain); - Assert.assertEquals("billingAddress",elBillAddressCity.getElPrefix()); - Assert.assertEquals("city",elBillAddressCity.getName()); - Assert.assertEquals("${billingAddress}city",elBillAddressCity.getElPlaceholder(false)); - Assert.assertEquals("city",elBillAddressCity.getDbColumn()); + public void testEl() { + + SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); + BeanDescriptor descriptor = server.getBeanDescriptor(Customer.class); + + ElPropertyDeploy elId = descriptor.getElPropertyDeploy("id"); + Assert.assertTrue(elId instanceof BeanProperty); + + ElPropertyDeploy elBillAddress = descriptor.getElPropertyDeploy("billingAddress"); + Assert.assertTrue(elBillAddress instanceof BeanPropertyAssocOne); + + ElPropertyDeploy elBillAddressId = descriptor.getElPropertyDeploy("billingAddress.id"); + Assert.assertTrue(elBillAddressId instanceof BeanFkeyProperty); + Assert.assertEquals("billing_address_id", elBillAddressId.getDbColumn()); + Assert.assertEquals("billingAddress.id", elBillAddressId.getName()); + Assert.assertNull(elBillAddressId.getElPrefix()); + + + ElPropertyDeploy elBillAddressCity = descriptor.getElPropertyDeploy("billingAddress.city"); + Assert.assertTrue(elBillAddressCity instanceof ElPropertyChain); + Assert.assertEquals("billingAddress", elBillAddressCity.getElPrefix()); + Assert.assertEquals("city", elBillAddressCity.getName()); + Assert.assertEquals("${billingAddress}city", elBillAddressCity.getElPlaceholder(false)); + Assert.assertEquals("city", elBillAddressCity.getDbColumn()); // ElPropertyDeploy elBillAddressCountry = descriptor.getElPropertyDeploy("billingAddress.country"); - - ElPropertyDeploy elOrders = descriptor.getElPropertyDeploy("orders"); - Assert.assertTrue(elOrders instanceof BeanPropertyAssocMany); - - ElPropertyDeploy elOrderStatus = descriptor.getElPropertyDeploy("orders.status"); - Assert.assertTrue(elOrderStatus instanceof ElPropertyChain); - Assert.assertEquals("orders",elOrderStatus.getElPrefix()); - Assert.assertEquals("status",elOrderStatus.getName()); - Assert.assertEquals("${orders}status",elOrderStatus.getElPlaceholder(false)); - Assert.assertEquals("status",elOrderStatus.getDbColumn()); - ElPropertyDeploy elOrderCust = descriptor.getElPropertyDeploy("orders.customer"); - Assert.assertTrue(elOrderCust instanceof ElPropertyChain); + ElPropertyDeploy elOrders = descriptor.getElPropertyDeploy("orders"); + Assert.assertTrue(elOrders instanceof BeanPropertyAssocMany); + + ElPropertyDeploy elOrderStatus = descriptor.getElPropertyDeploy("orders.status"); + Assert.assertTrue(elOrderStatus instanceof ElPropertyChain); + Assert.assertEquals("orders", elOrderStatus.getElPrefix()); + Assert.assertEquals("status", elOrderStatus.getName()); + Assert.assertEquals("${orders}status", elOrderStatus.getElPlaceholder(false)); + Assert.assertEquals("status", elOrderStatus.getDbColumn()); + + ElPropertyDeploy elOrderCust = descriptor.getElPropertyDeploy("orders.customer"); + Assert.assertTrue(elOrderCust instanceof ElPropertyChain); + + ElPropertyDeploy elOrderDetails = descriptor.getElPropertyDeploy("orders.details"); + Assert.assertTrue(elOrderDetails instanceof ElPropertyChain); + + ElPropertyDeploy elOrderDetailsId = descriptor.getElPropertyDeploy("orders.details.id"); + Assert.assertTrue(elOrderDetailsId instanceof ElPropertyChain); + + } - ElPropertyDeploy elOrderDetails = descriptor.getElPropertyDeploy("orders.details"); - Assert.assertTrue(elOrderDetails instanceof ElPropertyChain); - ElPropertyDeploy elOrderDetailsId = descriptor.getElPropertyDeploy("orders.details.id"); - Assert.assertTrue(elOrderDetailsId instanceof ElPropertyChain); - - } - - - } diff --git a/src/test/java/com/avaje/tests/el/TestPathExpression.java b/src/test/java/com/avaje/tests/el/TestPathExpression.java index c9526b0db..22011e9fd 100644 --- a/src/test/java/com/avaje/tests/el/TestPathExpression.java +++ b/src/test/java/com/avaje/tests/el/TestPathExpression.java @@ -28,11 +28,11 @@ public class TestPathExpression { } @Test - public void pathSet() { - + public void pathSet() { + Customer c1 = new Customer(); - line1.pathSet(c1, "12 someplace"); - city.pathSet(c1, "Auckland"); + line1.pathSet(c1, "12 someplace"); + city.pathSet(c1, "Auckland"); billingId.pathSet(c1, 4); beanType.getExpressionPath("id").pathSet(c1, 42L); @@ -57,7 +57,7 @@ public class TestPathExpression { public void pathGet() { Address billingAddress = new Address(); - billingAddress.setId((short)12); + billingAddress.setId((short) 12); billingAddress.setLine1("line1"); billingAddress.setCity("Auckland"); @@ -69,7 +69,7 @@ public class TestPathExpression { Customer c0 = new Customer(); c0.setBillingAddress(billingAddress); - EntityBean e0 = (EntityBean)c0; + EntityBean e0 = (EntityBean) c0; assertEquals(line1.pathGet(e0), "line1"); assertEquals(city.pathGet(e0), "Auckland"); assertEquals(billingId.pathGet(e0), Short.valueOf("12")); diff --git a/src/test/java/com/avaje/tests/el/TestUnderscoreParam.java b/src/test/java/com/avaje/tests/el/TestUnderscoreParam.java index 5626f3be4..b79115345 100644 --- a/src/test/java/com/avaje/tests/el/TestUnderscoreParam.java +++ b/src/test/java/com/avaje/tests/el/TestUnderscoreParam.java @@ -13,8 +13,8 @@ public class TestUnderscoreParam { public void test() { Query query = Ebean.find(Customer.class) - .where().raw("name like ?", "Rob%") - .query(); + .where().raw("name like ?", "Rob%") + .query(); query.findList(); diff --git a/src/test/java/com/avaje/tests/enhancement/TestConstructorPutfieldReplacement.java b/src/test/java/com/avaje/tests/enhancement/TestConstructorPutfieldReplacement.java index cdf35e895..e2b4d6f07 100644 --- a/src/test/java/com/avaje/tests/enhancement/TestConstructorPutfieldReplacement.java +++ b/src/test/java/com/avaje/tests/enhancement/TestConstructorPutfieldReplacement.java @@ -1,30 +1,29 @@ package com.avaje.tests.enhancement; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.bean.EntityBean; import com.avaje.ebean.bean.EntityBeanIntercept; import com.avaje.tests.model.basic.PFile; import com.avaje.tests.model.basic.PFileContent; +import org.junit.Assert; +import org.junit.Test; public class TestConstructorPutfieldReplacement extends BaseTestCase { @Test public void test() { - + PFile persistentFile = new PFile("test.txt", new PFileContent("test".getBytes())); - EntityBean eb = (EntityBean)persistentFile; + EntityBean eb = (EntityBean) persistentFile; EntityBeanIntercept ebi = eb._ebean_getIntercept(); - + int namePos = ebi.findProperty("name"); int fileContentPos = ebi.findProperty("fileContent"); - + Assert.assertTrue(ebi.isLoadedProperty(namePos)); Assert.assertTrue(ebi.isLoadedProperty(fileContentPos)); - + } - + } diff --git a/src/test/java/com/avaje/tests/enhancement/TestEnhancementEquals.java b/src/test/java/com/avaje/tests/enhancement/TestEnhancementEquals.java index ae1a6f6b8..cbc37ab71 100644 --- a/src/test/java/com/avaje/tests/enhancement/TestEnhancementEquals.java +++ b/src/test/java/com/avaje/tests/enhancement/TestEnhancementEquals.java @@ -1,10 +1,9 @@ package com.avaje.tests.enhancement; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.tests.model.basic.Product; +import org.junit.Assert; +import org.junit.Test; /** * Note take care if you run this test in an IDE with a debugger as that can trigger the equals and @@ -12,17 +11,17 @@ import com.avaje.tests.model.basic.Product; */ public class TestEnhancementEquals extends BaseTestCase { - + @Test public void testEqualsBasedOnIdValue() { - + Product product1 = new Product(); product1.setId(345); product1.setName("blah"); Product product2 = new Product(); product2.setId(345); - + Assert.assertEquals("equal based on id", product1, product2); Assert.assertEquals("hashCode equal based on id", product1.hashCode(), product2.hashCode()); @@ -30,26 +29,26 @@ public class TestEnhancementEquals extends BaseTestCase { Assert.assertEquals("still equal based on identity", product1, product2); Assert.assertEquals("still hashCode equal based on id", product1.hashCode(), product2.hashCode()); } - + @Test public void testWhenEqualsTouchedFirst() { - + Product product1 = new Product(); product1.setName("blah"); int hashcode1 = product1.hashCode(); - + // equals has been called so the hashCode and 'identity' has been baked in product1.setId(345); int hashcode2 = product1.hashCode(); - Assert.assertEquals("hashCode can't change",hashcode1, hashcode2); - + Assert.assertEquals("hashCode can't change", hashcode1, hashcode2); + Product product2 = new Product(); product2.setId(345); - + Assert.assertFalse("Not equal now", product1.equals(product2)); Assert.assertTrue("Different hashCode", product1.hashCode() != product2.hashCode()); } - + } diff --git a/src/test/java/com/avaje/tests/family/TestInheritance.java b/src/test/java/com/avaje/tests/family/TestInheritance.java index 093a3ae0c..1403202d7 100644 --- a/src/test/java/com/avaje/tests/family/TestInheritance.java +++ b/src/test/java/com/avaje/tests/family/TestInheritance.java @@ -1,34 +1,27 @@ - package com.avaje.tests.family; -import static org.junit.Assert.*; - -import java.util.List; - -import org.junit.Ignore; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.ebeaninternal.server.deploy.BeanProperty; import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import com.avaje.tests.lib.EbeanTestCase; import com.avaje.tests.model.basic.EBasic; import com.avaje.tests.model.family.ChildPerson; import com.avaje.tests.model.family.GrandParentPerson; import com.avaje.tests.model.family.ParentPerson; +import org.junit.Test; +import static org.junit.Assert.*; public class TestInheritance extends BaseTestCase { - @Test + @Test public void testDescriptor() { BeanDescriptor desc = spiEbeanServer().getBeanDescriptor(GrandParentPerson.class); BeanProperty prop1 = desc.getBeanProperty("someBean"); BeanProperty prop2 = desc.getBeanProperty("effectiveBean"); - + assertEquals(BeanPropertyAssocOne.class, prop1.getClass()); assertEquals(BeanPropertyAssocOne.class, prop2.getClass()); } @@ -42,7 +35,7 @@ public class TestInheritance extends BaseTestCase { * +- parent2 Sandra (50) from Berlin * | '- child3 Roland(36) * +- parent3 Michael(60) - * + * */ @Test public void testInheritance() { @@ -50,11 +43,11 @@ public class TestInheritance extends BaseTestCase { EBasic someBean1 = new EBasic(); someBean1.setName("A Bean"); server().save(someBean1); - + EBasic someBean2 = new EBasic(); someBean2.setName("An other Bean"); server().save(someBean2); - + ChildPerson child1 = new ChildPerson(); child1.setAge(13); child1.setName("Fred"); @@ -97,7 +90,7 @@ public class TestInheritance extends BaseTestCase { grandparent1.getChildren().add(parent1); grandparent1.getChildren().add(parent2); grandparent1.getChildren().add(parent3); - + server().save(grandparent1); // Test setup complete, so retrieve bean from db @@ -107,33 +100,33 @@ public class TestInheritance extends BaseTestCase { parent1 = server().find(ParentPerson.class).setId(1).fetch("someBean").findUnique(); assertEquals("A Bean", parent1.getSomeBean().getName()); grandparent1 = server().find(GrandParentPerson.class) - .fetch("children","*") // FIXME If I do not fetch childrenBean, I will get an exception - .fetch("children.effectiveBean","*") - .fetch("children.children","*") - .fetch("children.children.effectiveBean","*") - .setId(grandparent1.getIdentifier()).where() - .or() - .in("effectiveBean.id",1) - .isNull("effectiveBean.id") - .endOr() - .findUnique(); + .fetch("children", "*") // FIXME If I do not fetch childrenBean, I will get an exception + .fetch("children.effectiveBean", "*") + .fetch("children.children", "*") + .fetch("children.children.effectiveBean", "*") + .setId(grandparent1.getIdentifier()).where() + .or() + .in("effectiveBean.id", 1) + .isNull("effectiveBean.id") + .endOr() + .findUnique(); assertNotNull(grandparent1); // check if aggregation works assertEquals(3, grandparent1.getChildCount().intValue()); assertEquals(150, grandparent1.getTotalAge().intValue()); - + // check normal properties assertEquals("Josef", grandparent1.getName()); assertEquals("Foo", grandparent1.getFamilyName()); assertEquals("Munich", grandparent1.getAddress()); assertEquals(1, grandparent1.getEffectiveBean().getId().intValue()); - + // now check children of grandparent parent1 = grandparent1.getChildren().get(0); parent2 = grandparent1.getChildren().get(1); parent3 = grandparent1.getChildren().get(2); - + assertNotNull(parent1); assertNotNull(parent2); assertNotNull(parent3); @@ -141,12 +134,12 @@ public class TestInheritance extends BaseTestCase { assertEquals("Maria", parent1.getName()); assertEquals("Bar", parent1.getFamilyName()); // overwritten family name assertEquals("Bar", parent1.getEffectiveFamilyName()); // test inheritance - assertNull(parent1.getAddress()); // no alternative address set + assertNull(parent1.getAddress()); // no alternative address set assertEquals("Munich", parent1.getEffectiveAddress()); // -> inherit munich assertEquals(2, parent1.getChildCount().intValue()); assertEquals(21, parent1.getTotalAge().intValue()); assertEquals("A Bean", parent1.getEffectiveBean().getName()); - + // parent2 assertEquals("Sandra", parent2.getName()); assertNull(parent2.getFamilyName()); @@ -156,7 +149,7 @@ public class TestInheritance extends BaseTestCase { assertEquals(1, parent2.getChildCount().intValue()); assertEquals(36, parent2.getTotalAge().intValue()); assertNull(parent2.getEffectiveBean()); - + // parent3 assertEquals("Michael", parent3.getName()); assertNull(parent3.getFamilyName()); @@ -166,54 +159,54 @@ public class TestInheritance extends BaseTestCase { assertEquals(0, parent3.getChildCount().intValue()); assertEquals(0, parent3.getTotalAge().intValue()); assertNull(parent3.getEffectiveBean()); - + child1 = parent1.getChildren().get(0); child2 = parent1.getChildren().get(1); - + child3 = parent2.getChildren().get(0); - + assertNotNull(child1); assertNotNull(child2); assertNotNull(child3); - + assertEquals("Bar", child1.getEffectiveFamilyName()); assertEquals("Munich", child1.getEffectiveAddress()); assertEquals("An other Bean", child1.getSomeBean().getName()); assertEquals("An other Bean", child1.getEffectiveBean().getName()); - + assertTrue(child1.getSomeBean() == child1.getEffectiveBean()); - + assertEquals("Baz", child2.getEffectiveFamilyName()); assertEquals("Munich", child2.getEffectiveAddress()); assertNull(child2.getSomeBean()); assertEquals("A Bean", child2.getEffectiveBean().getName()); - + assertEquals("Foo", child3.getEffectiveFamilyName()); assertEquals("Berlin", child3.getEffectiveAddress()); assertNull(child3.getEffectiveBean()); - + // Now start from bottom up child2 = server().find(ChildPerson.class).where().eq("name", "Julia").select("parent.name").findUnique(); assertEquals("Baz", child2.getEffectiveFamilyName()); assertEquals("Munich", child2.getEffectiveAddress()); assertNull(child2.getSomeBean()); assertEquals("A Bean", child2.getEffectiveBean().getName()); - + parent1 = child2.getParent(); assertEquals("Maria", parent1.getName()); assertEquals("Bar", parent1.getFamilyName()); // overwritten family name assertEquals("Bar", parent1.getEffectiveFamilyName()); // test inheritance - assertNull(parent1.getAddress()); // no alternative address set + assertNull(parent1.getAddress()); // no alternative address set assertEquals("Munich", parent1.getEffectiveAddress()); // -> inherit munich assertEquals(2, parent1.getChildCount().intValue()); assertEquals(21, parent1.getTotalAge().intValue()); assertEquals("A Bean", parent1.getEffectiveBean().getName()); - + grandparent1 = parent1.getParent(); // check if aggregation works assertEquals(3, grandparent1.getChildCount().intValue()); assertEquals(150, grandparent1.getTotalAge().intValue()); - + // check normal properties assertEquals("Josef", grandparent1.getName()); assertEquals("Foo", grandparent1.getFamilyName()); diff --git a/src/test/java/com/avaje/tests/genkey/TestGeneratedKeys.java b/src/test/java/com/avaje/tests/genkey/TestGeneratedKeys.java index 593a50495..2f313d942 100644 --- a/src/test/java/com/avaje/tests/genkey/TestGeneratedKeys.java +++ b/src/test/java/com/avaje/tests/genkey/TestGeneratedKeys.java @@ -1,37 +1,36 @@ package com.avaje.tests.genkey; -import org.junit.Assert; -import junit.framework.TestCase; - import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.TOne; +import junit.framework.TestCase; +import org.junit.Assert; public class TestGeneratedKeys extends TestCase { - - public void testJdbcBatchInsert() { - - TOne c = new TOne(); - c.setName("Banana"); - c.setDescription("Test Gen Key"); - - TOne c1 = new TOne(); - c1.setName("Two"); - c1.setDescription("Test Gen Key Two"); - - Ebean.beginTransaction(); - try { - Ebean.save(c); - Ebean.save(c1); - } finally { - Ebean.commitTransaction(); - } - Integer id = c.getId(); - Assert.assertNotNull("Get Id back after insert", id); - Integer id1 = c1.getId(); - Assert.assertNotNull("Get Id back after insert", id1); + public void testJdbcBatchInsert() { + + TOne c = new TOne(); + c.setName("Banana"); + c.setDescription("Test Gen Key"); + + TOne c1 = new TOne(); + c1.setName("Two"); + c1.setDescription("Test Gen Key Two"); + + Ebean.beginTransaction(); + try { + Ebean.save(c); + Ebean.save(c1); + } finally { + Ebean.commitTransaction(); + } + Integer id = c.getId(); + Assert.assertNotNull("Get Id back after insert", id); + + Integer id1 = c1.getId(); + Assert.assertNotNull("Get Id back after insert", id1); + + } - } - } diff --git a/src/test/java/com/avaje/tests/genkey/TestSeqBatch.java b/src/test/java/com/avaje/tests/genkey/TestSeqBatch.java index 111ff7ddd..04117d5fc 100644 --- a/src/test/java/com/avaje/tests/genkey/TestSeqBatch.java +++ b/src/test/java/com/avaje/tests/genkey/TestSeqBatch.java @@ -1,39 +1,38 @@ package com.avaje.tests.genkey; -import com.avaje.ebean.config.dbplatform.IdType; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; +import com.avaje.ebean.config.dbplatform.IdType; import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.tests.model.basic.TOne; +import org.junit.Assert; +import org.junit.Test; public class TestSeqBatch extends BaseTestCase { @Test - public void test() { - - EbeanServer server = Ebean.getServer(null); - SpiEbeanServer spiServer = (SpiEbeanServer)server; + public void test() { + + EbeanServer server = Ebean.getServer(null); + SpiEbeanServer spiServer = (SpiEbeanServer) server; IdType idType = spiServer.getDatabasePlatform().getDbIdentity().getIdType(); - if (IdType.SEQUENCE == idType){ - BeanDescriptor d = spiServer.getBeanDescriptor(TOne.class); - - Object id = d.nextId(null); - Assert.assertNotNull(id); + if (IdType.SEQUENCE == idType) { + BeanDescriptor d = spiServer.getBeanDescriptor(TOne.class); + + Object id = d.nextId(null); + Assert.assertNotNull(id); //System.out.println(id); - for (int i = 0; i < 16; i++) { - Object id2 = d.nextId(null); - Assert.assertNotNull(id2); + for (int i = 0; i < 16; i++) { + Object id2 = d.nextId(null); + Assert.assertNotNull(id2); //System.out.println(id2); - } - } - } - + } + } + } + } diff --git a/src/test/java/com/avaje/tests/idkeys/TestGeneratedKeys.java b/src/test/java/com/avaje/tests/idkeys/TestGeneratedKeys.java index f90f1957b..e929552b9 100644 --- a/src/test/java/com/avaje/tests/idkeys/TestGeneratedKeys.java +++ b/src/test/java/com/avaje/tests/idkeys/TestGeneratedKeys.java @@ -13,131 +13,120 @@ import java.sql.Statement; /** * Test various key generation strategies. - * + *

* Notice: The strategy {@link javax.persistence.GenerationType#AUTO} is not easy to test as it is database dependent - * which of the strategies will be used. + * which of the strategies will be used. */ -public class TestGeneratedKeys extends EbeanTestCase -{ - /** - * Test key generation using a sequence. - * This should increment the used sequence by one. - * EBean should construct a select statement which uses the configured sequence to get the next value - *

- * Notice: Actually, this test depends on H2 as used database as we are going to fetch the current value from the sequence - */ - public void testSequence() throws SQLException - { - SpiEbeanServer server = (SpiEbeanServer)getServer(); - IdType idType = server.getDatabasePlatform().getDbIdentity().getIdType(); - String platformName = server.getDatabasePlatform().getName(); - if (!IdType.SEQUENCE.equals(idType)){ - // only run this test when SEQUENCE is being used - return; - } - if (!"h2".equals(platformName)){ - // readSequenceValue is H2 specific - return; - } - - Transaction tx = getServer().beginTransaction(); - - long sequenceStart = readSequenceValue(tx, GenKeySequence.SEQUENCE_NAME); - - GenKeySequence al = new GenKeySequence(); - al.setDescription("my description"); - getServer().save(al); - - - long sequenceCurrent = readSequenceValue(tx, GenKeySequence.SEQUENCE_NAME); - - assertNotNull(al.getId()); - assertFalse("sequence advanced", sequenceStart == sequenceCurrent); - assertEquals("sequence advanced by 20", sequenceStart + 20, sequenceCurrent); - +public class TestGeneratedKeys extends EbeanTestCase { + /** + * Test key generation using a sequence. + * This should increment the used sequence by one. + * EBean should construct a select statement which uses the configured sequence to get the next value + *

+ * Notice: Actually, this test depends on H2 as used database as we are going to fetch the current value from the sequence + */ + public void testSequence() throws SQLException { + SpiEbeanServer server = (SpiEbeanServer) getServer(); + IdType idType = server.getDatabasePlatform().getDbIdentity().getIdType(); + String platformName = server.getDatabasePlatform().getName(); + if (!IdType.SEQUENCE.equals(idType)) { + // only run this test when SEQUENCE is being used + return; + } + if (!"h2".equals(platformName)) { + // readSequenceValue is H2 specific + return; } - private long readSequenceValue(Transaction tx, String sequence) throws SQLException - { - Statement stm = null; - try - { - stm = tx.getConnection().createStatement(); - ResultSet rs = stm.executeQuery("select currval('" + sequence + "')"); - rs.next(); + Transaction tx = getServer().beginTransaction(); - return rs.getLong(1); - } - finally - { - if (stm != null) - { - try - { - stm.close(); - } - catch (SQLException e) - { - } - } + long sequenceStart = readSequenceValue(tx, GenKeySequence.SEQUENCE_NAME); + + GenKeySequence al = new GenKeySequence(); + al.setDescription("my description"); + getServer().save(al); + + + long sequenceCurrent = readSequenceValue(tx, GenKeySequence.SEQUENCE_NAME); + + assertNotNull(al.getId()); + assertFalse("sequence advanced", sequenceStart == sequenceCurrent); + assertEquals("sequence advanced by 20", sequenceStart + 20, sequenceCurrent); + + } + + private long readSequenceValue(Transaction tx, String sequence) throws SQLException { + Statement stm = null; + try { + stm = tx.getConnection().createStatement(); + ResultSet rs = stm.executeQuery("select currval('" + sequence + "')"); + rs.next(); + + return rs.getLong(1); + } finally { + if (stm != null) { + try { + stm.close(); + } catch (SQLException e) { } + } + } + } + + /** + * This test just checks if a generated value has been passed back from the database. + * EBean should simply fetch the generated key after inserting. + */ + public void testIdentity() throws SQLException { + + SpiEbeanServer server = (SpiEbeanServer) getServer(); + IdType idType = server.getDatabasePlatform().getDbIdentity().getIdType(); + + if (!IdType.IDENTITY.equals(idType)) { + // only run this test when SEQUENCE is being used + return; } - /** - * This test just checks if a generated value has been passed back from the database. - * EBean should simply fetch the generated key after inserting. - */ - public void testIdentity() throws SQLException - { + Transaction tx = getServer().beginTransaction(); - SpiEbeanServer server = (SpiEbeanServer)getServer(); - IdType idType = server.getDatabasePlatform().getDbIdentity().getIdType(); - - if (!IdType.IDENTITY.equals(idType)){ - // only run this test when SEQUENCE is being used - return; - } + GenKeyIdentity al = new GenKeyIdentity(); + al.setDescription("my description"); + getServer().save(al); - Transaction tx = getServer().beginTransaction(); + // For JDBC batching we won't get the id until after + // the batch has been flushed explicitly or via commit + //assertNotNull(al.getId()); - GenKeyIdentity al = new GenKeyIdentity(); - al.setDescription("my description"); - getServer().save(al); + tx.commit(); - // For JDBC batching we won't get the id until after - // the batch has been flushed explicitly or via commit - //assertNotNull(al.getId()); + assertNotNull(al.getId()); - tx.commit(); - - assertNotNull(al.getId()); + } - } + /** + * This should use the next value using max(col)+1 on the table + * + * AFAIK this is not supported by EBean yet + public void testTable() throws SQLException + { + EbeanServer server = Ebean.getServer(null); + Transaction tx = server.beginTransaction(); - /** - * This should use the next value using max(col)+1 on the table - * - * AFAIK this is not supported by EBean yet - public void testTable() throws SQLException - { - EbeanServer server = Ebean.getServer(null); - Transaction tx = server.beginTransaction(); + GenKeyTable al = new GenKeyTable(); + al.setDescription("my description"); + server.save(al); - GenKeyTable al = new GenKeyTable(); - al.setDescription("my description"); - server.save(al); + assertNotNull(al.getId()); + assertEquals(0L, al.getId().longValue()); - assertNotNull(al.getId()); - assertEquals(0L, al.getId().longValue()); + al = new GenKeyTable(); + al.setDescription("my description - another object"); + server.save(al); - al = new GenKeyTable(); - al.setDescription("my description - another object"); - server.save(al); + assertNotNull(al.getId()); + assertEquals(1L, al.getId().longValue()); - assertNotNull(al.getId()); - assertEquals(1L, al.getId().longValue()); - - tx.commit(); - } - */ -} \ No newline at end of file + tx.commit(); + } + */ +} diff --git a/src/test/java/com/avaje/tests/idkeys/TestLazyLoad.java b/src/test/java/com/avaje/tests/idkeys/TestLazyLoad.java index 70c501d38..504b29039 100644 --- a/src/test/java/com/avaje/tests/idkeys/TestLazyLoad.java +++ b/src/test/java/com/avaje/tests/idkeys/TestLazyLoad.java @@ -1,41 +1,39 @@ package com.avaje.tests.idkeys; -import java.sql.SQLException; -import java.util.List; - import com.avaje.tests.lib.EbeanTestCase; import com.avaje.tests.model.basic.TOne; +import java.sql.SQLException; +import java.util.List; + /** * Test lazy loading */ -public class TestLazyLoad extends EbeanTestCase -{ - /** - * This test loads just a single property of the Entity AuditLog and later on access - * the description which should force a lazy load of this property - */ - public void testPartialLoad() throws SQLException - { - TOne log = new TOne(); - log.setName("test partial"); - log.setDescription("log"); +public class TestLazyLoad extends EbeanTestCase { + /** + * This test loads just a single property of the Entity AuditLog and later on access + * the description which should force a lazy load of this property + */ + public void testPartialLoad() throws SQLException { + TOne log = new TOne(); + log.setName("test partial"); + log.setDescription("log"); - getServer().save(log); + getServer().save(log); - assertNotNull(log.getId()); + assertNotNull(log.getId()); - List logs = getServer().find(TOne.class) - .select("id") - .where().eq("id", log.getId()) - .findList(); + List logs = getServer().find(TOne.class) + .select("id") + .where().eq("id", log.getId()) + .findList(); - assertNotNull(logs); - assertEquals(1, logs.size()); + assertNotNull(logs); + assertEquals(1, logs.size()); - TOne logLazy = logs.get(0); + TOne logLazy = logs.get(0); - String description = logLazy.getDescription(); - assertEquals(log.getDescription(), description); - } -} \ No newline at end of file + String description = logLazy.getDescription(); + assertEquals(log.getDescription(), description); + } +} diff --git a/src/test/java/com/avaje/tests/idkeys/TestPropertyChangeSupport.java b/src/test/java/com/avaje/tests/idkeys/TestPropertyChangeSupport.java index f85756516..da8cedd62 100644 --- a/src/test/java/com/avaje/tests/idkeys/TestPropertyChangeSupport.java +++ b/src/test/java/com/avaje/tests/idkeys/TestPropertyChangeSupport.java @@ -124,9 +124,9 @@ public class TestPropertyChangeSupport extends EbeanTestCase implements Property resetEvent(); List logs = getServer().find(AuditLog.class) - .where().eq("id", log.getId()) - .select("id") - .findList(); + .where().eq("id", log.getId()) + .select("id") + .findList(); assertNotNull(logs); assertEquals(1, logs.size()); @@ -167,4 +167,4 @@ public class TestPropertyChangeSupport extends EbeanTestCase implements Property throw new RuntimeException(e); } } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/idkeys/TestSimpleIdInsert.java b/src/test/java/com/avaje/tests/idkeys/TestSimpleIdInsert.java index 9e1bc2a1c..2a48b4d06 100644 --- a/src/test/java/com/avaje/tests/idkeys/TestSimpleIdInsert.java +++ b/src/test/java/com/avaje/tests/idkeys/TestSimpleIdInsert.java @@ -9,16 +9,16 @@ import org.junit.Test; public class TestSimpleIdInsert extends BaseTestCase { @Test - public void test() { + public void test() { - ESimple e = new ESimple(); - e.setName("name"); + ESimple e = new ESimple(); + e.setName("name"); - Ebean.save(e); + Ebean.save(e); - Assert.assertNotNull(e.getId()); + Assert.assertNotNull(e.getId()); - } + } // // This test fails with jdbc drivers that don't // // support batch insert with getGeneratedKeys diff --git a/src/test/java/com/avaje/tests/idkeys/db/AuditLog.java b/src/test/java/com/avaje/tests/idkeys/db/AuditLog.java index d3d9281ea..37c1c352c 100644 --- a/src/test/java/com/avaje/tests/idkeys/db/AuditLog.java +++ b/src/test/java/com/avaje/tests/idkeys/db/AuditLog.java @@ -6,43 +6,36 @@ import javax.persistence.Id; @Entity // Just let Ebean define Identity mechanism for testing across all DB types //@SequenceGenerator(name = "AD_SEQ_NAME", sequenceName = "AD_SEQ") -public class AuditLog -{ - @Id - //@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AD_SEQ_NAME") - private Long id; +public class AuditLog { + @Id + //@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AD_SEQ_NAME") + private Long id; - private String description; + private String description; - private String modifiedDescription; + private String modifiedDescription; - public Long getId() - { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) - { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public String getDescription() - { - return description; - } + public String getDescription() { + return description; + } - public void setDescription(String description) - { - this.description = description; - } + public void setDescription(String description) { + this.description = description; + } - public String getModifiedDescription() - { - return modifiedDescription; - } + public String getModifiedDescription() { + return modifiedDescription; + } - public void setModifiedDescription(String modifiedDescription) - { - this.modifiedDescription = modifiedDescription==null?null:"_" + modifiedDescription + "_"; - } -} \ No newline at end of file + public void setModifiedDescription(String modifiedDescription) { + this.modifiedDescription = modifiedDescription == null ? null : "_" + modifiedDescription + "_"; + } +} diff --git a/src/test/java/com/avaje/tests/idkeys/db/GenKeyIdentity.java b/src/test/java/com/avaje/tests/idkeys/db/GenKeyIdentity.java index 748cfe19b..ca56c2645 100644 --- a/src/test/java/com/avaje/tests/idkeys/db/GenKeyIdentity.java +++ b/src/test/java/com/avaje/tests/idkeys/db/GenKeyIdentity.java @@ -6,31 +6,26 @@ import javax.persistence.GenerationType; import javax.persistence.Id; @Entity -public class GenKeyIdentity -{ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; +public class GenKeyIdentity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; - private String description; + private String description; - public Long getId() - { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) - { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public String getDescription() - { - return description; - } + public String getDescription() { + return description; + } - public void setDescription(String description) - { - this.description = description; - } -} \ No newline at end of file + public void setDescription(String description) { + this.description = description; + } +} diff --git a/src/test/java/com/avaje/tests/idkeys/db/GenKeySequence.java b/src/test/java/com/avaje/tests/idkeys/db/GenKeySequence.java index 5e1e352c7..c615a9bfc 100644 --- a/src/test/java/com/avaje/tests/idkeys/db/GenKeySequence.java +++ b/src/test/java/com/avaje/tests/idkeys/db/GenKeySequence.java @@ -8,33 +8,28 @@ import javax.persistence.SequenceGenerator; @Entity @SequenceGenerator(name = "SEQ_NAME", sequenceName = GenKeySequence.SEQUENCE_NAME) -public class GenKeySequence -{ - public final static String SEQUENCE_NAME = "SEQ"; +public class GenKeySequence { + public final static String SEQUENCE_NAME = "SEQ"; - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_NAME") - private Long id; + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_NAME") + private Long id; - private String description; + private String description; - public Long getId() - { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) - { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public String getDescription() - { - return description; - } + public String getDescription() { + return description; + } - public void setDescription(String description) - { - this.description = description; - } -} \ No newline at end of file + public void setDescription(String description) { + this.description = description; + } +} diff --git a/src/test/java/com/avaje/tests/idkeys/db/GenKeyTable.java b/src/test/java/com/avaje/tests/idkeys/db/GenKeyTable.java index 741578797..6282d656b 100644 --- a/src/test/java/com/avaje/tests/idkeys/db/GenKeyTable.java +++ b/src/test/java/com/avaje/tests/idkeys/db/GenKeyTable.java @@ -6,31 +6,26 @@ import javax.persistence.GenerationType; import javax.persistence.Id; @Entity -public class GenKeyTable -{ - @Id - @GeneratedValue(strategy = GenerationType.TABLE) - private Long id; +public class GenKeyTable { + @Id + @GeneratedValue(strategy = GenerationType.TABLE) + private Long id; - private String description; + private String description; - public Long getId() - { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) - { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public String getDescription() - { - return description; - } + public String getDescription() { + return description; + } - public void setDescription(String description) - { - this.description = description; - } -} \ No newline at end of file + public void setDescription(String description) { + this.description = description; + } +} diff --git a/src/test/java/com/avaje/tests/inheritance/InnerReport.java b/src/test/java/com/avaje/tests/inheritance/InnerReport.java index e6995e081..8936ade24 100644 --- a/src/test/java/com/avaje/tests/inheritance/InnerReport.java +++ b/src/test/java/com/avaje/tests/inheritance/InnerReport.java @@ -1,6 +1,10 @@ package com.avaje.tests.inheritance; -import javax.persistence.*; +import javax.persistence.DiscriminatorValue; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; /** */ diff --git a/src/test/java/com/avaje/tests/inheritance/Stockforecast.java b/src/test/java/com/avaje/tests/inheritance/Stockforecast.java index 8f96ee497..2f1e22264 100644 --- a/src/test/java/com/avaje/tests/inheritance/Stockforecast.java +++ b/src/test/java/com/avaje/tests/inheritance/Stockforecast.java @@ -1,6 +1,11 @@ package com.avaje.tests.inheritance; -import javax.persistence.*; +import javax.persistence.DiscriminatorColumn; +import javax.persistence.DiscriminatorType; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; @Entity diff --git a/src/test/java/com/avaje/tests/inheritance/TestDuplcateKeyException.java b/src/test/java/com/avaje/tests/inheritance/TestDuplcateKeyException.java index 480c6d4f2..11e4fb18b 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestDuplcateKeyException.java +++ b/src/test/java/com/avaje/tests/inheritance/TestDuplcateKeyException.java @@ -1,53 +1,50 @@ package com.avaje.tests.inheritance; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Assert; +import org.junit.Test; public class TestDuplcateKeyException extends BaseTestCase { - /** - * Test query. - *

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

- */ + /** + * Test query. + *

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

+ */ @Test - 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(() -> { - //Ebean.currentTransaction().log("-- saving holder first time"); - // Alternatively turn off cascade Persist for this transaction - //Ebean.currentTransaction().setPersistCascade(false); - Ebean.save(holder); + 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(() -> { + //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"); - } - } + // we don't get this far before failing + //Ebean.save(holder); + }); + } catch (Exception e) { + Assert.assertEquals(e.getMessage(), "test rollback"); + } + } } diff --git a/src/test/java/com/avaje/tests/inheritance/TestInheritInsert.java b/src/test/java/com/avaje/tests/inheritance/TestInheritInsert.java index d66f2d2c4..fd9686b2f 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestInheritInsert.java +++ b/src/test/java/com/avaje/tests/inheritance/TestInheritInsert.java @@ -1,23 +1,20 @@ package com.avaje.tests.inheritance; -import java.util.List; - -import com.avaje.tests.model.basic.CarAccessory; -import com.avaje.tests.model.basic.CarFuse; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.Car; +import com.avaje.tests.model.basic.CarAccessory; +import com.avaje.tests.model.basic.CarFuse; import com.avaje.tests.model.basic.Truck; import com.avaje.tests.model.basic.Vehicle; import com.avaje.tests.model.basic.VehicleDriver; +import org.junit.Test; + +import java.util.List; import static org.assertj.core.api.StrictAssertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class TestInheritInsert extends BaseTestCase { @@ -109,10 +106,10 @@ public class TestInheritInsert extends BaseTestCase { Query query = Ebean.find(Car.class) - .fetch("accessories") - .where() - .eq("id", car.getId()) - .query(); + .fetch("accessories") + .where() + .eq("id", car.getId()) + .query(); Car result = query.findUnique(); diff --git a/src/test/java/com/avaje/tests/inheritance/TestInheritanceBatchLazyLoad.java b/src/test/java/com/avaje/tests/inheritance/TestInheritanceBatchLazyLoad.java index 3f36fb198..72673263f 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestInheritanceBatchLazyLoad.java +++ b/src/test/java/com/avaje/tests/inheritance/TestInheritanceBatchLazyLoad.java @@ -28,14 +28,14 @@ public class TestInheritanceBatchLazyLoad { List list = Ebean.find(Vehicle.class) - .select("licenseNumber") - .where().startsWith("licenseNumber","VZVZ") - .order().asc("licenseNumber") - .findList(); + .select("licenseNumber") + .where().startsWith("licenseNumber", "VZVZ") + .order().asc("licenseNumber") + .findList(); assertThat(list).hasSize(2); - Car car = (Car)list.get(0); + Car car = (Car) list.get(0); car.getNotes(); } } diff --git a/src/test/java/com/avaje/tests/inheritance/TestInheritanceJoins.java b/src/test/java/com/avaje/tests/inheritance/TestInheritanceJoins.java index d239b497a..acd8483bc 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestInheritanceJoins.java +++ b/src/test/java/com/avaje/tests/inheritance/TestInheritanceJoins.java @@ -1,117 +1,115 @@ package com.avaje.tests.inheritance; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.Query; import com.avaje.tests.inheritance.model.CalculationResult; import com.avaje.tests.inheritance.model.Configurations; import com.avaje.tests.inheritance.model.GroupConfiguration; import com.avaje.tests.inheritance.model.ProductConfiguration; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestInheritanceJoins extends BaseTestCase { - @Test - public void testAssocOne() { + @Test + public void testAssocOne() { - EbeanServer server = Ebean.getDefaultServer(); - - ProductConfiguration pc = new ProductConfiguration(); - pc.setName("PC1"); - server.save(pc); + EbeanServer server = Ebean.getDefaultServer(); - GroupConfiguration gc = new GroupConfiguration(); - gc.setName("GC1"); - server.save(gc); + ProductConfiguration pc = new ProductConfiguration(); + pc.setName("PC1"); + server.save(pc); - CalculationResult r = new CalculationResult(); - r.setCharge(100.0); - r.setProductConfiguration(pc); - r.setGroupConfiguration(gc); - server.save(r); - } + GroupConfiguration gc = new GroupConfiguration(); + gc.setName("GC1"); + server.save(gc); - @Test - public void assocOne_when_null() { + CalculationResult r = new CalculationResult(); + r.setCharge(100.0); + r.setProductConfiguration(pc); + r.setGroupConfiguration(gc); + server.save(r); + } - EbeanServer server = Ebean.getDefaultServer(); + @Test + public void assocOne_when_null() { - GroupConfiguration gc = new GroupConfiguration(); - gc.setName("GC1"); - server.save(gc); + EbeanServer server = Ebean.getDefaultServer(); - CalculationResult r = new CalculationResult(); - r.setCharge(100.0); + GroupConfiguration gc = new GroupConfiguration(); + gc.setName("GC1"); + server.save(gc); - // @ManyToOne with inheritance and null - r.setProductConfiguration(null); - r.setGroupConfiguration(gc); - server.save(r); + CalculationResult r = new CalculationResult(); + r.setCharge(100.0); - CalculationResult result = server.find(CalculationResult.class, r.getId()); + // @ManyToOne with inheritance and null + r.setProductConfiguration(null); + r.setGroupConfiguration(gc); + server.save(r); + + CalculationResult result = server.find(CalculationResult.class, r.getId()); + + GroupConfiguration group = result.getGroupConfiguration(); + Assert.assertEquals(group.getId(), gc.getId()); + } + + @Test + public void testAssocOneWithNullAssoc() { - GroupConfiguration group = result.getGroupConfiguration(); - Assert.assertEquals(group.getId(), gc.getId()); - } - - @Test - public void testAssocOneWithNullAssoc() { - /* Ensures the fetch join to a property with inheritance work as a left join */ - EbeanServer server = Ebean.getServer(null); - - final ProductConfiguration pc = new ProductConfiguration(); - pc.setName("PC1"); - server.save(pc); + EbeanServer server = Ebean.getServer(null); - CalculationResult r = new CalculationResult(); - final Double charge = 100.0; - r.setCharge(charge); - r.setProductConfiguration(pc); - r.setGroupConfiguration(null); - server.save(r); - } + final ProductConfiguration pc = new ProductConfiguration(); + pc.setName("PC1"); + server.save(pc); - @Test - public void testAssocMany() { - Configurations configurations = new Configurations(); - - EbeanServer server = Ebean.getServer(null); - - server.save(configurations); + CalculationResult r = new CalculationResult(); + final Double charge = 100.0; + r.setCharge(charge); + r.setProductConfiguration(pc); + r.setGroupConfiguration(null); + server.save(r); + } + + @Test + public void testAssocMany() { + Configurations configurations = new Configurations(); + + EbeanServer server = Ebean.getServer(null); + + server.save(configurations); - final GroupConfiguration gc = new GroupConfiguration("GC1"); - configurations.add(gc); - - - server.save(gc); - - - Configurations configurationsQueried = server.find(Configurations.class, configurations.getId()); - - List groups = configurationsQueried.getGroupConfigurations(); - - Assert.assertTrue(!groups.isEmpty()); - } + final GroupConfiguration gc = new GroupConfiguration("GC1"); + configurations.add(gc); - @Test - public void testAssocManyWithNoneRelated() { - Configurations configurations = new Configurations(); - - EbeanServer server = Ebean.getServer(null); - - server.save(configurations); - - Configurations configurationsQueried = server.find(Configurations.class).fetch("groupConfigurations").where().idEq(configurations.getId()).findUnique(); - - Assert.assertNotNull(configurationsQueried); - } - -} \ No newline at end of file + + server.save(gc); + + + Configurations configurationsQueried = server.find(Configurations.class, configurations.getId()); + + List groups = configurationsQueried.getGroupConfigurations(); + + Assert.assertTrue(!groups.isEmpty()); + } + + @Test + public void testAssocManyWithNoneRelated() { + Configurations configurations = new Configurations(); + + EbeanServer server = Ebean.getServer(null); + + server.save(configurations); + + Configurations configurationsQueried = server.find(Configurations.class).fetch("groupConfigurations").where().idEq(configurations.getId()).findUnique(); + + Assert.assertNotNull(configurationsQueried); + } + +} diff --git a/src/test/java/com/avaje/tests/inheritance/TestInheritanceOnMany.java b/src/test/java/com/avaje/tests/inheritance/TestInheritanceOnMany.java index 90d7abc60..1900c0167 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestInheritanceOnMany.java +++ b/src/test/java/com/avaje/tests/inheritance/TestInheritanceOnMany.java @@ -43,7 +43,7 @@ public class TestInheritanceOnMany extends BaseTestCase { AnimalShelter shelter2 = Ebean.find(AnimalShelter.class, shelter.getId()); List animals = shelter2.getAnimals(); - BeanList beanList = (BeanList)animals; + BeanList beanList = (BeanList) animals; ModifyListenMode modifyListenMode = beanList.getModifyListenMode(); assertNotNull(modifyListenMode); diff --git a/src/test/java/com/avaje/tests/inheritance/TestInheritanceRawSql.java b/src/test/java/com/avaje/tests/inheritance/TestInheritanceRawSql.java index 7ced4d957..75a19eb0a 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestInheritanceRawSql.java +++ b/src/test/java/com/avaje/tests/inheritance/TestInheritanceRawSql.java @@ -1,52 +1,51 @@ package com.avaje.tests.inheritance; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.RawSql; import com.avaje.ebean.RawSqlBuilder; import com.avaje.tests.model.basic.Truck; import com.avaje.tests.model.basic.Vehicle; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestInheritanceRawSql extends BaseTestCase { @Test public void test() { - + Truck truck = new Truck(); truck.setCapacity(50D); truck.setLicenseNumber("ASB23"); - + Ebean.save(truck); - - + + String sql = "select dtype, id, license_number from vehicle where id = :id"; RawSqlBuilder rawSqlBuilder = RawSqlBuilder.parse(sql); - + RawSql rawSql = rawSqlBuilder.create(); - + List list = Ebean.find(Vehicle.class) - .setRawSql(rawSql) - .setParameter("id", truck.getId()) - .findList(); - + .setRawSql(rawSql) + .setParameter("id", truck.getId()) + .findList(); + Assert.assertEquals(1, list.size()); - + Vehicle vehicle2 = list.get(0); Assert.assertTrue(vehicle2 instanceof Truck); - Truck truck2 = (Truck)vehicle2; + Truck truck2 = (Truck) vehicle2; Assert.assertEquals("ASB23", truck2.getLicenseNumber()); - + // invoke lazy loading and set the capacity truck2.setCapacity(30D); - + // and now save Ebean.save(truck2); } - + } diff --git a/src/test/java/com/avaje/tests/inheritance/TestIntInherit.java b/src/test/java/com/avaje/tests/inheritance/TestIntInherit.java index 735519c06..20714f2d3 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestIntInherit.java +++ b/src/test/java/com/avaje/tests/inheritance/TestIntInherit.java @@ -1,48 +1,47 @@ package com.avaje.tests.inheritance; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.TIntChild; import com.avaje.tests.model.basic.TIntRoot; +import org.junit.Assert; +import org.junit.Test; public class TestIntInherit extends BaseTestCase { @Test - public void testMe() { + 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); + + } - 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); - - } - } diff --git a/src/test/java/com/avaje/tests/inheritance/TestSkippable.java b/src/test/java/com/avaje/tests/inheritance/TestSkippable.java index b30a33868..40e2657fe 100644 --- a/src/test/java/com/avaje/tests/inheritance/TestSkippable.java +++ b/src/test/java/com/avaje/tests/inheritance/TestSkippable.java @@ -1,73 +1,72 @@ package com.avaje.tests.inheritance; -import org.junit.Assert; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Assert; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestSkippable extends BaseTestCase { private static final Logger logger = LoggerFactory.getLogger(TestSkippable.class); - /** - * Test query. - *

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

- */ + /** + * Test query. + *

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

+ */ @Test - 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); - logger.info(" -- seeded data"); - - final ListAttribute listAttributeDB = Ebean.find(ListAttribute.class, listAttribute.getId()); - Assert.assertNotNull(listAttributeDB); + public void testQuery() { - final ListAttributeValue value1_DB = listAttributeDB.getValues().iterator().next(); - Assert.assertTrue(value1.getId().equals(value1_DB.getId())); + // 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); + logger.info(" -- seeded data"); + + 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())); logger.info(" -- asserted data in db"); - - - final AttributeHolder holder = new AttributeHolder(); - holder.add(listAttributeDB); - - Ebean.save(holder); - logger.info(" -- saved 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); - logger.info(" -- M2M detected delete of value1 and add of value2 ?"); - - final ListAttribute listAttributeDB_2 = Ebean.find(ListAttribute.class, listAttributeDB.getId()); - Assert.assertNotNull(listAttributeDB_2); - final ListAttributeValue value2_DB_2 = listAttributeDB_2.getValues().iterator().next(); - - + + final AttributeHolder holder = new AttributeHolder(); + holder.add(listAttributeDB); + + Ebean.save(holder); + logger.info(" -- saved 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); + logger.info(" -- M2M detected delete of value1 and add of value2 ?"); + + + 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.assertEquals(value2.getId(), value2_DB_2.getId()); - Assert.assertTrue("Cascade failed", value2.getId().equals(value2_DB_2.getId())); - - } + Assert.assertTrue("Cascade failed", value2.getId().equals(value2_DB_2.getId())); + + } } diff --git a/src/test/java/com/avaje/tests/inheritance/cache/TestInheritanceCache.java b/src/test/java/com/avaje/tests/inheritance/cache/TestInheritanceCache.java index 9007f999a..26c05b1de 100644 --- a/src/test/java/com/avaje/tests/inheritance/cache/TestInheritanceCache.java +++ b/src/test/java/com/avaje/tests/inheritance/cache/TestInheritanceCache.java @@ -22,14 +22,14 @@ public class TestInheritanceCache extends BaseTestCase { Ebean.save(one); CInhRoot gotOne = Ebean.find(CInhRoot.class) - .setId(one.getId()) - .findUnique(); + .setId(one.getId()) + .findUnique(); assertThat(gotOne).isInstanceOf(CInhOne.class); CInhRoot gotOneFromCache = Ebean.find(CInhRoot.class) - .setId(one.getId()) - .findUnique(); + .setId(one.getId()) + .findUnique(); assertThat(gotOneFromCache).isInstanceOf(CInhOne.class); diff --git a/src/test/java/com/avaje/tests/inheritance/company/domain/AbstractBar.java b/src/test/java/com/avaje/tests/inheritance/company/domain/AbstractBar.java index 4baf6556e..1f79ff2f3 100644 --- a/src/test/java/com/avaje/tests/inheritance/company/domain/AbstractBar.java +++ b/src/test/java/com/avaje/tests/inheritance/company/domain/AbstractBar.java @@ -24,38 +24,38 @@ import javax.persistence.Version; //@MappedSuperclass public abstract class AbstractBar { - @Id - @GeneratedValue - private int barId; + @Id + @GeneratedValue + private int barId; - @ManyToOne(optional = false, fetch = FetchType.LAZY) - @JoinColumn(name = "foo_id", nullable = false) - private Foo foo; + @ManyToOne(optional = false, fetch = FetchType.LAZY) + @JoinColumn(name = "foo_id", nullable = false) + private Foo foo; - @Version - private int version; + @Version + private int version; - public void setBarId(int barId) { - this.barId = barId; - } + public void setBarId(int barId) { + this.barId = barId; + } - public int getBarId() { - return barId; - } + public int getBarId() { + return barId; + } - public Foo getFoo() { - return foo; - } + public Foo getFoo() { + return foo; + } - public void setFoo(Foo foo) { - this.foo = foo; - } + public void setFoo(Foo foo) { + this.foo = foo; + } - public int getVersion() { - return version; - } + public int getVersion() { + return version; + } - public void setVersion(int version) { - this.version = version; - } + public void setVersion(int version) { + this.version = version; + } } diff --git a/src/test/java/com/avaje/tests/inheritance/company/domain/Foo.java b/src/test/java/com/avaje/tests/inheritance/company/domain/Foo.java index af26530f1..e7fa432ba 100644 --- a/src/test/java/com/avaje/tests/inheritance/company/domain/Foo.java +++ b/src/test/java/com/avaje/tests/inheritance/company/domain/Foo.java @@ -12,36 +12,36 @@ import javax.persistence.Version; @Entity @Table(name = "foo") public class Foo { - @Id - @GeneratedValue - private int fooId; + @Id + @GeneratedValue + private int fooId; - private String importantText; + private String importantText; - @Version - private int version; + @Version + private int version; - public void setFooId(int fooId) { - this.fooId = fooId; - } + public void setFooId(int fooId) { + this.fooId = fooId; + } - public int getFooId() { - return fooId; - } + public int getFooId() { + return fooId; + } - public String getImportantText() { - return importantText; - } + public String getImportantText() { + return importantText; + } - public void setImportantText(String importantText) { - this.importantText = importantText; - } + public void setImportantText(String importantText) { + this.importantText = importantText; + } - public int getVersion() { - return version; - } + public int getVersion() { + return version; + } - public void setVersion(int version) { - this.version = version; - } + public void setVersion(int version) { + this.version = version; + } } diff --git a/src/test/java/com/avaje/tests/inheritance/company/domain/TestInheritAbstract.java b/src/test/java/com/avaje/tests/inheritance/company/domain/TestInheritAbstract.java index 120c78e17..a6ecbd779 100644 --- a/src/test/java/com/avaje/tests/inheritance/company/domain/TestInheritAbstract.java +++ b/src/test/java/com/avaje/tests/inheritance/company/domain/TestInheritAbstract.java @@ -9,44 +9,44 @@ import java.util.List; public class TestInheritAbstract extends TestCase { - public void testMe() { + public void testMe() { + + EbeanServer server = Ebean.getServer(null); + + List list0 = server.find(AbstractBar.class) + .findList(); + + Assert.assertNotNull(list0); + + List list1 = server.find(AbstractBar.class) + .fetch("foo", "importantText") + .findList(); + + Assert.assertNotNull(list1); + + Foo f = new Foo(); + f.setImportantText("blah"); + + server.save(f); + + ConcreteBar cb = new ConcreteBar(); + cb.setFoo(f); + server.save(cb); + + List list2 = server.find(AbstractBar.class) + .fetch("foo", "importantText") + .findList(); + + Assert.assertNotNull(list2); + Assert.assertTrue(!list2.isEmpty()); + + for (AbstractBar abstractBar : list2) { + Foo foo = abstractBar.getFoo(); + String importantText = foo.getImportantText(); + Assert.assertNotNull(importantText); + } + + + } - EbeanServer server = Ebean.getServer(null); - - List list0 = server.find(AbstractBar.class) - .findList(); - - Assert.assertNotNull(list0); - - List list1 = server.find(AbstractBar.class) - .fetch("foo", "importantText") - .findList(); - - Assert.assertNotNull(list1); - - Foo f = new Foo(); - f.setImportantText("blah"); - - server.save(f); - - ConcreteBar cb = new ConcreteBar(); - cb.setFoo(f); - server.save(cb); - - List list2 = server.find(AbstractBar.class) - .fetch("foo", "importantText") - .findList(); - - Assert.assertNotNull(list2); - Assert.assertTrue(!list2.isEmpty()); - - for (AbstractBar abstractBar : list2) { - Foo foo = abstractBar.getFoo(); - String importantText = foo.getImportantText(); - Assert.assertNotNull(importantText); - } - - - } - } diff --git a/src/test/java/com/avaje/tests/inheritance/model/AbstractBaseClass.java b/src/test/java/com/avaje/tests/inheritance/model/AbstractBaseClass.java index 482a995cb..3545ddc24 100644 --- a/src/test/java/com/avaje/tests/inheritance/model/AbstractBaseClass.java +++ b/src/test/java/com/avaje/tests/inheritance/model/AbstractBaseClass.java @@ -4,13 +4,13 @@ import javax.persistence.MappedSuperclass; @MappedSuperclass public class AbstractBaseClass { - private String name; + private String name; - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } } diff --git a/src/test/java/com/avaje/tests/inheritance/model/CalculationResult.java b/src/test/java/com/avaje/tests/inheritance/model/CalculationResult.java index 76830e0c8..68966ad81 100644 --- a/src/test/java/com/avaje/tests/inheritance/model/CalculationResult.java +++ b/src/test/java/com/avaje/tests/inheritance/model/CalculationResult.java @@ -8,48 +8,48 @@ import javax.persistence.ManyToOne; @Entity public class CalculationResult { - - @Id - @Column(name="id") - private Integer id; - - private double charge; - - @ManyToOne(cascade=CascadeType.PERSIST) - private ProductConfiguration productConfiguration; - @ManyToOne(cascade=CascadeType.PERSIST) - private GroupConfiguration groupConfiguration; - - public double getCharge() { - return charge; - } + @Id + @Column(name = "id") + private Integer id; - public void setCharge(double charge) { - this.charge = charge; - } + private double charge; - public ProductConfiguration getProductConfiguration() { - return productConfiguration; - } + @ManyToOne(cascade = CascadeType.PERSIST) + private ProductConfiguration productConfiguration; - public void setProductConfiguration(ProductConfiguration productConfiguration) { - this.productConfiguration = productConfiguration; - } + @ManyToOne(cascade = CascadeType.PERSIST) + private GroupConfiguration groupConfiguration; - public GroupConfiguration getGroupConfiguration() { - return groupConfiguration; - } + public double getCharge() { + return charge; + } - public void setGroupConfiguration(GroupConfiguration groupConfiguration) { - this.groupConfiguration = groupConfiguration; - } + public void setCharge(double charge) { + this.charge = charge; + } - public Integer getId() { - return id; - } + public ProductConfiguration getProductConfiguration() { + return productConfiguration; + } - public void setId(Integer id) { - this.id = id; - } + public void setProductConfiguration(ProductConfiguration productConfiguration) { + this.productConfiguration = productConfiguration; + } + + public GroupConfiguration getGroupConfiguration() { + return groupConfiguration; + } + + public void setGroupConfiguration(GroupConfiguration groupConfiguration) { + this.groupConfiguration = groupConfiguration; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } } diff --git a/src/test/java/com/avaje/tests/inheritance/model/Configuration.java b/src/test/java/com/avaje/tests/inheritance/model/Configuration.java index 66700b2fa..79a994669 100644 --- a/src/test/java/com/avaje/tests/inheritance/model/Configuration.java +++ b/src/test/java/com/avaje/tests/inheritance/model/Configuration.java @@ -13,35 +13,35 @@ import javax.persistence.ManyToOne; @ChangeLog @Entity -@Inheritance(strategy=InheritanceType.SINGLE_TABLE) -@DiscriminatorColumn(name="type", discriminatorType=DiscriminatorType.STRING) -public class Configuration extends AbstractBaseClass{ - @Id - @Column(name="id") - private Integer id; - - - @ManyToOne - private Configurations configurations; - - - public Configuration(){ - super(); - } - - public Integer getId() { - return id; - } +@Inheritance(strategy = InheritanceType.SINGLE_TABLE) +@DiscriminatorColumn(name = "type", discriminatorType = DiscriminatorType.STRING) +public class Configuration extends AbstractBaseClass { + @Id + @Column(name = "id") + private Integer id; - public void setId(Integer id) { - this.id = id; - } - public Configurations getConfigurations() { - return configurations; - } + @ManyToOne + private Configurations configurations; - public void setConfigurations(Configurations configurations) { - this.configurations = configurations; - } + + public Configuration() { + super(); + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Configurations getConfigurations() { + return configurations; + } + + public void setConfigurations(Configurations configurations) { + this.configurations = configurations; + } } diff --git a/src/test/java/com/avaje/tests/inheritance/model/Configurations.java b/src/test/java/com/avaje/tests/inheritance/model/Configurations.java index 2664c9c3e..485541f8a 100644 --- a/src/test/java/com/avaje/tests/inheritance/model/Configurations.java +++ b/src/test/java/com/avaje/tests/inheritance/model/Configurations.java @@ -1,11 +1,10 @@ package com.avaje.tests.inheritance.model; -import java.util.List; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToMany; +import java.util.List; @Entity public class Configurations { diff --git a/src/test/java/com/avaje/tests/inheritance/model/GroupConfiguration.java b/src/test/java/com/avaje/tests/inheritance/model/GroupConfiguration.java index 808819c03..71ca65e87 100644 --- a/src/test/java/com/avaje/tests/inheritance/model/GroupConfiguration.java +++ b/src/test/java/com/avaje/tests/inheritance/model/GroupConfiguration.java @@ -1,41 +1,40 @@ package com.avaje.tests.inheritance.model; -import java.util.List; - import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; import javax.persistence.OneToMany; +import java.util.List; @Entity @DiscriminatorValue("2") public class GroupConfiguration extends Configuration { - private String groupName; - - @OneToMany(mappedBy="groupConfiguration") - private List results; - - public GroupConfiguration(){ - super(); - } - - public GroupConfiguration(String name){ - super(); - this.groupName = name; - } - - public String getGroupName() { - return groupName; - } + private String groupName; - public void setGroupName(String groupName) { - this.groupName = groupName; - } + @OneToMany(mappedBy = "groupConfiguration") + private List results; - public List getResults() { - return results; - } + public GroupConfiguration() { + super(); + } - public void setResults(List results) { - this.results = results; - } + public GroupConfiguration(String name) { + super(); + this.groupName = name; + } + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + public List getResults() { + return results; + } + + public void setResults(List results) { + this.results = results; + } } diff --git a/src/test/java/com/avaje/tests/inheritance/model/ProductConfiguration.java b/src/test/java/com/avaje/tests/inheritance/model/ProductConfiguration.java index bc1dd6a84..b5968f921 100644 --- a/src/test/java/com/avaje/tests/inheritance/model/ProductConfiguration.java +++ b/src/test/java/com/avaje/tests/inheritance/model/ProductConfiguration.java @@ -1,36 +1,35 @@ package com.avaje.tests.inheritance.model; -import java.util.List; - import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; import javax.persistence.OneToMany; +import java.util.List; @Entity @DiscriminatorValue("1") public class ProductConfiguration extends Configuration { - private String productName; - - @OneToMany(mappedBy="productConfiguration") - private List results; - - public ProductConfiguration(){ - super(); - } + private String productName; - public String getProductName() { - return productName; - } + @OneToMany(mappedBy = "productConfiguration") + private List results; - public void setProductName(String productName) { - this.productName = productName; - } + public ProductConfiguration() { + super(); + } - public List getResults() { - return results; - } + public String getProductName() { + return productName; + } - public void setResults(List results) { - this.results = results; - } + public void setProductName(String productName) { + this.productName = productName; + } + + public List getResults() { + return results; + } + + public void setResults(List results) { + this.results = results; + } } diff --git a/src/test/java/com/avaje/tests/insert/MainDbCopy.java b/src/test/java/com/avaje/tests/insert/MainDbCopy.java index cfd57e8d1..6860193ca 100644 --- a/src/test/java/com/avaje/tests/insert/MainDbCopy.java +++ b/src/test/java/com/avaje/tests/insert/MainDbCopy.java @@ -7,23 +7,23 @@ import com.avaje.tests.model.basic.EBasic.Status; public class MainDbCopy { - public static void main(String[] args) { - - EbeanServer defaultServer = Ebean.getServer(null); - - EBasic e = new EBasic(); - e.setName("blah"); - e.setStatus(Status.NEW); - e.setDescription(null); - - defaultServer.save(e); - - EBasic e1 = defaultServer.find(EBasic.class, e.getId()); - - EbeanServer serverDest = Ebean.getServer("mysql"); - - serverDest.insert(e1); - - - } + public static void main(String[] args) { + + EbeanServer defaultServer = Ebean.getServer(null); + + EBasic e = new EBasic(); + e.setName("blah"); + e.setStatus(Status.NEW); + e.setDescription(null); + + defaultServer.save(e); + + EBasic e1 = defaultServer.find(EBasic.class, e.getId()); + + EbeanServer serverDest = Ebean.getServer("mysql"); + + serverDest.insert(e1); + + + } } diff --git a/src/test/java/com/avaje/tests/insert/TestInsertCollection.java b/src/test/java/com/avaje/tests/insert/TestInsertCollection.java index 6ff223931..ec7d5cff5 100644 --- a/src/test/java/com/avaje/tests/insert/TestInsertCollection.java +++ b/src/test/java/com/avaje/tests/insert/TestInsertCollection.java @@ -1,43 +1,42 @@ package com.avaje.tests.insert; -import java.util.ArrayList; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Customer; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; public class TestInsertCollection extends BaseTestCase { @Test public void test() { - + Customer cust1 = new Customer(); cust1.setName("jim"); - + Customer cust2 = new Customer(); cust2.setName("bob"); - + List customers = new ArrayList<>(); customers.add(cust1); customers.add(cust2); - + Ebean.insertAll(customers); - + Assert.assertNotNull(cust1.getId()); Assert.assertNotNull(cust2.getId()); - + Customer cust1Check = Ebean.find(Customer.class, cust1.getId()); Assert.assertEquals(cust1.getName(), cust1Check.getName()); Customer cust2Check = Ebean.find(Customer.class, cust2.getId()); Assert.assertEquals(cust2.getName(), cust2Check.getName()); - + cust1.setName("jim-changed"); cust2.setName("bob-changed"); - + Ebean.updateAll(customers); awaitL2Cache(); @@ -54,7 +53,7 @@ public class TestInsertCollection extends BaseTestCase { List saveList = new ArrayList<>(); saveList.add(cust1Check2); saveList.add(cust3); - + Ebean.saveAll(saveList); awaitL2Cache(); @@ -77,7 +76,6 @@ public class TestInsertCollection extends BaseTestCase { Assert.assertNull(Ebean.find(Customer.class, cust3.getId())); } - - - + + } diff --git a/src/test/java/com/avaje/tests/insert/TestInsertOnStringKey.java b/src/test/java/com/avaje/tests/insert/TestInsertOnStringKey.java index 16f83ee1b..0078679ce 100644 --- a/src/test/java/com/avaje/tests/insert/TestInsertOnStringKey.java +++ b/src/test/java/com/avaje/tests/insert/TestInsertOnStringKey.java @@ -1,35 +1,34 @@ package com.avaje.tests.insert; +import com.avaje.ebean.BaseTestCase; +import com.avaje.ebean.Ebean; +import com.avaje.tests.model.orderentity.OrderEntity; +import com.avaje.tests.model.orderentity.OrderItemEntity; +import org.junit.Test; + import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Random; -import org.junit.Test; - -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.tests.model.orderentity.OrderEntity; -import com.avaje.tests.model.orderentity.OrderItemEntity; - public class TestInsertOnStringKey extends BaseTestCase { @Test public void test() { - - + + OrderEntity orderEntity = new OrderEntity(); - orderEntity.setId("anyOrderId"+new Random().nextInt()); - + orderEntity.setId("anyOrderId" + new Random().nextInt()); + OrderItemEntity orderItemEntity = new OrderItemEntity(); - orderItemEntity.setId("anyOrderItemId"+new Random().nextInt()); + orderItemEntity.setId("anyOrderItemId" + new Random().nextInt()); orderItemEntity.setVariantId("anyVariantId"); orderItemEntity.setAmount(BigDecimal.ONE); - + orderEntity.setItems(toList(orderItemEntity)); - + Ebean.save(orderEntity); - + } private List toList(OrderItemEntity orderItemEntity) { @@ -37,5 +36,5 @@ public class TestInsertOnStringKey extends BaseTestCase { list.add(orderItemEntity); return list; } - + } diff --git a/src/test/java/com/avaje/tests/iud/TestCarWheelIud.java b/src/test/java/com/avaje/tests/iud/TestCarWheelIud.java index 69bb66d88..5962e7c9f 100644 --- a/src/test/java/com/avaje/tests/iud/TestCarWheelIud.java +++ b/src/test/java/com/avaje/tests/iud/TestCarWheelIud.java @@ -13,44 +13,44 @@ import java.util.List; public class TestCarWheelIud extends BaseTestCase { @Test - public void test() { + public void test() { - Car car = new Car(); + Car car = new Car(); - Tire t1 = new Tire(); - Wheel w1 = new Wheel(); - w1.setCar(car); - w1.setTire(t1); + Tire t1 = new Tire(); + Wheel w1 = new Wheel(); + w1.setCar(car); + w1.setTire(t1); - Tire t2 = new Tire(); - Wheel w2 = new Wheel(); - w2.setCar(car); - w2.setTire(t2); + Tire t2 = new Tire(); + Wheel w2 = new Wheel(); + w2.setCar(car); + w2.setTire(t2); - Tire t3 = new Tire(); - Wheel w3 = new Wheel(); - w3.setCar(car); - w3.setTire(t3); + Tire t3 = new Tire(); + Wheel w3 = new Wheel(); + w3.setCar(car); + w3.setTire(t3); - Tire t4 = new Tire(); - Wheel w4 = new Wheel(); - w4.setCar(car); - w4.setTire(t4); - - List wheels = new ArrayList<>(); - wheels.add(w1); - wheels.add(w2); - wheels.add(w3); - wheels.add(w4); - - car.setWheels(wheels); + Tire t4 = new Tire(); + Wheel w4 = new Wheel(); + w4.setCar(car); + w4.setTire(t4); - Ebean.save(car); + List wheels = new ArrayList<>(); + wheels.add(w1); + wheels.add(w2); + wheels.add(w3); + wheels.add(w4); - // And I'm trying to delete this entry with code: - Car car2 = Ebean.find(Car.class, car.getId()); + car.setWheels(wheels); - Ebean.delete(car2); + Ebean.save(car); - } + // And I'm trying to delete this entry with code: + Car car2 = Ebean.find(Car.class, car.getId()); + + Ebean.delete(car2); + + } } diff --git a/src/test/java/com/avaje/tests/iud/TestInsertQueryUpdate.java b/src/test/java/com/avaje/tests/iud/TestInsertQueryUpdate.java index e4eaf5894..a80090543 100644 --- a/src/test/java/com/avaje/tests/iud/TestInsertQueryUpdate.java +++ b/src/test/java/com/avaje/tests/iud/TestInsertQueryUpdate.java @@ -1,34 +1,33 @@ package com.avaje.tests.iud; -import java.util.Set; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.BeanState; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.EBasicVer; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Set; public class TestInsertQueryUpdate extends BaseTestCase { - + @Test public void test() { - + EBasicVer e0 = new EBasicVer("name0"); e0.setDescription("desc0"); Ebean.save(e0); - + EBasicVer e1 = Ebean.find(EBasicVer.class) - .select("name") - .setId(e0.getId()) - .findUnique(); - + .select("name") + .setId(e0.getId()) + .findUnique(); + BeanState beanState = Ebean.getBeanState(e1); Set loadedProps = beanState.getLoadedProps(); Assert.assertFalse(loadedProps.contains("description")); //lastUpdate - + e1.setName("name1"); Ebean.save(e1); diff --git a/src/test/java/com/avaje/tests/iud/TestInsertUpdateTrans.java b/src/test/java/com/avaje/tests/iud/TestInsertUpdateTrans.java index 6c71a44ab..d5bbdf3a7 100644 --- a/src/test/java/com/avaje/tests/iud/TestInsertUpdateTrans.java +++ b/src/test/java/com/avaje/tests/iud/TestInsertUpdateTrans.java @@ -1,45 +1,44 @@ package com.avaje.tests.iud; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.EBasicVer; +import org.junit.Assert; +import org.junit.Test; public class TestInsertUpdateTrans extends BaseTestCase { @Test - public void test() { + public void test() { - Ebean.beginTransaction(); - try { + Ebean.beginTransaction(); + try { - EBasicVer e0 = new EBasicVer("onInsert"); - e0.setDescription("something"); - Ebean.save(e0); + EBasicVer e0 = new EBasicVer("onInsert"); + e0.setDescription("something"); + Ebean.save(e0); - Assert.assertNotNull(e0.getId()); - Assert.assertNotNull(e0.getLastUpdate()); - Assert.assertEquals("onInsert", e0.getName()); - - e0.setName("onUpdate"); - e0.setDescription("differentFromInsert"); - - Ebean.save(e0); - - EBasicVer e1 = Ebean.find(EBasicVer.class, e0.getId()); - - // we should fetch back the updated data (not inserted) - Assert.assertEquals(e0.getId(), e1.getId()); - Assert.assertEquals("onUpdate", e1.getName()); - Assert.assertEquals("differentFromInsert", e1.getDescription()); - - - Ebean.commitTransaction(); - - } finally { - Ebean.endTransaction(); - } - } + Assert.assertNotNull(e0.getId()); + Assert.assertNotNull(e0.getLastUpdate()); + Assert.assertEquals("onInsert", e0.getName()); + + e0.setName("onUpdate"); + e0.setDescription("differentFromInsert"); + + Ebean.save(e0); + + EBasicVer e1 = Ebean.find(EBasicVer.class, e0.getId()); + + // we should fetch back the updated data (not inserted) + Assert.assertEquals(e0.getId(), e1.getId()); + Assert.assertEquals("onUpdate", e1.getName()); + Assert.assertEquals("differentFromInsert", e1.getDescription()); + + + Ebean.commitTransaction(); + + } finally { + Ebean.endTransaction(); + } + } } diff --git a/src/test/java/com/avaje/tests/json/TestDbJson_List.java b/src/test/java/com/avaje/tests/json/TestDbJson_List.java index c1496d339..c751f4057 100644 --- a/src/test/java/com/avaje/tests/json/TestDbJson_List.java +++ b/src/test/java/com/avaje/tests/json/TestDbJson_List.java @@ -13,10 +13,7 @@ import java.util.List; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class TestDbJson_List extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/json/TestJsonNodeBasic.java b/src/test/java/com/avaje/tests/json/TestJsonNodeBasic.java index e6ad3d8dd..462adaf70 100644 --- a/src/test/java/com/avaje/tests/json/TestJsonNodeBasic.java +++ b/src/test/java/com/avaje/tests/json/TestJsonNodeBasic.java @@ -69,7 +69,7 @@ public class TestJsonNodeBasic extends BaseTestCase { // parse JSON into whole bean with content EBasicJsonNode beanJsonRestored = Ebean.json().toBean(EBasicJsonNode.class, fullBeanJson); - assertEquals(99L,beanJsonRestored.getContent().path("docId").asLong()); + assertEquals(99L, beanJsonRestored.getContent().path("docId").asLong()); } @Test @@ -87,9 +87,9 @@ public class TestJsonNodeBasic extends BaseTestCase { Ebean.save(bean); EBasicJsonNode bean1 = Ebean.find(EBasicJsonNode.class) - .select("name") - .setId(bean.getId()) - .findUnique(); + .select("name") + .setId(bean.getId()) + .findUnique(); Set loadedProps = Ebean.getBeanState(bean1).getLoadedProps(); assertTrue(loadedProps.contains("name")); diff --git a/src/test/java/com/avaje/tests/json/TestJsonNodeBlob.java b/src/test/java/com/avaje/tests/json/TestJsonNodeBlob.java index 1bbd17c21..353594e17 100644 --- a/src/test/java/com/avaje/tests/json/TestJsonNodeBlob.java +++ b/src/test/java/com/avaje/tests/json/TestJsonNodeBlob.java @@ -54,9 +54,9 @@ public class TestJsonNodeBlob extends BaseTestCase { Ebean.save(bean); EBasicJsonNodeBlob bean1 = Ebean.find(EBasicJsonNodeBlob.class) - .select("name") - .setId(bean.getId()) - .findUnique(); + .select("name") + .setId(bean.getId()) + .findUnique(); Set loadedProps = Ebean.getBeanState(bean1).getLoadedProps(); assertTrue(loadedProps.contains("name")); diff --git a/src/test/java/com/avaje/tests/json/TestJsonNodeJsonb.java b/src/test/java/com/avaje/tests/json/TestJsonNodeJsonb.java index ab455814b..b9215f5c9 100644 --- a/src/test/java/com/avaje/tests/json/TestJsonNodeJsonb.java +++ b/src/test/java/com/avaje/tests/json/TestJsonNodeJsonb.java @@ -54,9 +54,9 @@ public class TestJsonNodeJsonb extends BaseTestCase { Ebean.save(bean); EBasicJsonNodeJsonB bean1 = Ebean.find(EBasicJsonNodeJsonB.class) - .select("name") - .setId(bean.getId()) - .findUnique(); + .select("name") + .setId(bean.getId()) + .findUnique(); Set loadedProps = Ebean.getBeanState(bean1).getLoadedProps(); assertTrue(loadedProps.contains("name")); diff --git a/src/test/java/com/avaje/tests/json/TestJsonNodeVarchar.java b/src/test/java/com/avaje/tests/json/TestJsonNodeVarchar.java index b4b341154..4b1ebab0b 100644 --- a/src/test/java/com/avaje/tests/json/TestJsonNodeVarchar.java +++ b/src/test/java/com/avaje/tests/json/TestJsonNodeVarchar.java @@ -54,9 +54,9 @@ public class TestJsonNodeVarchar extends BaseTestCase { Ebean.save(bean); EBasicJsonNodeVarchar bean1 = Ebean.find(EBasicJsonNodeVarchar.class) - .select("name") - .setId(bean.getId()) - .findUnique(); + .select("name") + .setId(bean.getId()) + .findUnique(); Set loadedProps = Ebean.getBeanState(bean1).getLoadedProps(); assertTrue(loadedProps.contains("name")); diff --git a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyList.java b/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyList.java index 2e6901c58..f6e018c40 100644 --- a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyList.java +++ b/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptyList.java @@ -4,7 +4,6 @@ import com.avaje.ebean.Ebean; import com.avaje.ebean.config.JsonConfig; import com.avaje.ebean.text.json.JsonWriteOptions; import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.OrderDetail; import org.junit.Test; import java.util.ArrayList; diff --git a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptySet.java b/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptySet.java index bdf677d1f..2e35c79b2 100644 --- a/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptySet.java +++ b/src/test/java/com/avaje/tests/json/include/TestJsonExcludeEmptySet.java @@ -3,7 +3,6 @@ package com.avaje.tests.json.include; import com.avaje.ebean.Ebean; import com.avaje.ebean.config.JsonConfig; import com.avaje.ebean.text.json.JsonWriteOptions; -import com.avaje.tests.model.basic.Attribute; import com.avaje.tests.model.basic.AttributeHolder; import org.junit.Test; diff --git a/src/test/java/com/avaje/tests/json/transientproperties/TestJacksonIgnore.java b/src/test/java/com/avaje/tests/json/transientproperties/TestJacksonIgnore.java index 321213be3..10ee9e890 100644 --- a/src/test/java/com/avaje/tests/json/transientproperties/TestJacksonIgnore.java +++ b/src/test/java/com/avaje/tests/json/transientproperties/TestJacksonIgnore.java @@ -3,9 +3,7 @@ package com.avaje.tests.json.transientproperties; import com.avaje.ebean.Ebean; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.*; public class TestJacksonIgnore { diff --git a/src/test/java/com/avaje/tests/json/transientproperties/TestTransientObjectProperty.java b/src/test/java/com/avaje/tests/json/transientproperties/TestTransientObjectProperty.java index de82de942..9f2d3ccfe 100644 --- a/src/test/java/com/avaje/tests/json/transientproperties/TestTransientObjectProperty.java +++ b/src/test/java/com/avaje/tests/json/transientproperties/TestTransientObjectProperty.java @@ -14,10 +14,10 @@ public class TestTransientObjectProperty { EJsonTransientObject bean = Ebean.json().toBean(EJsonTransientObject.class, rawJson); - assertEquals("entityBeanName",bean.getName()); - assertEquals(true,bean.getBasic()); - assertEquals("transientBeanName",bean.getSomeBean().name); - assertEquals("foo",bean.getSomeBean().baz); + assertEquals("entityBeanName", bean.getName()); + assertEquals(true, bean.getBasic()); + assertEquals("transientBeanName", bean.getSomeBean().name); + assertEquals("foo", bean.getSomeBean().baz); String asJson = Ebean.json().toJson(bean); diff --git a/src/test/java/com/avaje/tests/level/Level1.java b/src/test/java/com/avaje/tests/level/Level1.java index b01bac056..9a0812265 100644 --- a/src/test/java/com/avaje/tests/level/Level1.java +++ b/src/test/java/com/avaje/tests/level/Level1.java @@ -1,56 +1,61 @@ package com.avaje.tests.level; -import javax.persistence.*; +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; import java.util.Set; @Entity public class Level1 { - @Id - Long id; + @Id + Long id; - @ManyToMany(cascade = CascadeType.ALL) - @JoinTable( - name = "level1_level4", - joinColumns = @JoinColumn(name = "level1_id", referencedColumnName = "id"), - inverseJoinColumns = @JoinColumn(name = "level4_id", referencedColumnName = "id") - ) - Set level4s; + @ManyToMany(cascade = CascadeType.ALL) + @JoinTable( + name = "level1_level4", + joinColumns = @JoinColumn(name = "level1_id", referencedColumnName = "id"), + inverseJoinColumns = @JoinColumn(name = "level4_id", referencedColumnName = "id") + ) + Set level4s; - @ManyToMany(cascade = CascadeType.ALL) - @JoinTable( - name = "level1_level2", - joinColumns = @JoinColumn(name = "level1_id", referencedColumnName = "id"), - inverseJoinColumns = @JoinColumn(name = "level2_id", referencedColumnName = "id") - ) - Set level2s; + @ManyToMany(cascade = CascadeType.ALL) + @JoinTable( + name = "level1_level2", + joinColumns = @JoinColumn(name = "level1_id", referencedColumnName = "id"), + inverseJoinColumns = @JoinColumn(name = "level2_id", referencedColumnName = "id") + ) + Set level2s; - String name; + String name; - public Level1(String name) { - this.name = name; - } + public Level1(String name) { + this.name = name; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public Set getLevel2s() { - return level2s; - } + public Set getLevel2s() { + return level2s; + } - public Set getLevel4s() { - return level4s; - } + public Set getLevel4s() { + return level4s; + } } diff --git a/src/test/java/com/avaje/tests/level/Level2.java b/src/test/java/com/avaje/tests/level/Level2.java index 2b3eda913..8243a343d 100644 --- a/src/test/java/com/avaje/tests/level/Level2.java +++ b/src/test/java/com/avaje/tests/level/Level2.java @@ -1,44 +1,49 @@ package com.avaje.tests.level; -import javax.persistence.*; +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; import java.util.List; @Entity public class Level2 { - @Id - Long id; + @Id + Long id; - @ManyToMany(cascade = {CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}) - @JoinTable( - name = "level2_level3", - joinColumns = @JoinColumn(name = "level2_id", referencedColumnName = "id"), - inverseJoinColumns = @JoinColumn(name = "level3_id", referencedColumnName = "id") - ) - List level3s; + @ManyToMany(cascade = {CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}) + @JoinTable( + name = "level2_level3", + joinColumns = @JoinColumn(name = "level2_id", referencedColumnName = "id"), + inverseJoinColumns = @JoinColumn(name = "level3_id", referencedColumnName = "id") + ) + List level3s; - String name; + String name; - public Level2(String name) { - this.name = name; - } + public Level2(String name) { + this.name = name; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public List getLevel3s() { - return level3s; - } + public List getLevel3s() { + return level3s; + } } diff --git a/src/test/java/com/avaje/tests/level/Level3.java b/src/test/java/com/avaje/tests/level/Level3.java index 74a38fa74..37f8198ff 100644 --- a/src/test/java/com/avaje/tests/level/Level3.java +++ b/src/test/java/com/avaje/tests/level/Level3.java @@ -5,28 +5,28 @@ import javax.persistence.Id; @Entity public class Level3 { - @Id - Long id; + @Id + Long id; - String name; + String name; - public Level3(String name) { - this.name = name; - } + public Level3(String name) { + this.name = name; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } } diff --git a/src/test/java/com/avaje/tests/level/Level4.java b/src/test/java/com/avaje/tests/level/Level4.java index 72f2c306d..5408512e5 100644 --- a/src/test/java/com/avaje/tests/level/Level4.java +++ b/src/test/java/com/avaje/tests/level/Level4.java @@ -5,28 +5,28 @@ import javax.persistence.Id; @Entity public class Level4 { - @Id - Long id; + @Id + Long id; - String name; + String name; - public Level4(String name) { - this.name = name; - } + public Level4(String name) { + this.name = name; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } } diff --git a/src/test/java/com/avaje/tests/level/test/ManyToManyTest.java b/src/test/java/com/avaje/tests/level/test/ManyToManyTest.java index 08a34f022..27fff78b0 100644 --- a/src/test/java/com/avaje/tests/level/test/ManyToManyTest.java +++ b/src/test/java/com/avaje/tests/level/test/ManyToManyTest.java @@ -66,30 +66,30 @@ public class ManyToManyTest extends BaseTestCase { // this query had the original problem List things = Ebean.find(Level1.class) - .fetch("level4s") - .fetch("level2s") - .fetch("level2s.level3s") - .order().asc("id") - .findList(); + .fetch("level4s") + .fetch("level2s") + .fetch("level2s.level3s") + .order().asc("id") + .findList(); validateObjectGraph(i, ii, iii, one, two, x1, x2, x3, x4, x5, things); things = Ebean.find(Level1.class) - .fetch("level2s") - .fetch("level2s.level3s") - .fetch("level4s") - .order().asc("id") - .findList(); + .fetch("level2s") + .fetch("level2s.level3s") + .fetch("level4s") + .order().asc("id") + .findList(); validateObjectGraph(i, ii, iii, one, two, x1, x2, x3, x4, x5, things); things = Ebean.find(Level1.class) - .fetch("level2s") - .fetch("level4s") - .order().asc("id") - .findList(); + .fetch("level2s") + .fetch("level4s") + .order().asc("id") + .findList(); validateObjectGraph(i, ii, iii, one, two, x1, x2, x3, x4, x5, things); diff --git a/src/test/java/com/avaje/tests/lib/EbeanTestCase.java b/src/test/java/com/avaje/tests/lib/EbeanTestCase.java index dd6af6da9..71b3c4abc 100644 --- a/src/test/java/com/avaje/tests/lib/EbeanTestCase.java +++ b/src/test/java/com/avaje/tests/lib/EbeanTestCase.java @@ -1,43 +1,42 @@ package com.avaje.tests.lib; -import com.avaje.ebeaninternal.api.SpiEbeanServer; -import junit.framework.TestCase; -import junit.framework.TestResult; - import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.ebean.Transaction; +import com.avaje.ebeaninternal.api.SpiEbeanServer; +import junit.framework.TestCase; +import junit.framework.TestResult; /** * The base class for all Ebean test to get access to the Ebean server and do * some cleanup stuff after a test has run */ public abstract class EbeanTestCase extends TestCase { - - @Override - public void run(TestResult testResult) { - try { - super.run(testResult); - } finally { - Transaction tx = getServer().currentTransaction(); - if (tx != null && tx.isActive()) { - // transaction left running after the test, rollback it to make - // the environment ready for the next test - tx.rollback(); - } - } - } - public EbeanServer getServer() { - return Ebean.getServer(null); - } + @Override + public void run(TestResult testResult) { + try { + super.run(testResult); + } finally { + Transaction tx = getServer().currentTransaction(); + if (tx != null && tx.isActive()) { + // transaction left running after the test, rollback it to make + // the environment ready for the next test + tx.rollback(); + } + } + } + + public EbeanServer getServer() { + return Ebean.getServer(null); + } /** * MS SQL Server does not allow setting explicit values on identity columns * so tests that do this need to be skipped for SQL Server. */ public boolean isMsSqlServer() { - SpiEbeanServer spi = (SpiEbeanServer)Ebean.getDefaultServer(); + SpiEbeanServer spi = (SpiEbeanServer) Ebean.getDefaultServer(); return spi.getDatabasePlatform().getName().startsWith("mssqlserver"); } diff --git a/src/test/java/com/avaje/tests/lib/TestMessage.java b/src/test/java/com/avaje/tests/lib/TestMessage.java index 00c0b9024..164323d07 100644 --- a/src/test/java/com/avaje/tests/lib/TestMessage.java +++ b/src/test/java/com/avaje/tests/lib/TestMessage.java @@ -1,20 +1,19 @@ package com.avaje.tests.lib; +import com.avaje.ebeaninternal.server.core.Message; import org.junit.Assert; import org.junit.Test; -import com.avaje.ebeaninternal.server.core.Message; +public class TestMessage { -public class TestMessage { + @Test + public void testMessage() { - @Test - public void testMessage(){ - - String one = "one"; - String two = "two"; - - String m = Message.msg("fetch.error", one, two); - boolean b = m.startsWith("Query threw SQLException:one Query was:"); - Assert.assertTrue(b); - } + String one = "one"; + String two = "two"; + + String m = Message.msg("fetch.error", one, two); + boolean b = m.startsWith("Query threw SQLException:one Query was:"); + Assert.assertTrue(b); + } } diff --git a/src/test/java/com/avaje/tests/lifecycle/TestLifecycleAnnotatedBean.java b/src/test/java/com/avaje/tests/lifecycle/TestLifecycleAnnotatedBean.java index aab8519e7..81ddb2cf7 100644 --- a/src/test/java/com/avaje/tests/lifecycle/TestLifecycleAnnotatedBean.java +++ b/src/test/java/com/avaje/tests/lifecycle/TestLifecycleAnnotatedBean.java @@ -18,7 +18,7 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase { bean.setName("PrePersist"); Ebean.save(bean); - + assertThat(bean.getBuffer()).contains("prePersist1"); assertThat(bean.getBuffer()).contains("prePersist2"); } @@ -55,7 +55,7 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase { bean.setName("Persisted"); Ebean.save(bean); - + bean.setName("PreUpdate"); Ebean.save(bean); @@ -103,6 +103,7 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase { assertThat(bean.getBuffer()).contains("postRemove1"); assertThat(bean.getBuffer()).contains("postRemove2"); } + @Test public void shouldExecutePostConstructMethodsWhenFindingBean() { @@ -118,22 +119,21 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase { assertThat(loaded.getBuffer()).contains("postLoad1"); assertThat(loaded.getBuffer()).contains("postLoad2"); } - + @Test public void shouldExecutePostConstructMethodsWhenInstantiated() { EBasicWithLifecycle bean = Ebean.getDefaultServer().createEntityBean(EBasicWithLifecycle.class); bean.setName("PostConstruct"); - + assertThat(bean.getBuffer()).contains("postConstruct1"); assertThat(bean.getBuffer()).contains("postConstruct2"); // assert also that postLoad is not executed now assertThat(bean.getBuffer()).doesNotContain("postLoad1"); assertThat(bean.getBuffer()).doesNotContain("postLoad2"); } - - - + + @Test public void testLazyLoadBehaviour() { @@ -142,18 +142,18 @@ public class TestLifecycleAnnotatedBean extends BaseTestCase { Ebean.save(bean); - BeanDescriptor desc = ((SpiEbeanServer)server()).getBeanDescriptor(EBasicWithLifecycle.class); - EBasicWithLifecycle loaded = desc.createReference(false, false, bean.getId(), null); - + BeanDescriptor desc = ((SpiEbeanServer) server()).getBeanDescriptor(EBasicWithLifecycle.class); + EBasicWithLifecycle loaded = desc.createReference(false, false, bean.getId(), null); + // Here you see the big difference. // @PostLoad is executed always, also on lazy loaded beans assertThat(loaded.getBuffer()).contains("postConstruct1"); assertThat(loaded.getBuffer()).contains("postConstruct2"); - + // assert also that postLoad is not yet executed assertThat(loaded.getBuffer()).doesNotContain("postLoad1"); assertThat(loaded.getBuffer()).doesNotContain("postLoad2"); - + // now read name -> will load the bean assertThat(loaded.getName()).isEqualTo("LazyLoad"); assertThat(loaded.getBuffer()).contains("postLoad1"); diff --git a/src/test/java/com/avaje/tests/model/BaseModel.java b/src/test/java/com/avaje/tests/model/BaseModel.java index 8f28a7686..1dba311c2 100644 --- a/src/test/java/com/avaje/tests/model/BaseModel.java +++ b/src/test/java/com/avaje/tests/model/BaseModel.java @@ -1,24 +1,23 @@ package com.avaje.tests.model; -import java.sql.Timestamp; - -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; - import com.avaje.ebean.Model; import com.avaje.ebean.annotation.WhenCreated; import com.avaje.ebean.annotation.WhenModified; +import javax.persistence.Id; +import javax.persistence.MappedSuperclass; +import javax.persistence.Version; +import java.sql.Timestamp; + @MappedSuperclass public class BaseModel extends Model { @Id Long id; - + @Version Long version; - + @WhenCreated Timestamp whenCreated; diff --git a/src/test/java/com/avaje/tests/model/array/TestDbArray_basic.java b/src/test/java/com/avaje/tests/model/array/TestDbArray_basic.java index d93bd9e1b..1acc1b190 100644 --- a/src/test/java/com/avaje/tests/model/array/TestDbArray_basic.java +++ b/src/test/java/com/avaje/tests/model/array/TestDbArray_basic.java @@ -48,12 +48,12 @@ public class TestDbArray_basic extends BaseTestCase { if (isPostgres()) { Query query = Ebean.find(EArrayBean.class) - .where() - .arrayContains("otherIds", 96L, 97L) - .arrayContains("uids", bean.getUids().get(0)) - .arrayContains("phoneNumbers", "9823") - .arrayIsNotEmpty("phoneNumbers") - .query(); + .where() + .arrayContains("otherIds", 96L, 97L) + .arrayContains("uids", bean.getUids().get(0)) + .arrayContains("phoneNumbers", "9823") + .arrayIsNotEmpty("phoneNumbers") + .query(); List list = query.findList(); @@ -64,10 +64,10 @@ public class TestDbArray_basic extends BaseTestCase { assertThat(list).hasSize(1); query = Ebean.find(EArrayBean.class) - .where() - .arrayIsEmpty("otherIds") - .arrayNotContains("uids", bean.getUids().get(0)) - .query(); + .where() + .arrayIsEmpty("otherIds") + .arrayNotContains("uids", bean.getUids().get(0)) + .query(); query.findList(); assertThat(query.getGeneratedSql()).contains(" coalesce(cardinality(t0.other_ids),0) = 0"); @@ -146,4 +146,4 @@ public class TestDbArray_basic extends BaseTestCase { Ebean.saveAll(all); Ebean.deleteAll(all); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/basic/Address.java b/src/test/java/com/avaje/tests/model/basic/Address.java index aefa53bb5..2f9cf523f 100644 --- a/src/test/java/com/avaje/tests/model/basic/Address.java +++ b/src/test/java/com/avaje/tests/model/basic/Address.java @@ -1,5 +1,7 @@ package com.avaje.tests.model.basic; +import com.avaje.tests.model.basic.metaannotation.SizeMedium; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; @@ -7,9 +9,6 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; import javax.persistence.Version; import javax.validation.constraints.Size; - -import com.avaje.tests.model.basic.metaannotation.SizeMedium; - import java.sql.Timestamp; /** diff --git a/src/test/java/com/avaje/tests/model/basic/CKeyDetail.java b/src/test/java/com/avaje/tests/model/basic/CKeyDetail.java index 5a10edaac..e11eb8621 100644 --- a/src/test/java/com/avaje/tests/model/basic/CKeyDetail.java +++ b/src/test/java/com/avaje/tests/model/basic/CKeyDetail.java @@ -17,7 +17,7 @@ public class CKeyDetail { // @JoinColumn(name="parent_one_key", referencedColumnName="one_key"), // @JoinColumn(name="parent_two_key", referencedColumnName="two_key") // }) - CKeyParent parent; + CKeyParent parent; public CKeyDetail() { diff --git a/src/test/java/com/avaje/tests/model/basic/Car.java b/src/test/java/com/avaje/tests/model/basic/Car.java index 55a28ff99..e97ebccb7 100644 --- a/src/test/java/com/avaje/tests/model/basic/Car.java +++ b/src/test/java/com/avaje/tests/model/basic/Car.java @@ -22,6 +22,7 @@ public class Car extends Vehicle { LARGE("L"); String value; + Size(String value) { this.value = value; } diff --git a/src/test/java/com/avaje/tests/model/basic/Customer.java b/src/test/java/com/avaje/tests/model/basic/Customer.java index 2163bb330..ac22eeb47 100644 --- a/src/test/java/com/avaje/tests/model/basic/Customer.java +++ b/src/test/java/com/avaje/tests/model/basic/Customer.java @@ -30,12 +30,12 @@ import java.util.concurrent.locks.ReentrantLock; * Customer entity bean. */ @NamedQueries( - value = { - @NamedQuery(name = "name", query = "select(name) order by name"), - @NamedQuery(name = "withStatus", query = "select(name,status) order by name") - } + value = { + @NamedQuery(name = "name", query = "select(name) order by name"), + @NamedQuery(name = "withStatus", query = "select(name,status) order by name") + } ) -@NamedQuery(name="withContacts", query = "fetch contacts (firstName, lastName) where id = :id") +@NamedQuery(name = "withContacts", query = "fetch contacts (firstName, lastName) where id = :id") @Cache(enableQueryCache = true) @DocStore @ChangeLog(inserts = ChangeLogInsertMode.EXCLUDE, updatesThatInclude = {"name", "status"}) diff --git a/src/test/java/com/avaje/tests/model/basic/EBasicWithLifecycle.java b/src/test/java/com/avaje/tests/model/basic/EBasicWithLifecycle.java index f3fe13160..002c8d0b1 100644 --- a/src/test/java/com/avaje/tests/model/basic/EBasicWithLifecycle.java +++ b/src/test/java/com/avaje/tests/model/basic/EBasicWithLifecycle.java @@ -106,7 +106,7 @@ public class EBasicWithLifecycle { public void postConstruct2() { buffer.append("postConstruct2"); } - + public Long getId() { return id; } diff --git a/src/test/java/com/avaje/tests/model/basic/MyLobSize.java b/src/test/java/com/avaje/tests/model/basic/MyLobSize.java index e5ef2e7f2..10ba9f858 100644 --- a/src/test/java/com/avaje/tests/model/basic/MyLobSize.java +++ b/src/test/java/com/avaje/tests/model/basic/MyLobSize.java @@ -22,8 +22,8 @@ public class MyLobSize { @Basic(fetch = FetchType.LAZY) @Lob //@Length(max=65535) - //@Length(max=65536) - String myLob; + //@Length(max=65536) + String myLob; @OneToMany(mappedBy = "parent") List details; diff --git a/src/test/java/com/avaje/tests/model/basic/Order.java b/src/test/java/com/avaje/tests/model/basic/Order.java index 8db2097d4..c1f35cc6a 100644 --- a/src/test/java/com/avaje/tests/model/basic/Order.java +++ b/src/test/java/com/avaje/tests/model/basic/Order.java @@ -60,8 +60,8 @@ public class Order implements Serializable { */ @Transient @Formula( - select = "z_b${ta}.total_amount", - join = "join (select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) z_b${ta} on z_b${ta}.order_id = ${ta}.id") + select = "z_b${ta}.total_amount", + join = "join (select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) z_b${ta} on z_b${ta}.order_id = ${ta}.id") Double totalAmount; /** @@ -69,8 +69,8 @@ public class Order implements Serializable { */ @Transient @Formula( - select = "z_b${ta}.total_items", - join = "join (select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) z_b${ta} on z_b${ta}.order_id = ${ta}.id") + select = "z_b${ta}.total_items", + join = "join (select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) z_b${ta} on z_b${ta}.order_id = ${ta}.id") Integer totalItems; @Enumerated(value = EnumType.ORDINAL) diff --git a/src/test/java/com/avaje/tests/model/basic/ResetBasicData.java b/src/test/java/com/avaje/tests/model/basic/ResetBasicData.java index 5d441ee0a..07e5fbe20 100644 --- a/src/test/java/com/avaje/tests/model/basic/ResetBasicData.java +++ b/src/test/java/com/avaje/tests/model/basic/ResetBasicData.java @@ -2,7 +2,6 @@ package com.avaje.tests.model.basic; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; -import com.avaje.ebean.TxRunnable; import com.avaje.tests.model.basic.Order.Status; import java.sql.Date; diff --git a/src/test/java/com/avaje/tests/model/basic/Truck.java b/src/test/java/com/avaje/tests/model/basic/Truck.java index 8fed33456..43b6f12f4 100644 --- a/src/test/java/com/avaje/tests/model/basic/Truck.java +++ b/src/test/java/com/avaje/tests/model/basic/Truck.java @@ -20,6 +20,7 @@ public class Truck extends Vehicle { HUGE("H"); String value; + Size(String value) { this.value = value; } diff --git a/src/test/java/com/avaje/tests/model/basic/metaannotation/SizeMedium.java b/src/test/java/com/avaje/tests/model/basic/metaannotation/SizeMedium.java index 72ef9773d..a07afcc13 100644 --- a/src/test/java/com/avaje/tests/model/basic/metaannotation/SizeMedium.java +++ b/src/test/java/com/avaje/tests/model/basic/metaannotation/SizeMedium.java @@ -1,20 +1,20 @@ package com.avaje.tests.model.basic.metaannotation; +import javax.validation.constraints.Size; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.constraints.Size; - /** * Meta-Annotation that defines @Size(max=100) + * * @author Roland Praml, FOCONIS AG */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) @Documented -@Size(max=100) +@Size(max = 100) public @interface SizeMedium { -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/basic/xtra/TestDeleteUnloadedChildren.java b/src/test/java/com/avaje/tests/model/basic/xtra/TestDeleteUnloadedChildren.java index a3223937b..d1d516ae6 100644 --- a/src/test/java/com/avaje/tests/model/basic/xtra/TestDeleteUnloadedChildren.java +++ b/src/test/java/com/avaje/tests/model/basic/xtra/TestDeleteUnloadedChildren.java @@ -79,7 +79,7 @@ public class TestDeleteUnloadedChildren extends BaseTestCase { Ebean.beginTransaction(); try { EdExtendedParent extendedParent = Ebean.find(EdExtendedParent.class).where() - .eq("name", "My second computer").findUnique(); + .eq("name", "My second computer").findUnique(); extendedParent.getChildren().size(); Ebean.delete(extendedParent); Ebean.commitTransaction(); diff --git a/src/test/java/com/avaje/tests/model/bridge/BSiteUser.java b/src/test/java/com/avaje/tests/model/bridge/BSiteUser.java index ca6dc221e..949ec2ae0 100644 --- a/src/test/java/com/avaje/tests/model/bridge/BSiteUser.java +++ b/src/test/java/com/avaje/tests/model/bridge/BSiteUser.java @@ -39,10 +39,10 @@ public class BSiteUser { private BAccessLevel accessLevel; - @ManyToOne(optional=false) + @ManyToOne(optional = false) private final BSite site; - @ManyToOne(optional=false) + @ManyToOne(optional = false) private final BUser user; diff --git a/src/test/java/com/avaje/tests/model/bridge/BSiteUserB.java b/src/test/java/com/avaje/tests/model/bridge/BSiteUserB.java index cbb9fd80d..06b77acae 100644 --- a/src/test/java/com/avaje/tests/model/bridge/BSiteUserB.java +++ b/src/test/java/com/avaje/tests/model/bridge/BSiteUserB.java @@ -42,10 +42,10 @@ public class BSiteUserB { private BAccessLevel accessLevel; - @ManyToOne(optional=false) + @ManyToOne(optional = false) private final BSite site; - @ManyToOne(optional=false) + @ManyToOne(optional = false) private final BUser user; diff --git a/src/test/java/com/avaje/tests/model/bridge/BSiteUserC.java b/src/test/java/com/avaje/tests/model/bridge/BSiteUserC.java index 35823447a..ae50a78f7 100644 --- a/src/test/java/com/avaje/tests/model/bridge/BSiteUserC.java +++ b/src/test/java/com/avaje/tests/model/bridge/BSiteUserC.java @@ -40,11 +40,11 @@ public class BSiteUserC { private BAccessLevel accessLevel; - @ManyToOne(optional=false) + @ManyToOne(optional = false) @JoinColumn(name = "site_uid", insertable = false, updatable = false) private final BSite site; - @ManyToOne(optional=false) + @ManyToOne(optional = false) @JoinColumn(name = "user_uid", insertable = false, updatable = false) private final BUser user; diff --git a/src/test/java/com/avaje/tests/model/cache/EColAB.java b/src/test/java/com/avaje/tests/model/cache/EColAB.java index 3c6ec3b88..e6cae1c33 100644 --- a/src/test/java/com/avaje/tests/model/cache/EColAB.java +++ b/src/test/java/com/avaje/tests/model/cache/EColAB.java @@ -7,7 +7,7 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -@Cache(enableQueryCache=true) +@Cache(enableQueryCache = true) @Entity @Table(name = "e_col_ab") public class EColAB extends Model { @@ -47,4 +47,4 @@ public class EColAB extends Model { public void setColumnB(String columnB) { this.columnB = columnB; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/carwheel/Car.java b/src/test/java/com/avaje/tests/model/carwheel/Car.java index 49997922c..d1f3a5445 100644 --- a/src/test/java/com/avaje/tests/model/carwheel/Car.java +++ b/src/test/java/com/avaje/tests/model/carwheel/Car.java @@ -1,7 +1,5 @@ package com.avaje.tests.model.carwheel; -import java.util.List; - import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -10,43 +8,44 @@ import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; import javax.persistence.Version; +import java.util.List; @Entity @Table(name = "sa_car") public class Car { - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE) - protected Long id; + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + protected Long id; - @Version - private int version; + @Version + private int version; - @OneToMany(mappedBy = "car", cascade = CascadeType.ALL) - private List wheels; + @OneToMany(mappedBy = "car", cascade = CascadeType.ALL) + private List wheels; - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public int getVersion() { - return version; - } + public int getVersion() { + return version; + } - public void setVersion(int version) { - this.version = version; - } + public void setVersion(int version) { + this.version = version; + } - public List getWheels() { - return wheels; - } + public List getWheels() { + return wheels; + } - public void setWheels(List wheels) { - this.wheels = wheels; - } + public void setWheels(List wheels) { + this.wheels = wheels; + } } diff --git a/src/test/java/com/avaje/tests/model/carwheel/Tire.java b/src/test/java/com/avaje/tests/model/carwheel/Tire.java index 8a5ef7191..71e195828 100644 --- a/src/test/java/com/avaje/tests/model/carwheel/Tire.java +++ b/src/test/java/com/avaje/tests/model/carwheel/Tire.java @@ -11,27 +11,27 @@ import javax.persistence.Version; @Table(name = "sa_tire") public class Tire { - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE) - protected Long id; + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + protected Long id; - @Version - private int version; + @Version + private int version; - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public int getVersion() { - return version; - } + public int getVersion() { + return version; + } - public void setVersion(int version) { - this.version = version; - } + public void setVersion(int version) { + this.version = version; + } } diff --git a/src/test/java/com/avaje/tests/model/carwheel/Wheel.java b/src/test/java/com/avaje/tests/model/carwheel/Wheel.java index 611e35e67..df6613dbe 100644 --- a/src/test/java/com/avaje/tests/model/carwheel/Wheel.java +++ b/src/test/java/com/avaje/tests/model/carwheel/Wheel.java @@ -14,51 +14,51 @@ import javax.persistence.Version; @Table(name = "sa_wheel") public class Wheel { - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE) - protected Long id; + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + protected Long id; - @Version - private int version; + @Version + private int version; - @ManyToOne(cascade = CascadeType.ALL) - @JoinColumn(name = "tire") - private Tire tire; + @ManyToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "tire") + private Tire tire; - @ManyToOne(cascade = CascadeType.ALL) - @JoinColumn(name = "car") - private Car car; + @ManyToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "car") + private Car car; - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public int getVersion() { - return version; - } + public int getVersion() { + return version; + } - public void setVersion(int version) { - this.version = version; - } + public void setVersion(int version) { + this.version = version; + } - public Tire getTire() { - return tire; - } + public Tire getTire() { + return tire; + } - public void setTire(Tire tire) { - this.tire = tire; - } + public void setTire(Tire tire) { + this.tire = tire; + } - public Car getCar() { - return car; - } + public Car getCar() { + return car; + } - public void setCar(Car car) { - this.car = car; - } + public void setCar(Car car) { + this.car = car; + } } diff --git a/src/test/java/com/avaje/tests/model/carwheeltruck/TCar.java b/src/test/java/com/avaje/tests/model/carwheeltruck/TCar.java index 24749a664..5c3464b80 100644 --- a/src/test/java/com/avaje/tests/model/carwheeltruck/TCar.java +++ b/src/test/java/com/avaje/tests/model/carwheeltruck/TCar.java @@ -1,7 +1,5 @@ package com.avaje.tests.model.carwheeltruck; -import java.util.List; - import javax.persistence.CascadeType; import javax.persistence.DiscriminatorColumn; import javax.persistence.DiscriminatorValue; @@ -10,6 +8,7 @@ import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.OneToMany; +import java.util.List; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/src/test/java/com/avaje/tests/model/carwheeltruck/TTruck.java b/src/test/java/com/avaje/tests/model/carwheeltruck/TTruck.java index babe2df8e..b54138581 100644 --- a/src/test/java/com/avaje/tests/model/carwheeltruck/TTruck.java +++ b/src/test/java/com/avaje/tests/model/carwheeltruck/TTruck.java @@ -8,12 +8,12 @@ import javax.persistence.Inheritance; import javax.persistence.InheritanceType; @Entity -@Inheritance(strategy=InheritanceType.SINGLE_TABLE) -@DiscriminatorColumn(name="type") +@Inheritance(strategy = InheritanceType.SINGLE_TABLE) +@DiscriminatorColumn(name = "type") @DiscriminatorValue("truck") public class TTruck extends TCar { - @Column(name="truckLoad") + @Column(name = "truckLoad") Long load; public Long getLoad() { @@ -23,5 +23,5 @@ public class TTruck extends TCar { public void setLoad(Long load) { this.load = load; } - + } diff --git a/src/test/java/com/avaje/tests/model/carwheeltruck/TWheel.java b/src/test/java/com/avaje/tests/model/carwheeltruck/TWheel.java index 9c8acd1d9..ec6cb040f 100644 --- a/src/test/java/com/avaje/tests/model/carwheeltruck/TWheel.java +++ b/src/test/java/com/avaje/tests/model/carwheeltruck/TWheel.java @@ -10,7 +10,7 @@ public class TWheel { @Id Long id; - @ManyToOne(optional=false) + @ManyToOne(optional = false) TCar owner; public Long getId() { @@ -27,6 +27,6 @@ public class TWheel { public void setOwner(TCar owner) { this.owner = owner; - } - + } + } diff --git a/src/test/java/com/avaje/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java b/src/test/java/com/avaje/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java index 4525b7cfd..df68e66f7 100644 --- a/src/test/java/com/avaje/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java +++ b/src/test/java/com/avaje/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java @@ -1,9 +1,8 @@ package com.avaje.tests.model.carwheeltruck; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; +import org.junit.Test; import java.util.Random; @@ -13,7 +12,7 @@ public class TestTruckCarWheelInhertiance extends BaseTestCase { public void test() { TTruck truck = new TTruck(); - truck.setPlateNo("foo-"+new Random().nextInt()); + truck.setPlateNo("foo-" + new Random().nextInt()); TWheel wheel = new TWheel(); wheel.setOwner(truck); diff --git a/src/test/java/com/avaje/tests/model/composite/RCustomer.java b/src/test/java/com/avaje/tests/model/composite/RCustomer.java index 5d0c69243..8e9ecf819 100644 --- a/src/test/java/com/avaje/tests/model/composite/RCustomer.java +++ b/src/test/java/com/avaje/tests/model/composite/RCustomer.java @@ -5,40 +5,39 @@ import javax.persistence.EmbeddedId; import javax.persistence.Entity; /** - * * @author rnentjes */ @Entity public class RCustomer { - @EmbeddedId - private RCustomerKey key; + @EmbeddedId + private RCustomerKey key; - private String description; + private String description; - public RCustomer() { - } + public RCustomer() { + } - public RCustomer(RCustomerKey key, String description) { - this.key = key; - this.description = description; - } + public RCustomer(RCustomerKey key, String description) { + this.key = key; + this.description = description; + } - public String getDescription() { - return description; - } + public String getDescription() { + return description; + } - public void setDescription(String description) { - this.description = description; - } + public void setDescription(String description) { + this.description = description; + } - public RCustomerKey getKey() { - return key; - } + public RCustomerKey getKey() { + return key; + } - public void setKey(RCustomerKey key) { - this.key = key; - } + public void setKey(RCustomerKey key) { + this.key = key; + } } diff --git a/src/test/java/com/avaje/tests/model/composite/RCustomerKey.java b/src/test/java/com/avaje/tests/model/composite/RCustomerKey.java index 0da66fee8..afe0c5c63 100644 --- a/src/test/java/com/avaje/tests/model/composite/RCustomerKey.java +++ b/src/test/java/com/avaje/tests/model/composite/RCustomerKey.java @@ -4,62 +4,59 @@ package com.avaje.tests.model.composite; import javax.persistence.Embeddable; @Embeddable -public class RCustomerKey -{ - private String company; - private String name; +public class RCustomerKey { + private String company; + private String name; - public RCustomerKey() { + public RCustomerKey() { + } + + public RCustomerKey(String company, String name) { + this.company = company; + this.name = name; + } + + public String getCompany() { + return company; + } + + public void setCompany(String company) { + this.company = company; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; } - - public RCustomerKey(String company, String name) { - this.company = company; - this.name = name; + if (getClass() != obj.getClass()) { + return false; } - - public String getCompany() { - return company; + final RCustomerKey other = (RCustomerKey) obj; + if ((this.company == null) ? (other.company != null) : !this.company.equals(other.company)) { + return false; } - - public void setCompany(String company) { - this.company = company; + if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) { + return false; } + return true; + } - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final RCustomerKey other = (RCustomerKey) obj; - if ((this.company == null) ? (other.company != null) : !this.company.equals(other.company)) { - return false; - } - if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) { - return false; - } - return true; - } - - @Override - public int hashCode() { - int hash = 3; - hash = 89 * hash + (this.company != null ? this.company.hashCode() : 0); - hash = 89 * hash + (this.name != null ? this.name.hashCode() : 0); - return hash; - } - - + @Override + public int hashCode() { + int hash = 3; + hash = 89 * hash + (this.company != null ? this.company.hashCode() : 0); + hash = 89 * hash + (this.name != null ? this.name.hashCode() : 0); + return hash; + } } diff --git a/src/test/java/com/avaje/tests/model/composite/ROrder.java b/src/test/java/com/avaje/tests/model/composite/ROrder.java index 10466c06a..4c38d692a 100644 --- a/src/test/java/com/avaje/tests/model/composite/ROrder.java +++ b/src/test/java/com/avaje/tests/model/composite/ROrder.java @@ -11,101 +11,100 @@ import javax.persistence.Table; /** - * * @author rnentjes */ @Entity -@Table(name="r_orders") +@Table(name = "r_orders") public class ROrder { - @EmbeddedId - protected ROrderPK orderPK; + @EmbeddedId + protected ROrderPK orderPK; - @ManyToOne(cascade=CascadeType.PERSIST) - @JoinColumns({ - @JoinColumn(name="company", referencedColumnName="company", insertable=false, updatable=false), - @JoinColumn(name="customerName", referencedColumnName="name", insertable=false, updatable=false) - }) - private RCustomer customer; + @ManyToOne(cascade = CascadeType.PERSIST) + @JoinColumns({ + @JoinColumn(name = "company", referencedColumnName = "company", insertable = false, updatable = false), + @JoinColumn(name = "customerName", referencedColumnName = "name", insertable = false, updatable = false) + }) + private RCustomer customer; - @Column(name="customerName") - private String customerName; + @Column(name = "customerName") + private String customerName; - private String item; + private String item; - public ROrder() { - this(new ROrderPK()); - } + public ROrder() { + this(new ROrderPK()); + } - public ROrder(ROrderPK orderPK) { - this(orderPK, null); - } + public ROrder(ROrderPK orderPK) { + this(orderPK, null); + } - public ROrder(ROrderPK orderPK, String item) { - this.orderPK = orderPK; - this.item = item; - } + public ROrder(ROrderPK orderPK, String item) { + this.orderPK = orderPK; + this.item = item; + } - public ROrder(ROrderPK orderPK, String item, RCustomer customer) { - this.orderPK = orderPK; - this.item = item; - setCustomer(customer); - } + public ROrder(ROrderPK orderPK, String item, RCustomer customer) { + this.orderPK = orderPK; + this.item = item; + setCustomer(customer); + } - public ROrderPK getOrderPK() { - return orderPK; - } + public ROrderPK getOrderPK() { + return orderPK; + } - public void setOrderPK(ROrderPK orderPK) { - this.orderPK = orderPK; - } + public void setOrderPK(ROrderPK orderPK) { + this.orderPK = orderPK; + } - public String getItem() { - return item; - } + public String getItem() { + return item; + } - public void setItem(String item) { - this.item = item; - } + public void setItem(String item) { + this.item = item; + } - public RCustomer getCustomer() { - return customer; - } + public RCustomer getCustomer() { + return customer; + } - public String getCustomerName() { - return customerName; - } + public String getCustomerName() { + return customerName; + } - public void setCustomer(RCustomer customer) { - this.customer = customer; + public void setCustomer(RCustomer customer) { + this.customer = customer; // if (customer == null) { // customerName = null; // } else { // customerName = customer.getKey().getName(); // } - } + } - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final ROrder other = (ROrder) obj; - if (this.orderPK != other.orderPK && (this.orderPK == null || !this.orderPK.equals(other.orderPK))) { - return false; - } - return true; + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; } + if (getClass() != obj.getClass()) { + return false; + } + final ROrder other = (ROrder) obj; + if (this.orderPK != other.orderPK && (this.orderPK == null || !this.orderPK.equals(other.orderPK))) { + return false; + } + return true; + } - @Override - public int hashCode() { - int hash = 3; - hash = 29 * hash + (this.orderPK != null ? this.orderPK.hashCode() : 0); - return hash; - } + @Override + public int hashCode() { + int hash = 3; + hash = 29 * hash + (this.orderPK != null ? this.orderPK.hashCode() : 0); + return hash; + } } diff --git a/src/test/java/com/avaje/tests/model/composite/ROrderPK.java b/src/test/java/com/avaje/tests/model/composite/ROrderPK.java index 66fc6031b..6bb1c57c1 100644 --- a/src/test/java/com/avaje/tests/model/composite/ROrderPK.java +++ b/src/test/java/com/avaje/tests/model/composite/ROrderPK.java @@ -4,68 +4,67 @@ package com.avaje.tests.model.composite; import javax.persistence.Embeddable; /** - * * @author rnentjes */ @Embeddable public class ROrderPK { - private static final long serialVersionUID = 7632735517186104883L; + private static final long serialVersionUID = 7632735517186104883L; - private String company; - private Integer orderNumber; + private String company; + private Integer orderNumber; - public ROrderPK() { - this(null,null); + public ROrderPK() { + this(null, null); + } + + public ROrderPK(String company, Integer orderNumber) { + this.company = company; + this.orderNumber = orderNumber; + } + + public Integer getOrderNumber() { + return orderNumber; + } + + public void setOrderNumber(Integer orderNumber) { + this.orderNumber = orderNumber; + } + + public String getCompany() { + return company; + } + + public void setCompany(String company) { + this.company = company; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; } - - public ROrderPK(String company, Integer orderNumber) { - this.company = company; - this.orderNumber = orderNumber; + if (getClass() != obj.getClass()) { + return false; } - - public Integer getOrderNumber() { - return orderNumber; + final ROrderPK other = (ROrderPK) obj; + if ((this.company == null) ? (other.company != null) : !this.company.equals(other.company)) { + return false; } - - public void setOrderNumber(Integer orderNumber) { - this.orderNumber = orderNumber; + if (this.orderNumber == null || !this.orderNumber.equals(other.orderNumber)) { + return false; } + return true; + } - public String getCompany() { - return company; - } - - public void setCompany(String company) { - this.company = company; - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final ROrderPK other = (ROrderPK) obj; - if ((this.company == null) ? (other.company != null) : !this.company.equals(other.company)) { - return false; - } - if (this.orderNumber == null || !this.orderNumber.equals(other.orderNumber)) { - return false; - } - return true; - } - - @Override - public int hashCode() { - int hash = 3; - hash = 73 * hash + (this.company != null ? this.company.hashCode() : 0); - hash = 73 * hash + (this.orderNumber != null ? this.orderNumber.hashCode() : 0); - return hash; - } + @Override + public int hashCode() { + int hash = 3; + hash = 73 * hash + (this.company != null ? this.company.hashCode() : 0); + hash = 73 * hash + (this.orderNumber != null ? this.orderNumber.hashCode() : 0); + return hash; + } - } +} diff --git a/src/test/java/com/avaje/tests/model/converstation/Conversation.java b/src/test/java/com/avaje/tests/model/converstation/Conversation.java index b33d8b843..7bd9023e3 100644 --- a/src/test/java/com/avaje/tests/model/converstation/Conversation.java +++ b/src/test/java/com/avaje/tests/model/converstation/Conversation.java @@ -1,30 +1,33 @@ package com.avaje.tests.model.converstation; -import java.util.List; - -import javax.persistence.*; - import com.avaje.tests.model.BaseModel; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import java.util.List; + @Entity -@Table(name="c_conversation") +@Table(name = "c_conversation") public class Conversation extends BaseModel { String title; - @Column(name="isopen") + @Column(name = "isopen") boolean open; - + @ManyToOne Group group; - - @OneToMany(mappedBy="conversation") + + @OneToMany(mappedBy = "conversation") List participants; - - @OneToMany(mappedBy="conversation") + + @OneToMany(mappedBy = "conversation") List messages; - + public String getTitle() { return title; } @@ -56,5 +59,5 @@ public class Conversation extends BaseModel { public void setMessages(List messages) { this.messages = messages; } - + } diff --git a/src/test/java/com/avaje/tests/model/converstation/Group.java b/src/test/java/com/avaje/tests/model/converstation/Group.java index 4359d5ea4..2a5d2ff13 100644 --- a/src/test/java/com/avaje/tests/model/converstation/Group.java +++ b/src/test/java/com/avaje/tests/model/converstation/Group.java @@ -1,24 +1,23 @@ package com.avaje.tests.model.converstation; -import java.util.List; +import com.avaje.tests.model.BaseModel; import javax.persistence.Entity; import javax.persistence.OneToMany; import javax.persistence.Table; - -import com.avaje.tests.model.BaseModel; +import java.util.List; @Entity -@Table(name="c_group") +@Table(name = "c_group") public class Group extends BaseModel { boolean inactive; - + String name; - @OneToMany(mappedBy="group") + @OneToMany(mappedBy = "group") List users; - + public boolean isInactive() { return inactive; } @@ -42,5 +41,5 @@ public class Group extends BaseModel { public void setUsers(List users) { this.users = users; } - + } diff --git a/src/test/java/com/avaje/tests/model/converstation/Message.java b/src/test/java/com/avaje/tests/model/converstation/Message.java index ec0b34ebe..52af3bb58 100644 --- a/src/test/java/com/avaje/tests/model/converstation/Message.java +++ b/src/test/java/com/avaje/tests/model/converstation/Message.java @@ -1,26 +1,26 @@ package com.avaje.tests.model.converstation; +import com.avaje.tests.model.BaseModel; + import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.Table; -import com.avaje.tests.model.BaseModel; - @Entity -@Table(name="c_message") +@Table(name = "c_message") public class Message extends BaseModel { String title; - + String body; - + @ManyToOne Conversation conversation; - + @ManyToOne User user; - + public Conversation getConversation() { return conversation; } @@ -52,5 +52,5 @@ public class Message extends BaseModel { public void setUser(User user) { this.user = user; } - + } diff --git a/src/test/java/com/avaje/tests/model/converstation/Participation.java b/src/test/java/com/avaje/tests/model/converstation/Participation.java index 0cf30b28d..ba96b09ac 100644 --- a/src/test/java/com/avaje/tests/model/converstation/Participation.java +++ b/src/test/java/com/avaje/tests/model/converstation/Participation.java @@ -1,30 +1,30 @@ package com.avaje.tests.model.converstation; +import com.avaje.tests.model.BaseModel; + import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.Table; -import com.avaje.tests.model.BaseModel; - @Entity -@Table(name="c_participation") +@Table(name = "c_participation") public class Participation extends BaseModel { public enum Type { Moderator, Member } - + Integer rating; - + Type type; - - @ManyToOne(optional=false) + + @ManyToOne(optional = false) Conversation conversation; - - @ManyToOne(optional=false) + + @ManyToOne(optional = false) User user; - + public Conversation getConversation() { return conversation; } @@ -56,5 +56,5 @@ public class Participation extends BaseModel { public void setUser(User user) { this.user = user; } - + } diff --git a/src/test/java/com/avaje/tests/model/ddd/DExhEntity.java b/src/test/java/com/avaje/tests/model/ddd/DExhEntity.java index e002e79d2..a8117a7a3 100644 --- a/src/test/java/com/avaje/tests/model/ddd/DExhEntity.java +++ b/src/test/java/com/avaje/tests/model/ddd/DExhEntity.java @@ -1,47 +1,46 @@ package com.avaje.tests.model.ddd; -import java.sql.Timestamp; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; - import com.avaje.tests.model.ivo.ExhangeCMoneyRate; import com.avaje.tests.model.ivo.Oid; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Version; +import java.sql.Timestamp; + @Entity public class DExhEntity { - @Id - Oid oid; - - ExhangeCMoneyRate exhange; + @Id + Oid oid; - @Version - Timestamp lastUpdated; + ExhangeCMoneyRate exhange; - public Oid getOid() { - return oid; - } + @Version + Timestamp lastUpdated; - public void setOid(Oid oid) { - this.oid = oid; - } + public Oid getOid() { + return oid; + } - public ExhangeCMoneyRate getExhange() { - return exhange; - } + public void setOid(Oid oid) { + this.oid = oid; + } - public void setExhange(ExhangeCMoneyRate exhange) { - this.exhange = exhange; - } + public ExhangeCMoneyRate getExhange() { + return exhange; + } - public Timestamp getLastUpdated() { - return lastUpdated; - } + public void setExhange(ExhangeCMoneyRate exhange) { + this.exhange = exhange; + } + + public Timestamp getLastUpdated() { + return lastUpdated; + } + + public void setLastUpdated(Timestamp lastUpdated) { + this.lastUpdated = lastUpdated; + } - public void setLastUpdated(Timestamp lastUpdated) { - this.lastUpdated = lastUpdated; - } - } diff --git a/src/test/java/com/avaje/tests/model/ddd/DPerson.java b/src/test/java/com/avaje/tests/model/ddd/DPerson.java index efa18b30d..4bf2d702d 100644 --- a/src/test/java/com/avaje/tests/model/ddd/DPerson.java +++ b/src/test/java/com/avaje/tests/model/ddd/DPerson.java @@ -1,83 +1,82 @@ package com.avaje.tests.model.ddd; -import javax.persistence.Entity; -import javax.persistence.Id; - -import org.joda.time.Interval; - import com.avaje.ebean.annotation.EmbeddedColumns; import com.avaje.tests.model.ivo.CMoney; import com.avaje.tests.model.ivo.Money; import com.avaje.tests.model.ivo.Oid; +import org.joda.time.Interval; + +import javax.persistence.Entity; +import javax.persistence.Id; @Entity public class DPerson { - @Id - Oid id; - - String firstName; - - String lastName; + @Id + Oid id; - Money salary; - - @EmbeddedColumns(columns="amount=a_amt, currency=a_curr") - CMoney cmoney; - - @EmbeddedColumns(columns="startMillis=i_start, endMillis=i_end") - Interval interval; - - public String toString() { - return id+" "+firstName+" "+lastName+" "+salary; - } - - public Oid getId() { - return id; - } + String firstName; - public void setId(Oid id) { - this.id = id; - } + String lastName; - public String getFirstName() { - return firstName; - } + Money salary; - public void setFirstName(String firstName) { - this.firstName = firstName; - } + @EmbeddedColumns(columns = "amount=a_amt, currency=a_curr") + CMoney cmoney; - public String getLastName() { - return lastName; - } + @EmbeddedColumns(columns = "startMillis=i_start, endMillis=i_end") + Interval interval; - public void setLastName(String lastName) { - this.lastName = lastName; - } + public String toString() { + return id + " " + firstName + " " + lastName + " " + salary; + } - public Money getSalary() { - return salary; - } + public Oid getId() { + return id; + } - public void setSalary(Money salary) { - this.salary = salary; - } + public void setId(Oid id) { + this.id = id; + } - public CMoney getCmoney() { - return cmoney; - } + public String getFirstName() { + return firstName; + } - public void setCmoney(CMoney cmoney) { - this.cmoney = cmoney; - } + public void setFirstName(String firstName) { + this.firstName = firstName; + } - public Interval getInterval() { - return interval; - } + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public Money getSalary() { + return salary; + } + + public void setSalary(Money salary) { + this.salary = salary; + } + + public CMoney getCmoney() { + return cmoney; + } + + public void setCmoney(CMoney cmoney) { + this.cmoney = cmoney; + } + + public Interval getInterval() { + return interval; + } + + public void setInterval(Interval interval) { + this.interval = interval; + } - public void setInterval(Interval interval) { - this.interval = interval; - } - } diff --git a/src/test/java/com/avaje/tests/model/draftable/Document.java b/src/test/java/com/avaje/tests/model/draftable/Document.java index ea7d184ff..0647d937b 100644 --- a/src/test/java/com/avaje/tests/model/draftable/Document.java +++ b/src/test/java/com/avaje/tests/model/draftable/Document.java @@ -31,7 +31,7 @@ public class Document extends BaseDomain { */ //@PrivateOwned @OneToMany(mappedBy = "document")//, cascade = CascadeType.ALL) - List media; + List media; public String getTitle() { return title; diff --git a/src/test/java/com/avaje/tests/model/draftable/Link.java b/src/test/java/com/avaje/tests/model/draftable/Link.java index 14f57d8a2..ae937c7cd 100644 --- a/src/test/java/com/avaje/tests/model/draftable/Link.java +++ b/src/test/java/com/avaje/tests/model/draftable/Link.java @@ -35,7 +35,8 @@ public class Link extends BaseDomain { /** * Draft reset to null on publish. */ - @DraftReset @Column(name = "link_comment") + @DraftReset + @Column(name = "link_comment") String comment; /** diff --git a/src/test/java/com/avaje/tests/model/embedded/EEmbDatePeriod.java b/src/test/java/com/avaje/tests/model/embedded/EEmbDatePeriod.java index cabc2a3e6..a96b6e9d0 100644 --- a/src/test/java/com/avaje/tests/model/embedded/EEmbDatePeriod.java +++ b/src/test/java/com/avaje/tests/model/embedded/EEmbDatePeriod.java @@ -1,28 +1,27 @@ package com.avaje.tests.model.embedded; -import java.util.Date; - import javax.persistence.Embeddable; +import java.util.Date; @Embeddable public class EEmbDatePeriod { - Date date1; - Date date2; + Date date1; + Date date2; - public Date getDate1() { - return date1; - } + public Date getDate1() { + return date1; + } - public void setDate1(Date date1) { - this.date1 = date1; - } + public void setDate1(Date date1) { + this.date1 = date1; + } - public Date getDate2() { - return date2; - } + public Date getDate2() { + return date2; + } - public void setDate2(Date date2) { - this.date2 = date2; - } + public void setDate2(Date date2) { + this.date2 = date2; + } } diff --git a/src/test/java/com/avaje/tests/model/embedded/EEmbInner.java b/src/test/java/com/avaje/tests/model/embedded/EEmbInner.java index 3d53220fb..6877732d1 100644 --- a/src/test/java/com/avaje/tests/model/embedded/EEmbInner.java +++ b/src/test/java/com/avaje/tests/model/embedded/EEmbInner.java @@ -10,46 +10,46 @@ import javax.persistence.Version; @Table(name = "eemb_inner") public class EEmbInner { - @Id - Integer id; - - String nomeInner; - - @Version - private int updateCount; + @Id + Integer id; - @ManyToOne - EEmbOuter outer; + String nomeInner; - public Integer getId() { - return id; - } + @Version + private int updateCount; - public void setId(Integer id) { - this.id = id; - } + @ManyToOne + EEmbOuter outer; - public String getNomeInner() { - return nomeInner; - } + public Integer getId() { + return id; + } - public void setNomeInner(String nomeInner) { - this.nomeInner = nomeInner; - } + public void setId(Integer id) { + this.id = id; + } - public EEmbOuter getOuter() { - return outer; - } + public String getNomeInner() { + return nomeInner; + } - public void setOuter(EEmbOuter outer) { - this.outer = outer; - } + public void setNomeInner(String nomeInner) { + this.nomeInner = nomeInner; + } - public int getUpdateCount() { - return updateCount; - } + public EEmbOuter getOuter() { + return outer; + } - public void setUpdateCount(int updateCount) { - this.updateCount = updateCount; - } + public void setOuter(EEmbOuter outer) { + this.outer = outer; + } + + public int getUpdateCount() { + return updateCount; + } + + public void setUpdateCount(int updateCount) { + this.updateCount = updateCount; + } } diff --git a/src/test/java/com/avaje/tests/model/embedded/EEmbOuter.java b/src/test/java/com/avaje/tests/model/embedded/EEmbOuter.java index 60b1d5c1f..c247ccf67 100644 --- a/src/test/java/com/avaje/tests/model/embedded/EEmbOuter.java +++ b/src/test/java/com/avaje/tests/model/embedded/EEmbOuter.java @@ -1,6 +1,6 @@ package com.avaje.tests.model.embedded; -import java.util.List; +import com.avaje.ebean.annotation.PrivateOwned; import javax.persistence.CascadeType; import javax.persistence.Embedded; @@ -9,62 +9,61 @@ import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; import javax.persistence.Version; - -import com.avaje.ebean.annotation.PrivateOwned; +import java.util.List; @Entity @Table(name = "eemb_outer") public class EEmbOuter { - @Id - Integer id; - String nomeOuter; - @Version - private int updateCount; + @Id + Integer id; + String nomeOuter; + @Version + private int updateCount; - @OneToMany(cascade = CascadeType.ALL) - @PrivateOwned - List inners; + @OneToMany(cascade = CascadeType.ALL) + @PrivateOwned + List inners; - @Embedded - EEmbDatePeriod datePeriod; + @Embedded + EEmbDatePeriod datePeriod; - public Integer getId() { - return id; - } + public Integer getId() { + return id; + } - public void setId(Integer id) { - this.id = id; - } + public void setId(Integer id) { + this.id = id; + } - public String getNomeOuter() { - return nomeOuter; - } + public String getNomeOuter() { + return nomeOuter; + } - public void setNomeOuter(String nomeOuter) { - this.nomeOuter = nomeOuter; - } + public void setNomeOuter(String nomeOuter) { + this.nomeOuter = nomeOuter; + } - public List getInners() { - return inners; - } + public List getInners() { + return inners; + } - public void setInners(List inners) { - this.inners = inners; - } + public void setInners(List inners) { + this.inners = inners; + } - public EEmbDatePeriod getDatePeriod() { - return datePeriod; - } + public EEmbDatePeriod getDatePeriod() { + return datePeriod; + } - public void setDatePeriod(EEmbDatePeriod datePeriod) { - this.datePeriod = datePeriod; - } + public void setDatePeriod(EEmbDatePeriod datePeriod) { + this.datePeriod = datePeriod; + } - public int getUpdateCount() { - return updateCount; - } + public int getUpdateCount() { + return updateCount; + } - public void setUpdateCount(int updateCount) { - this.updateCount = updateCount; - } + public void setUpdateCount(int updateCount) { + this.updateCount = updateCount; + } } diff --git a/src/test/java/com/avaje/tests/model/embedded/EInvoice.java b/src/test/java/com/avaje/tests/model/embedded/EInvoice.java index 0636d69d5..6ee555878 100644 --- a/src/test/java/com/avaje/tests/model/embedded/EInvoice.java +++ b/src/test/java/com/avaje/tests/model/embedded/EInvoice.java @@ -2,8 +2,6 @@ package com.avaje.tests.model.embedded; import com.avaje.ebean.annotation.Cache; -import java.util.Date; - import javax.persistence.AttributeOverride; import javax.persistence.AttributeOverrides; import javax.persistence.Column; @@ -12,6 +10,7 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.Version; +import java.util.Date; @Cache @Entity diff --git a/src/test/java/com/avaje/tests/model/embedded/EPerson.java b/src/test/java/com/avaje/tests/model/embedded/EPerson.java index fa122f0a3..131b2cc11 100644 --- a/src/test/java/com/avaje/tests/model/embedded/EPerson.java +++ b/src/test/java/com/avaje/tests/model/embedded/EPerson.java @@ -23,8 +23,8 @@ public class EPerson { @Embedded @AttributeOverrides({ - @AttributeOverride(name="city", column = @Column(name="addr_city")), - @AttributeOverride(name="status", column = @Column(name="addr_status")) + @AttributeOverride(name = "city", column = @Column(name = "addr_city")), + @AttributeOverride(name = "status", column = @Column(name = "addr_status")) }) EAddress address; diff --git a/src/test/java/com/avaje/tests/model/embedded/Eembeddable.java b/src/test/java/com/avaje/tests/model/embedded/Eembeddable.java index 225478d49..8af424cba 100644 --- a/src/test/java/com/avaje/tests/model/embedded/Eembeddable.java +++ b/src/test/java/com/avaje/tests/model/embedded/Eembeddable.java @@ -4,7 +4,7 @@ import javax.persistence.Embeddable; @Embeddable public class Eembeddable { - + String description; public String getDescription() { diff --git a/src/test/java/com/avaje/tests/model/embedded/PrimaryRevision.java b/src/test/java/com/avaje/tests/model/embedded/PrimaryRevision.java index c69c3a0b0..06f8f770c 100644 --- a/src/test/java/com/avaje/tests/model/embedded/PrimaryRevision.java +++ b/src/test/java/com/avaje/tests/model/embedded/PrimaryRevision.java @@ -13,7 +13,7 @@ public class PrimaryRevision { // @AttributeOverrides({ // @AttributeOverride(name="primaryId", column = @Column(name="id")) // }) - @AttributeOverride(name="primaryId", column = @Column(name="id")) + @AttributeOverride(name = "primaryId", column = @Column(name = "id")) private RevisionId revisionId; String name; diff --git a/src/test/java/com/avaje/tests/model/family/ChildPerson.java b/src/test/java/com/avaje/tests/model/family/ChildPerson.java index 77032e59a..045988fa5 100644 --- a/src/test/java/com/avaje/tests/model/family/ChildPerson.java +++ b/src/test/java/com/avaje/tests/model/family/ChildPerson.java @@ -1,38 +1,37 @@ - package com.avaje.tests.model.family; +import com.avaje.ebean.annotation.Formula; +import com.avaje.tests.model.basic.EBasic; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.ManyToOne; -import com.avaje.ebean.annotation.Formula; -import com.avaje.tests.model.basic.EBasic; - @Entity public class ChildPerson extends InheritablePerson { private static final String PARENTS_JOIN = "join parent_person j1 on j1.identifier = ${ta}.parent_identifier " - + "join grand_parent_person j2 on j2.identifier = j1.parent_identifier"; + + "join grand_parent_person j2 on j2.identifier = j1.parent_identifier"; - @ManyToOne(cascade = CascadeType.ALL) - private ParentPerson parent; + @ManyToOne(cascade = CascadeType.ALL) + private ParentPerson parent; + + private String familyName; + + private String address; - private String familyName; - - private String address; - //@Coalesce({ "familyName", "parent.familyName", "parent.parent.familyName" }) - @Formula(select = "coalesce(${ta}.family_name, j1.family_name, j2.family_name)", join = PARENTS_JOIN ) + @Formula(select = "coalesce(${ta}.family_name, j1.family_name, j2.family_name)", join = PARENTS_JOIN) private String effectiveFamilyName; //@Coalesce({ "address", "parent.address", "parent.parent.address" }) - @Formula(select = "coalesce(${ta}.address, j1.address, j2.address)", join = PARENTS_JOIN ) + @Formula(select = "coalesce(${ta}.address, j1.address, j2.address)", join = PARENTS_JOIN) private String effectiveAddress; - + @Formula(select = "coalesce(${ta}.some_bean_id, j1.some_bean_id, j2.some_bean_id)") @ManyToOne private EBasic effectiveBean; - + public ParentPerson getParent() { return parent; } diff --git a/src/test/java/com/avaje/tests/model/family/GrandParentPerson.java b/src/test/java/com/avaje/tests/model/family/GrandParentPerson.java index 8e27aae3b..574503d02 100644 --- a/src/test/java/com/avaje/tests/model/family/GrandParentPerson.java +++ b/src/test/java/com/avaje/tests/model/family/GrandParentPerson.java @@ -1,17 +1,15 @@ - package com.avaje.tests.model.family; -import java.util.ArrayList; -import java.util.List; +import com.avaje.ebean.annotation.Formula; +import com.avaje.tests.model.basic.EBasic; import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.OrderBy; - -import com.avaje.ebean.annotation.Formula; -import com.avaje.tests.model.basic.EBasic; +import java.util.ArrayList; +import java.util.List; @Entity public class GrandParentPerson extends InheritablePerson { @@ -22,15 +20,15 @@ public class GrandParentPerson extends InheritablePerson { // This rather complex formulas should be built later by CustomAnnotationParser private static final String PARENT_PERSON_AGGREGATE_JOIN = "left join " - + "(select i1.parent_identifier, count(*) as child_count, sum(i1.age) as child_age from parent_person i1 group by i1.parent_identifier) " - + "as f1 on f1.parent_identifier = ${ta}.identifier"; + + "(select i1.parent_identifier, count(*) as child_count, sum(i1.age) as child_age from parent_person i1 group by i1.parent_identifier) " + + "as f1 on f1.parent_identifier = ${ta}.identifier"; //@Count("children") - @Formula(select = "coalesce(f1.child_count, 0)", join = PARENT_PERSON_AGGREGATE_JOIN ) + @Formula(select = "coalesce(f1.child_count, 0)", join = PARENT_PERSON_AGGREGATE_JOIN) private Integer childCount; //@Sum("children.age") - @Formula(select = "coalesce(f1.child_age, 0)", join = PARENT_PERSON_AGGREGATE_JOIN ) + @Formula(select = "coalesce(f1.child_age, 0)", join = PARENT_PERSON_AGGREGATE_JOIN) private Integer totalAge; private String familyName; @@ -42,7 +40,7 @@ public class GrandParentPerson extends InheritablePerson { @Formula(select = "coalesce(${ta}.some_bean_id,1)") @ManyToOne private EBasic effectiveBean; - + public List getChildren() { return children; } @@ -56,7 +54,7 @@ public class GrandParentPerson extends InheritablePerson { return totalAge; } - public String getFamilyName() { + public String getFamilyName() { return familyName; } diff --git a/src/test/java/com/avaje/tests/model/family/InheritablePerson.java b/src/test/java/com/avaje/tests/model/family/InheritablePerson.java index 8a174932b..12a2ad027 100644 --- a/src/test/java/com/avaje/tests/model/family/InheritablePerson.java +++ b/src/test/java/com/avaje/tests/model/family/InheritablePerson.java @@ -1,25 +1,24 @@ - package com.avaje.tests.model.family; +import com.avaje.tests.model.basic.EBasic; + import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.MappedSuperclass; -import com.avaje.tests.model.basic.EBasic; - @MappedSuperclass -public abstract class InheritablePerson { +public abstract class InheritablePerson { - @Id - private Integer identifier; + @Id + private Integer identifier; - private String name; + private String name; - private Integer age; + private Integer age; + + @ManyToOne + private EBasic someBean; - @ManyToOne - private EBasic someBean; - public Integer getIdentifier() { return identifier; } @@ -43,11 +42,11 @@ public abstract class InheritablePerson { public void setAge(Integer age) { this.age = age; } - + public void setSomeBean(EBasic someBean) { this.someBean = someBean; } - + public EBasic getSomeBean() { return someBean; } diff --git a/src/test/java/com/avaje/tests/model/family/ParentPerson.java b/src/test/java/com/avaje/tests/model/family/ParentPerson.java index 98d46b09e..3f3deba68 100644 --- a/src/test/java/com/avaje/tests/model/family/ParentPerson.java +++ b/src/test/java/com/avaje/tests/model/family/ParentPerson.java @@ -1,17 +1,15 @@ - package com.avaje.tests.model.family; -import java.util.ArrayList; -import java.util.List; +import com.avaje.ebean.annotation.Formula; +import com.avaje.tests.model.basic.EBasic; import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.OrderBy; - -import com.avaje.ebean.annotation.Formula; -import com.avaje.tests.model.basic.EBasic; +import java.util.ArrayList; +import java.util.List; @Entity @@ -19,8 +17,8 @@ public class ParentPerson extends InheritablePerson { //This rather complex formulas should be built later by CustomAnnotationParser private static final String CHILD_PERSON_AGGREGATE_JOIN = "left join " - + "(select i2.parent_identifier, count(*) as child_count, sum(i2.age) as child_age from child_person i2 group by i2.parent_identifier) " - + "as f2 on f2.parent_identifier = ${ta}.identifier"; + + "(select i2.parent_identifier, count(*) as child_count, sum(i2.age) as child_age from child_person i2 group by i2.parent_identifier) " + + "as f2 on f2.parent_identifier = ${ta}.identifier"; private static final String GRAND_PARENT_PERSON_JOIN = "join grand_parent_person j1 on j1.identifier = ${ta}.parent_identifier"; @@ -32,11 +30,11 @@ public class ParentPerson extends InheritablePerson { private List children = new ArrayList<>(); //@Count("children") - @Formula(select = "coalesce(f2.child_count, 0)", join = CHILD_PERSON_AGGREGATE_JOIN ) + @Formula(select = "coalesce(f2.child_count, 0)", join = CHILD_PERSON_AGGREGATE_JOIN) private Integer childCount; //@Sum("children.age") - @Formula(select = "coalesce(f2.child_age, 0)", join = CHILD_PERSON_AGGREGATE_JOIN ) + @Formula(select = "coalesce(f2.child_age, 0)", join = CHILD_PERSON_AGGREGATE_JOIN) private Integer totalAge; private String familyName; @@ -44,14 +42,14 @@ public class ParentPerson extends InheritablePerson { private String address; //@Coalesce({ "familyName", "parent.familyName" }) - @Formula(select = "coalesce(${ta}.family_name, j1.family_name)", join = GRAND_PARENT_PERSON_JOIN ) + @Formula(select = "coalesce(${ta}.family_name, j1.family_name)", join = GRAND_PARENT_PERSON_JOIN) private String effectiveFamilyName; //@Coalesce({ "address", "parent.address" }) - @Formula(select = "coalesce(${ta}.address, j1.address)", join = GRAND_PARENT_PERSON_JOIN ) + @Formula(select = "coalesce(${ta}.address, j1.address)", join = GRAND_PARENT_PERSON_JOIN) private String effectiveAddress; - @Formula(select = "coalesce(${ta}.some_bean_id, j1.some_bean_id)", join = GRAND_PARENT_PERSON_JOIN ) + @Formula(select = "coalesce(${ta}.some_bean_id, j1.some_bean_id)", join = GRAND_PARENT_PERSON_JOIN) @ManyToOne private EBasic effectiveBean; diff --git a/src/test/java/com/avaje/tests/model/history/TestHistoryExclude.java b/src/test/java/com/avaje/tests/model/history/TestHistoryExclude.java index e14105f72..a040cdc43 100644 --- a/src/test/java/com/avaje/tests/model/history/TestHistoryExclude.java +++ b/src/test/java/com/avaje/tests/model/history/TestHistoryExclude.java @@ -25,6 +25,7 @@ public class TestHistoryExclude extends BaseTestCase { link.save(); } } + @Test public void testLazyLoad() { @@ -40,9 +41,9 @@ public class TestHistoryExclude extends BaseTestCase { prepare(); HeLink linkFound = Ebean.find(HeLink.class) - .asOf(new Timestamp(System.currentTimeMillis())) - .setId(link.getId()) - .findUnique(); + .asOf(new Timestamp(System.currentTimeMillis())) + .setId(link.getId()) + .findUnique(); assertThat(linkFound.getDocs().size()).isEqualTo(2); } diff --git a/src/test/java/com/avaje/tests/model/history/TestHistoryInclude.java b/src/test/java/com/avaje/tests/model/history/TestHistoryInclude.java index 825c7ece8..6b29ff349 100644 --- a/src/test/java/com/avaje/tests/model/history/TestHistoryInclude.java +++ b/src/test/java/com/avaje/tests/model/history/TestHistoryInclude.java @@ -41,9 +41,9 @@ public class TestHistoryInclude extends BaseTestCase { prepare(); HiLink linkFound = Ebean.find(HiLink.class) - .asOf(new Timestamp(System.currentTimeMillis())) - .setId(link.getId()) - .findUnique(); + .asOf(new Timestamp(System.currentTimeMillis())) + .setId(link.getId()) + .findUnique(); assertThat(linkFound.getDocs().size()).isEqualTo(2); } diff --git a/src/test/java/com/avaje/tests/model/info/InfoCompany.java b/src/test/java/com/avaje/tests/model/info/InfoCompany.java index 67448e4cf..27c84f35b 100644 --- a/src/test/java/com/avaje/tests/model/info/InfoCompany.java +++ b/src/test/java/com/avaje/tests/model/info/InfoCompany.java @@ -3,14 +3,18 @@ package com.avaje.tests.model.info; import com.avaje.ebean.Model; import com.avaje.ebean.annotation.JsonIgnore; -import javax.persistence.*; +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.persistence.Version; import java.util.ArrayList; import java.util.List; @Entity public class InfoCompany extends Model { - public static final Finder find = new Finder<>(InfoCompany.class); + public static final Finder find = new Finder<>(InfoCompany.class); @Id Long id; diff --git a/src/test/java/com/avaje/tests/model/info/InfoCustomer.java b/src/test/java/com/avaje/tests/model/info/InfoCustomer.java index ed422e2fe..f0453c216 100644 --- a/src/test/java/com/avaje/tests/model/info/InfoCustomer.java +++ b/src/test/java/com/avaje/tests/model/info/InfoCustomer.java @@ -11,7 +11,7 @@ import javax.persistence.Version; @Entity public class InfoCustomer extends Model { - public static final Finder find = new Finder<>(InfoCustomer.class); + public static final Finder find = new Finder<>(InfoCustomer.class); @Id Long id; diff --git a/src/test/java/com/avaje/tests/model/inheritexposedtype/IXPhoto.java b/src/test/java/com/avaje/tests/model/inheritexposedtype/IXPhoto.java index 8d7a711e3..317e01e0b 100644 --- a/src/test/java/com/avaje/tests/model/inheritexposedtype/IXPhoto.java +++ b/src/test/java/com/avaje/tests/model/inheritexposedtype/IXPhoto.java @@ -4,7 +4,7 @@ import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; @Entity -@DiscriminatorValue( "photo" ) +@DiscriminatorValue("photo") public class IXPhoto extends IXResource { } diff --git a/src/test/java/com/avaje/tests/model/inheritexposedtype/IXResource.java b/src/test/java/com/avaje/tests/model/inheritexposedtype/IXResource.java index 06f50f6d4..e35017aa6 100644 --- a/src/test/java/com/avaje/tests/model/inheritexposedtype/IXResource.java +++ b/src/test/java/com/avaje/tests/model/inheritexposedtype/IXResource.java @@ -1,21 +1,20 @@ package com.avaje.tests.model.inheritexposedtype; -import java.util.UUID; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; +import java.util.UUID; @Entity -@Inheritance(strategy=InheritanceType.SINGLE_TABLE) +@Inheritance(strategy = InheritanceType.SINGLE_TABLE) public class IXResource { @Id UUID id; - - @Column(insertable=false, updatable=false) + + @Column(insertable = false, updatable = false) String dtype; String name; diff --git a/src/test/java/com/avaje/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java b/src/test/java/com/avaje/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java index 284ba6a33..9134bcaef 100644 --- a/src/test/java/com/avaje/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java +++ b/src/test/java/com/avaje/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java @@ -1,16 +1,15 @@ package com.avaje.tests.model.inheritexposedtype.test; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.inheritexposedtype.IXPhoto; +import org.junit.Test; public class TestInheritExposeDtype extends BaseTestCase { @Test public void test() { - + IXPhoto p = new IXPhoto(); p.setName("the name"); Ebean.save(p); @@ -21,6 +20,6 @@ public class TestInheritExposeDtype extends BaseTestCase { // delete Ebean.delete(p); - + } } diff --git a/src/test/java/com/avaje/tests/model/inheritmany/IMRelated.java b/src/test/java/com/avaje/tests/model/inheritmany/IMRelated.java index 5657ac3d1..b72f9b85f 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/IMRelated.java +++ b/src/test/java/com/avaje/tests/model/inheritmany/IMRelated.java @@ -9,10 +9,10 @@ public class IMRelated { @Id Long id; - + String name; - - @ManyToOne(optional=false) + + @ManyToOne(optional = false) IMRoot owner; public Long getId() { diff --git a/src/test/java/com/avaje/tests/model/inheritmany/IMRoot.java b/src/test/java/com/avaje/tests/model/inheritmany/IMRoot.java index 49da888da..8d716af86 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/IMRoot.java +++ b/src/test/java/com/avaje/tests/model/inheritmany/IMRoot.java @@ -1,12 +1,11 @@ package com.avaje.tests.model.inheritmany; -import java.util.List; - import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.OneToMany; +import java.util.List; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) @@ -14,8 +13,8 @@ public class IMRoot { @Id Long id; - - @OneToMany(mappedBy="owner") + + @OneToMany(mappedBy = "owner") List related; public Long getId() { @@ -33,5 +32,5 @@ public class IMRoot { public void setRelated(List related) { this.related = related; } - + } diff --git a/src/test/java/com/avaje/tests/model/inheritmany/IMRootOne.java b/src/test/java/com/avaje/tests/model/inheritmany/IMRootOne.java index e70919bea..ecd871ad1 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/IMRootOne.java +++ b/src/test/java/com/avaje/tests/model/inheritmany/IMRootOne.java @@ -16,5 +16,5 @@ public class IMRootOne extends IMRoot { public void setName(String name) { this.name = name; } - + } diff --git a/src/test/java/com/avaje/tests/model/inheritmany/IMRootTwo.java b/src/test/java/com/avaje/tests/model/inheritmany/IMRootTwo.java index dd36be816..5c7f4f9a6 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/IMRootTwo.java +++ b/src/test/java/com/avaje/tests/model/inheritmany/IMRootTwo.java @@ -1,9 +1,8 @@ package com.avaje.tests.model.inheritmany; -import java.util.Date; - import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; +import java.util.Date; @Entity @DiscriminatorValue("TWO") @@ -12,7 +11,7 @@ public class IMRootTwo extends IMRoot { String title; Date whenTitle; - + public String getTitle() { return title; } @@ -28,5 +27,5 @@ public class IMRootTwo extends IMRoot { public void setWhenTitle(Date whenTitle) { this.whenTitle = whenTitle; } - + } diff --git a/src/test/java/com/avaje/tests/model/inheritmany/MBase.java b/src/test/java/com/avaje/tests/model/inheritmany/MBase.java index 5e21d5c5e..a163aaf9f 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/MBase.java +++ b/src/test/java/com/avaje/tests/model/inheritmany/MBase.java @@ -16,5 +16,5 @@ public class MBase { public void setId(Long id) { this.id = id; } - + } diff --git a/src/test/java/com/avaje/tests/model/inheritmany/MMedia.java b/src/test/java/com/avaje/tests/model/inheritmany/MMedia.java index 3db7d7403..d7c1400d9 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/MMedia.java +++ b/src/test/java/com/avaje/tests/model/inheritmany/MMedia.java @@ -7,8 +7,8 @@ import javax.persistence.Inheritance; import javax.persistence.InheritanceType; @Entity -@Inheritance(strategy=InheritanceType.SINGLE_TABLE) -@DiscriminatorColumn(discriminatorType=DiscriminatorType.STRING, name = "type") +@Inheritance(strategy = InheritanceType.SINGLE_TABLE) +@DiscriminatorColumn(discriminatorType = DiscriminatorType.STRING, name = "type") public class MMedia extends MBase { String url; @@ -21,5 +21,5 @@ public class MMedia extends MBase { this.url = url; } - -} \ No newline at end of file + +} diff --git a/src/test/java/com/avaje/tests/model/inheritmany/MPicture.java b/src/test/java/com/avaje/tests/model/inheritmany/MPicture.java index 9c505cace..f8ebed946 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/MPicture.java +++ b/src/test/java/com/avaje/tests/model/inheritmany/MPicture.java @@ -18,5 +18,5 @@ public class MPicture extends MMedia { public void setNote(String note) { this.note = note; } - + } diff --git a/src/test/java/com/avaje/tests/model/inheritmany/MProfile.java b/src/test/java/com/avaje/tests/model/inheritmany/MProfile.java index dbadc848b..4bf29671c 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/MProfile.java +++ b/src/test/java/com/avaje/tests/model/inheritmany/MProfile.java @@ -9,7 +9,7 @@ public class MProfile extends MBase { @ManyToOne(cascade = CascadeType.ALL) MPicture picture; - + String name; public MPicture getPicture() { diff --git a/src/test/java/com/avaje/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java b/src/test/java/com/avaje/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java index 3f020aefd..dbdbbf460 100644 --- a/src/test/java/com/avaje/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java +++ b/src/test/java/com/avaje/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java @@ -1,11 +1,10 @@ package com.avaje.tests.model.inheritmany; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; +import org.junit.Assert; +import org.junit.Test; import java.util.Random; @@ -15,32 +14,32 @@ public class TestMediaInheritanceJoinToMany extends BaseTestCase { @Test public void test() { - - - String name = "nopic"+new Random().nextInt(); - + + + String name = "nopic" + new Random().nextInt(); + MProfile profileWithNoPic = new MProfile(); profileWithNoPic.setName(name); - + Ebean.save(profileWithNoPic); - + Query query = Ebean.find(MProfile.class).fetch("picture").where().eq("name", name).query(); - + // assert we get the profile with a null picture MProfile profile = query.findUnique(); Assert.assertNotNull(profile); - - // select t0.id c0, t0.name c1, t1.type c2, t1.id c3, t1.url c4, t1.note c5 - // from profile t0 + + // select t0.id c0, t0.name c1, t1.type c2, t1.id c3, t1.url c4, t1.note c5 + // from profile t0 // left join media t1 on t1.id = t0.picture_id and t1.type = 'Picture' // where t0.name = ? ; --bind(nopic) - + // specifically t1.type = 'Picture' ... on on the join and not in the where - + String generatedSql = query.getGeneratedSql(); assertThat(generatedSql).contains("from mprofile t0 left join mmedia t1 on t1.id = t0.picture_id and t1.type = 'Picture' "); assertThat(generatedSql).contains("where t0.name = ? "); - + } - + } diff --git a/src/test/java/com/avaje/tests/model/interfaces/Address.java b/src/test/java/com/avaje/tests/model/interfaces/Address.java index 2bd2dd126..aa5a936ec 100644 --- a/src/test/java/com/avaje/tests/model/interfaces/Address.java +++ b/src/test/java/com/avaje/tests/model/interfaces/Address.java @@ -7,38 +7,38 @@ import javax.persistence.Version; @Entity public class Address implements IAddress { - @Id - private long oid; - - @Version - private int version; - - private String street; - - public long getOid() { - return oid; - } + @Id + private long oid; - public void setOid(long oid) { - this.oid = oid; - } + @Version + private int version; - public int getVersion() { - return version; - } + private String street; - public void setVersion(int version) { - this.version = version; - } + public long getOid() { + return oid; + } - @Override - public String getStreet() { - return street; - } + public void setOid(long oid) { + this.oid = oid; + } - @Override - public void setStreet(String s) { - this.street = s; - } + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + @Override + public String getStreet() { + return street; + } + + @Override + public void setStreet(String s) { + this.street = s; + } } diff --git a/src/test/java/com/avaje/tests/model/interfaces/IAddress.java b/src/test/java/com/avaje/tests/model/interfaces/IAddress.java index 401209567..f179552ec 100644 --- a/src/test/java/com/avaje/tests/model/interfaces/IAddress.java +++ b/src/test/java/com/avaje/tests/model/interfaces/IAddress.java @@ -1,6 +1,7 @@ package com.avaje.tests.model.interfaces; public interface IAddress { - String getStreet(); - void setStreet(String s); + String getStreet(); + + void setStreet(String s); } diff --git a/src/test/java/com/avaje/tests/model/interfaces/IPerson.java b/src/test/java/com/avaje/tests/model/interfaces/IPerson.java index b8bc2f9f1..fed13d9a1 100644 --- a/src/test/java/com/avaje/tests/model/interfaces/IPerson.java +++ b/src/test/java/com/avaje/tests/model/interfaces/IPerson.java @@ -1,6 +1,7 @@ package com.avaje.tests.model.interfaces; public interface IPerson { - IAddress getDefaultAddress(); - void setDefaultAddress(IAddress address); + IAddress getDefaultAddress(); + + void setDefaultAddress(IAddress address); } diff --git a/src/test/java/com/avaje/tests/model/interfaces/Person.java b/src/test/java/com/avaje/tests/model/interfaces/Person.java index 695da1b8d..f55cb4436 100644 --- a/src/test/java/com/avaje/tests/model/interfaces/Person.java +++ b/src/test/java/com/avaje/tests/model/interfaces/Person.java @@ -7,39 +7,39 @@ import javax.persistence.Version; @Entity public class Person implements IPerson { - @Id - private long oid; - - @Version - private int version; - - @ManyToOne(targetEntity=Address.class) - private IAddress defaultAddress; - - @Override - public IAddress getDefaultAddress() { - return defaultAddress; - } + @Id + private long oid; - @Override - public void setDefaultAddress(IAddress address) { - this.defaultAddress = address; - } + @Version + private int version; - public long getOid() { - return oid; - } + @ManyToOne(targetEntity = Address.class) + private IAddress defaultAddress; - public void setOid(long oid) { - this.oid = oid; - } + @Override + public IAddress getDefaultAddress() { + return defaultAddress; + } - public int getVersion() { - return version; - } + @Override + public void setDefaultAddress(IAddress address) { + this.defaultAddress = address; + } - public void setVersion(int version) { - this.version = version; - } + public long getOid() { + return oid; + } + + public void setOid(long oid) { + this.oid = oid; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } } diff --git a/src/test/java/com/avaje/tests/model/ivo/SimpleKnownImmutable.java b/src/test/java/com/avaje/tests/model/ivo/SimpleKnownImmutable.java index 6ed452d83..a018bc086 100644 --- a/src/test/java/com/avaje/tests/model/ivo/SimpleKnownImmutable.java +++ b/src/test/java/com/avaje/tests/model/ivo/SimpleKnownImmutable.java @@ -20,8 +20,8 @@ public class SimpleKnownImmutable implements KnownImmutable { } if (Integer.class.equals(cls) || Long.class.equals(cls) || Double.class.equals(cls) || Float.class.equals(cls) - || Short.class.equals(cls) || Byte.class.equals(cls) || Character.class.equals(cls) - || Boolean.class.equals(cls)) { + || Short.class.equals(cls) || Byte.class.equals(cls) || Character.class.equals(cls) + || Boolean.class.equals(cls)) { return true; } diff --git a/src/test/java/com/avaje/tests/model/ivo/converter/CMoneyCompoundType.java b/src/test/java/com/avaje/tests/model/ivo/converter/CMoneyCompoundType.java index 6d4b3e212..b95f1a264 100644 --- a/src/test/java/com/avaje/tests/model/ivo/converter/CMoneyCompoundType.java +++ b/src/test/java/com/avaje/tests/model/ivo/converter/CMoneyCompoundType.java @@ -1,53 +1,53 @@ package com.avaje.tests.model.ivo.converter; -import java.util.Currency; - import com.avaje.ebean.config.CompoundTypeProperty; import com.avaje.tests.model.ivo.CMoney; import com.avaje.tests.model.ivo.Money; +import java.util.Currency; + public class CMoneyCompoundType {//implements CompoundType { - @SuppressWarnings({ "rawtypes" }) - private CompoundTypeProperty[] props = {new PropertyMoney(), new PropertyCurrency()}; - - public CMoney create(Object[] v) { - return new CMoney((Money)v[0], (Currency)v[1]); + @SuppressWarnings({"rawtypes"}) + private CompoundTypeProperty[] props = {new PropertyMoney(), new PropertyCurrency()}; + + public CMoney create(Object[] v) { + return new CMoney((Money) v[0], (Currency) v[1]); + } + + @SuppressWarnings("unchecked") + public CompoundTypeProperty[] getProperties() { + return props; + } + + static class PropertyMoney implements CompoundTypeProperty { + + public String getName() { + return "amount"; } - @SuppressWarnings("unchecked") - public CompoundTypeProperty[] getProperties() { - return props; + public Money getValue(CMoney valueObject) { + return valueObject.getAmount(); } - - static class PropertyMoney implements CompoundTypeProperty { - public String getName() { - return "amount"; - } - - public Money getValue(CMoney valueObject) { - return valueObject.getAmount(); - } - - public int getDbType() { - return 0; - } + public int getDbType() { + return 0; } - - static class PropertyCurrency implements CompoundTypeProperty { + } - public String getName() { - return "currency"; - } + static class PropertyCurrency implements CompoundTypeProperty { - public Currency getValue(CMoney valueObject) { - return valueObject.getCurrency(); - } - - public int getDbType() { - return 0; - } + public String getName() { + return "currency"; } + public Currency getValue(CMoney valueObject) { + return valueObject.getCurrency(); + } + + public int getDbType() { + return 0; + } + } + } diff --git a/src/test/java/com/avaje/tests/model/ivo/converter/ExhangeCompoundType.java b/src/test/java/com/avaje/tests/model/ivo/converter/ExhangeCompoundType.java index 7ccd33f12..ccd50ade8 100644 --- a/src/test/java/com/avaje/tests/model/ivo/converter/ExhangeCompoundType.java +++ b/src/test/java/com/avaje/tests/model/ivo/converter/ExhangeCompoundType.java @@ -8,45 +8,45 @@ import com.avaje.tests.model.ivo.Rate; public class ExhangeCompoundType implements CompoundType { - public ExhangeCMoneyRate create(Object[] propertyValues) { - return new ExhangeCMoneyRate((Rate)propertyValues[0], (CMoney)propertyValues[1]); + public ExhangeCMoneyRate create(Object[] propertyValues) { + return new ExhangeCMoneyRate((Rate) propertyValues[0], (CMoney) propertyValues[1]); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + public CompoundTypeProperty[] getProperties() { + return new CompoundTypeProperty[]{new RateProp(), new CMoneyProp()}; + } + + static class RateProp implements CompoundTypeProperty { + + public String getName() { + return "rate"; } - @SuppressWarnings({ "unchecked", "rawtypes" }) - public CompoundTypeProperty[] getProperties() { - return new CompoundTypeProperty[]{new RateProp(), new CMoneyProp()}; + public Rate getValue(ExhangeCMoneyRate valueObject) { + return valueObject.getRate(); } - static class RateProp implements CompoundTypeProperty { - - public String getName() { - return "rate"; - } - - public Rate getValue(ExhangeCMoneyRate valueObject) { - return valueObject.getRate(); - } - - public int getDbType() { - return 0; - } - + public int getDbType() { + return 0; } - - static class CMoneyProp implements CompoundTypeProperty { - public String getName() { - return "cmoney"; - } + } - public CMoney getValue(ExhangeCMoneyRate valueObject) { - return valueObject.getCmoney(); - } + static class CMoneyProp implements CompoundTypeProperty { - public int getDbType() { - return 0; - } - + public String getName() { + return "cmoney"; } - + + public CMoney getValue(ExhangeCMoneyRate valueObject) { + return valueObject.getCmoney(); + } + + public int getDbType() { + return 0; + } + + } + } diff --git a/src/test/java/com/avaje/tests/model/ivo/converter/JodaIntervalCompoundType.java b/src/test/java/com/avaje/tests/model/ivo/converter/JodaIntervalCompoundType.java index 82780da7d..91f2e7bda 100644 --- a/src/test/java/com/avaje/tests/model/ivo/converter/JodaIntervalCompoundType.java +++ b/src/test/java/com/avaje/tests/model/ivo/converter/JodaIntervalCompoundType.java @@ -1,50 +1,49 @@ package com.avaje.tests.model.ivo.converter; -import org.joda.time.Interval; - import com.avaje.ebean.config.CompoundType; import com.avaje.ebean.config.CompoundTypeProperty; +import org.joda.time.Interval; -public class JodaIntervalCompoundType implements CompoundType{ +public class JodaIntervalCompoundType implements CompoundType { - public Interval create(Object[] propertyValues) { - return new Interval((Long)propertyValues[0], (Long)propertyValues[1]); + public Interval create(Object[] propertyValues) { + return new Interval((Long) propertyValues[0], (Long) propertyValues[1]); + } + + @SuppressWarnings({"unchecked", "rawtypes"}) + public CompoundTypeProperty[] getProperties() { + return new CompoundTypeProperty[]{new Start(), new End()}; + } + + static class Start implements CompoundTypeProperty { + + public String getName() { + return "startMillis"; } - @SuppressWarnings({ "unchecked", "rawtypes" }) - public CompoundTypeProperty[] getProperties() { - return new CompoundTypeProperty[]{new Start(), new End()}; - } - - static class Start implements CompoundTypeProperty { - - public String getName() { - return "startMillis"; - } - - public Long getValue(Interval valueObject) { - return valueObject.getStartMillis(); - } - - public int getDbType() { - return java.sql.Types.TIMESTAMP; - } + public Long getValue(Interval valueObject) { + return valueObject.getStartMillis(); } - static class End implements CompoundTypeProperty { - - public String getName() { - return "endMillis"; - } - - public Long getValue(Interval valueObject) { - return valueObject.getEndMillis(); - } - - public int getDbType() { - return java.sql.Types.TIMESTAMP; - } - + public int getDbType() { + return java.sql.Types.TIMESTAMP; } + } + + static class End implements CompoundTypeProperty { + + public String getName() { + return "endMillis"; + } + + public Long getValue(Interval valueObject) { + return valueObject.getEndMillis(); + } + + public int getDbType() { + return java.sql.Types.TIMESTAMP; + } + + } } diff --git a/src/test/java/com/avaje/tests/model/ivo/converter/MoneyTypeConverter.java b/src/test/java/com/avaje/tests/model/ivo/converter/MoneyTypeConverter.java index 2d50f54fd..b11801b9b 100644 --- a/src/test/java/com/avaje/tests/model/ivo/converter/MoneyTypeConverter.java +++ b/src/test/java/com/avaje/tests/model/ivo/converter/MoneyTypeConverter.java @@ -1,20 +1,20 @@ package com.avaje.tests.model.ivo.converter; -import java.math.BigDecimal; - import com.avaje.tests.model.ivo.Money; +import java.math.BigDecimal; + /** * Converts between Money and BigDecimal. */ public class MoneyTypeConverter {//implements ScalarTypeConverter{ - public BigDecimal unwrapValue(Money beanType) { - return beanType.getAmount(); - } + public BigDecimal unwrapValue(Money beanType) { + return beanType.getAmount(); + } + + public Money wrapValue(BigDecimal scalarType) { + return new Money(scalarType); + } - public Money wrapValue(BigDecimal scalarType) { - return new Money(scalarType); - } - } diff --git a/src/test/java/com/avaje/tests/model/ivo/converter/OidTypeConverter.java b/src/test/java/com/avaje/tests/model/ivo/converter/OidTypeConverter.java index cb5abdb42..9388ad121 100644 --- a/src/test/java/com/avaje/tests/model/ivo/converter/OidTypeConverter.java +++ b/src/test/java/com/avaje/tests/model/ivo/converter/OidTypeConverter.java @@ -1,22 +1,21 @@ - package com.avaje.tests.model.ivo.converter; import com.avaje.tests.model.ivo.Oid; public class OidTypeConverter {//implements ScalarTypeConverter,Long> { - public Oid wrapValue(Long scalarType) { - if (scalarType == null){ - return null; - } - return new Oid<>(scalarType); + public Oid wrapValue(Long scalarType) { + if (scalarType == null) { + return null; } + return new Oid<>(scalarType); + } - public Long unwrapValue(Oid beanType) { - if (beanType == null){ - return null; - } - return beanType.getValue(); + public Long unwrapValue(Oid beanType) { + if (beanType == null) { + return null; } + return beanType.getValue(); + } } diff --git a/src/test/java/com/avaje/tests/model/ivo/converter/RateTypeConverter.java b/src/test/java/com/avaje/tests/model/ivo/converter/RateTypeConverter.java index cbbb9e105..a545db1ec 100644 --- a/src/test/java/com/avaje/tests/model/ivo/converter/RateTypeConverter.java +++ b/src/test/java/com/avaje/tests/model/ivo/converter/RateTypeConverter.java @@ -1,20 +1,20 @@ package com.avaje.tests.model.ivo.converter; -import java.math.BigDecimal; - import com.avaje.tests.model.ivo.Rate; +import java.math.BigDecimal; + /** * Converts between Rate and BigDecimal. */ public class RateTypeConverter {//implements ScalarTypeConverter{ - public BigDecimal unwrapValue(Rate beanType) { - return beanType.getValue(); - } + public BigDecimal unwrapValue(Rate beanType) { + return beanType.getValue(); + } + + public Rate wrapValue(BigDecimal scalarType) { + return new Rate(scalarType); + } - public Rate wrapValue(BigDecimal scalarType) { - return new Rate(scalarType); - } - } diff --git a/src/test/java/com/avaje/tests/model/ivo/converter/SysTimeConverter.java b/src/test/java/com/avaje/tests/model/ivo/converter/SysTimeConverter.java index 9ef18f73a..20762ee03 100644 --- a/src/test/java/com/avaje/tests/model/ivo/converter/SysTimeConverter.java +++ b/src/test/java/com/avaje/tests/model/ivo/converter/SysTimeConverter.java @@ -1,24 +1,24 @@ package com.avaje.tests.model.ivo.converter; -import java.sql.Timestamp; - import com.avaje.ebean.config.ScalarTypeConverter; import com.avaje.tests.model.ivo.SysTime; +import java.sql.Timestamp; + public class SysTimeConverter implements ScalarTypeConverter { - - public SysTime getNullValue() { - return null; - } - public Timestamp unwrapValue(SysTime beanType) { - return new Timestamp(beanType.getMillis()); - } + public SysTime getNullValue() { + return null; + } + + public Timestamp unwrapValue(SysTime beanType) { + return new Timestamp(beanType.getMillis()); + } + + public SysTime wrapValue(Timestamp scalarType) { + return new SysTime(scalarType.getTime()); + } - public SysTime wrapValue(Timestamp scalarType) { - return new SysTime(scalarType.getTime()); - } - } diff --git a/src/test/java/com/avaje/tests/model/joda/TestJodaInsertUpdate.java b/src/test/java/com/avaje/tests/model/joda/TestJodaInsertUpdate.java index 3541845f3..4f5cfbe2f 100644 --- a/src/test/java/com/avaje/tests/model/joda/TestJodaInsertUpdate.java +++ b/src/test/java/com/avaje/tests/model/joda/TestJodaInsertUpdate.java @@ -6,9 +6,7 @@ import org.joda.time.DateTime; import org.joda.time.LocalDateTime; import org.junit.Test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; +import static org.junit.Assert.*; public class TestJodaInsertUpdate extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/model/json/EBasicHstore.java b/src/test/java/com/avaje/tests/model/json/EBasicHstore.java index 775559a44..bd1359845 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicHstore.java +++ b/src/test/java/com/avaje/tests/model/json/EBasicHstore.java @@ -18,7 +18,7 @@ public class EBasicHstore { // fallback to varchar(800) for non-Postgres @DbHstore(length = 800) - Map map; + Map map; @Version Long version; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonList.java b/src/test/java/com/avaje/tests/model/json/EBasicJsonList.java index ab841aebe..2b1dbdda4 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonList.java +++ b/src/test/java/com/avaje/tests/model/json/EBasicJsonList.java @@ -29,7 +29,7 @@ public class EBasicJsonList { List beanList; @DbJson(length = 700) - Map beanMap = new LinkedHashMap<>(); + Map beanMap = new LinkedHashMap<>(); @DbJson(length = 500) PlainBean plainBean; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonMap.java b/src/test/java/com/avaje/tests/model/json/EBasicJsonMap.java index 6a68998e7..f0f1b7ca9 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonMap.java +++ b/src/test/java/com/avaje/tests/model/json/EBasicJsonMap.java @@ -19,7 +19,7 @@ public class EBasicJsonMap { String name; @DbJson - Map content; + Map content; public Long getId() { return id; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonMapBlob.java b/src/test/java/com/avaje/tests/model/json/EBasicJsonMapBlob.java index b01873056..5d5440b25 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonMapBlob.java +++ b/src/test/java/com/avaje/tests/model/json/EBasicJsonMapBlob.java @@ -20,7 +20,7 @@ public class EBasicJsonMapBlob { String name; @DbJson(storage = DbJsonType.BLOB) - Map content; + Map content; public Long getId() { return id; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonMapClob.java b/src/test/java/com/avaje/tests/model/json/EBasicJsonMapClob.java index 18fa707ce..9fb5e1b0b 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonMapClob.java +++ b/src/test/java/com/avaje/tests/model/json/EBasicJsonMapClob.java @@ -20,7 +20,7 @@ public class EBasicJsonMapClob { String name; @DbJson(storage = DbJsonType.CLOB) - Map content; + Map content; public Long getId() { return id; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonMapJsonB.java b/src/test/java/com/avaje/tests/model/json/EBasicJsonMapJsonB.java index c8ece036f..e9ac6398f 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonMapJsonB.java +++ b/src/test/java/com/avaje/tests/model/json/EBasicJsonMapJsonB.java @@ -19,7 +19,7 @@ public class EBasicJsonMapJsonB { String name; @DbJsonB - Map content; + Map content; public Long getId() { return id; diff --git a/src/test/java/com/avaje/tests/model/json/EBasicJsonMapVarchar.java b/src/test/java/com/avaje/tests/model/json/EBasicJsonMapVarchar.java index 648574201..399285366 100644 --- a/src/test/java/com/avaje/tests/model/json/EBasicJsonMapVarchar.java +++ b/src/test/java/com/avaje/tests/model/json/EBasicJsonMapVarchar.java @@ -20,7 +20,7 @@ public class EBasicJsonMapVarchar { String name; @DbJson(storage = DbJsonType.VARCHAR)//, length = 2200) - Map content; + Map content; public Long getId() { return id; diff --git a/src/test/java/com/avaje/tests/model/m2m/DCredit.java b/src/test/java/com/avaje/tests/model/m2m/DCredit.java index a03291c23..727f5b90a 100644 --- a/src/test/java/com/avaje/tests/model/m2m/DCredit.java +++ b/src/test/java/com/avaje/tests/model/m2m/DCredit.java @@ -9,19 +9,19 @@ import javax.persistence.ManyToMany; import java.util.List; @Entity -public class DCredit extends Model { +public class DCredit extends Model { - @Id - Long id; + @Id + Long id; String credit; @ManyToMany(cascade = CascadeType.PERSIST) List droles; - public DCredit(String credit) { - this.credit = credit; - } + public DCredit(String credit) { + this.credit = credit; + } public Long getId() { return id; diff --git a/src/test/java/com/avaje/tests/model/m2m/DRot.java b/src/test/java/com/avaje/tests/model/m2m/DRot.java index 67bda421b..bd1dc12ab 100644 --- a/src/test/java/com/avaje/tests/model/m2m/DRot.java +++ b/src/test/java/com/avaje/tests/model/m2m/DRot.java @@ -10,14 +10,14 @@ import java.util.List; @Entity -public class DRot extends Model { +public class DRot extends Model { - @Id - Long id; + @Id + Long id; - final String name; - - @ManyToMany(cascade = CascadeType.ALL) + final String name; + + @ManyToMany(cascade = CascadeType.ALL) List croles; public DRot(String name) { diff --git a/src/test/java/com/avaje/tests/model/m2m/MnyTopic.java b/src/test/java/com/avaje/tests/model/m2m/MnyTopic.java index d4772c099..36b2452d5 100644 --- a/src/test/java/com/avaje/tests/model/m2m/MnyTopic.java +++ b/src/test/java/com/avaje/tests/model/m2m/MnyTopic.java @@ -21,8 +21,8 @@ public class MnyTopic { @ManyToMany @JoinTable(name = "subtopics", - joinColumns = @JoinColumn(name = "topic", referencedColumnName = "id"), - inverseJoinColumns = @JoinColumn(name = "subtopic", referencedColumnName = "id")) + joinColumns = @JoinColumn(name = "topic", referencedColumnName = "id"), + inverseJoinColumns = @JoinColumn(name = "subtopic", referencedColumnName = "id")) List subTopics; public MnyTopic() { diff --git a/src/test/java/com/avaje/tests/model/m2m/Role.java b/src/test/java/com/avaje/tests/model/m2m/Role.java index 16d42cde3..240b82592 100644 --- a/src/test/java/com/avaje/tests/model/m2m/Role.java +++ b/src/test/java/com/avaje/tests/model/m2m/Role.java @@ -1,8 +1,5 @@ package com.avaje.tests.model.m2m; -import java.util.Set; -import java.util.UUID; - import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; @@ -11,6 +8,8 @@ import javax.persistence.ManyToMany; import javax.persistence.ManyToOne; import javax.persistence.Table; import javax.persistence.Version; +import java.util.Set; +import java.util.UUID; /** * The Class Role. diff --git a/src/test/java/com/avaje/tests/model/m2m/Tenant.java b/src/test/java/com/avaje/tests/model/m2m/Tenant.java index 4baa2fb68..577700ebf 100644 --- a/src/test/java/com/avaje/tests/model/m2m/Tenant.java +++ b/src/test/java/com/avaje/tests/model/m2m/Tenant.java @@ -1,8 +1,5 @@ package com.avaje.tests.model.m2m; -import java.util.Set; -import java.util.UUID; - import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; @@ -10,6 +7,8 @@ import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; import javax.persistence.Version; +import java.util.Set; +import java.util.UUID; /** * The Class Tenant. diff --git a/src/test/java/com/avaje/tests/model/m2o/Empl.java b/src/test/java/com/avaje/tests/model/m2o/Empl.java index ad997f5ff..cdceeffc7 100644 --- a/src/test/java/com/avaje/tests/model/m2o/Empl.java +++ b/src/test/java/com/avaje/tests/model/m2o/Empl.java @@ -17,7 +17,7 @@ public class Empl { Integer age; - @OneToMany(mappedBy="employee" , cascade= CascadeType.ALL) + @OneToMany(mappedBy = "employee", cascade = CascadeType.ALL) List addresses; @ManyToOne(cascade = CascadeType.ALL) diff --git a/src/test/java/com/avaje/tests/model/map/MpRole.java b/src/test/java/com/avaje/tests/model/map/MpRole.java index 7b4ac2a4f..915b65e3c 100644 --- a/src/test/java/com/avaje/tests/model/map/MpRole.java +++ b/src/test/java/com/avaje/tests/model/map/MpRole.java @@ -1,13 +1,14 @@ package com.avaje.tests.model.map; -import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.Id; @Entity public class MpRole { @Id private Long id; - + private String code; private Long organizationId; @@ -35,4 +36,4 @@ public class MpRole { public void setOrganizationId(Long organizationId) { this.organizationId = organizationId; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/mappedsuper/ASimpleBean.java b/src/test/java/com/avaje/tests/model/mappedsuper/ASimpleBean.java index 1123034fa..7ef37046c 100644 --- a/src/test/java/com/avaje/tests/model/mappedsuper/ASimpleBean.java +++ b/src/test/java/com/avaje/tests/model/mappedsuper/ASimpleBean.java @@ -8,7 +8,7 @@ public class ASimpleBean extends NotEnhancedMappedSuper { @Id Long id; - + String name; public Long getId() { @@ -26,5 +26,5 @@ public class ASimpleBean extends NotEnhancedMappedSuper { public void setName(String name) { this.name = name; } - + } diff --git a/src/test/java/com/avaje/tests/model/mappedsuper/NotEnhancedMappedSuper.java b/src/test/java/com/avaje/tests/model/mappedsuper/NotEnhancedMappedSuper.java index 37d579f32..0d3d085fd 100644 --- a/src/test/java/com/avaje/tests/model/mappedsuper/NotEnhancedMappedSuper.java +++ b/src/test/java/com/avaje/tests/model/mappedsuper/NotEnhancedMappedSuper.java @@ -7,9 +7,9 @@ import javax.persistence.Transient; public class NotEnhancedMappedSuper { public static String SOMETHING = "Hello"; - + private transient Long one; - + @Transient private Long two; @@ -28,5 +28,5 @@ public class NotEnhancedMappedSuper { public void setTwo(Long two) { this.two = two; } - + } diff --git a/src/test/java/com/avaje/tests/model/noid/NoIdBean.java b/src/test/java/com/avaje/tests/model/noid/NoIdBean.java index e5565748b..628dabfd2 100644 --- a/src/test/java/com/avaje/tests/model/noid/NoIdBean.java +++ b/src/test/java/com/avaje/tests/model/noid/NoIdBean.java @@ -7,7 +7,7 @@ import javax.persistence.Table; import java.sql.Timestamp; @Entity -@Table(name="noidbean") +@Table(name = "noidbean") public class NoIdBean { String name; diff --git a/src/test/java/com/avaje/tests/model/noid/TestInsertNoIdBean.java b/src/test/java/com/avaje/tests/model/noid/TestInsertNoIdBean.java index af954a29e..06290fc07 100644 --- a/src/test/java/com/avaje/tests/model/noid/TestInsertNoIdBean.java +++ b/src/test/java/com/avaje/tests/model/noid/TestInsertNoIdBean.java @@ -20,7 +20,7 @@ public class TestInsertNoIdBean extends BaseTestCase { int rowCount = Ebean.find(NoIdBean.class).findCount(); - assertTrue("rowCount:"+rowCount, rowCount > 0); + assertTrue("rowCount:" + rowCount, rowCount > 0); } } diff --git a/src/test/java/com/avaje/tests/model/onetoone/Account.java b/src/test/java/com/avaje/tests/model/onetoone/Account.java index ba4ab835f..cb993a4ef 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/Account.java +++ b/src/test/java/com/avaje/tests/model/onetoone/Account.java @@ -7,17 +7,18 @@ import javax.persistence.OneToOne; import javax.persistence.Table; @Entity -@Table(name="oto_account") +@Table(name = "oto_account") public class Account extends BaseModel { - public static final Find find = new Find(){}; - + public static final Find find = new Find() { + }; + String name; - - @OneToOne(mappedBy = "account",optional = true) + + @OneToOne(mappedBy = "account", optional = true) User user; - + public String getName() { return name; } @@ -33,5 +34,5 @@ public class Account extends BaseModel { public void setUser(User user) { this.user = user; } - + } diff --git a/src/test/java/com/avaje/tests/model/onetoone/OtoChild.java b/src/test/java/com/avaje/tests/model/onetoone/OtoChild.java index 458fa95c3..fe1bd0519 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/OtoChild.java +++ b/src/test/java/com/avaje/tests/model/onetoone/OtoChild.java @@ -6,12 +6,12 @@ import javax.persistence.OneToOne; @Entity public class OtoChild { - + @Id Integer id; - + String name; - + @OneToOne OtoMaster master; @@ -38,5 +38,5 @@ public class OtoChild { public void setMaster(OtoMaster master) { this.master = master; } - -} \ No newline at end of file + +} diff --git a/src/test/java/com/avaje/tests/model/onetoone/OtoMaster.java b/src/test/java/com/avaje/tests/model/onetoone/OtoMaster.java index 683600b84..3b9f1a711 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/OtoMaster.java +++ b/src/test/java/com/avaje/tests/model/onetoone/OtoMaster.java @@ -10,9 +10,9 @@ public class OtoMaster { @Id Long id; - + String name; - + @OneToOne(cascade = CascadeType.ALL, mappedBy = "master") OtoChild child; diff --git a/src/test/java/com/avaje/tests/model/onetoone/TestOneToOneCascadeSave.java b/src/test/java/com/avaje/tests/model/onetoone/TestOneToOneCascadeSave.java index f5ad02677..2a15ecf7d 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/TestOneToOneCascadeSave.java +++ b/src/test/java/com/avaje/tests/model/onetoone/TestOneToOneCascadeSave.java @@ -1,18 +1,17 @@ package com.avaje.tests.model.onetoone; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; +import org.junit.Assert; +import org.junit.Test; public class TestOneToOneCascadeSave extends BaseTestCase { @Test public void test() { - - - OtoMaster master = new OtoMaster(); + + + OtoMaster master = new OtoMaster(); master.setName("CName"); OtoChild child = new OtoChild(); @@ -26,11 +25,11 @@ public class TestOneToOneCascadeSave extends BaseTestCase { Ebean.save(master); Assert.assertNotNull(child.getId()); - + OtoChild child2 = Ebean.find(OtoChild.class, child.getId()); OtoMaster master2 = child2.getMaster(); Assert.assertNotNull(master2); - + } - + } diff --git a/src/test/java/com/avaje/tests/model/onetoone/TestOneToOneOptionalRelationship.java b/src/test/java/com/avaje/tests/model/onetoone/TestOneToOneOptionalRelationship.java index 14ef7f009..8b8b88ba4 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/TestOneToOneOptionalRelationship.java +++ b/src/test/java/com/avaje/tests/model/onetoone/TestOneToOneOptionalRelationship.java @@ -14,64 +14,64 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { Account account = new Account(); account.setName("AC234"); - account.save(); + account.save(); LoggedSqlCollector.start(); - + Account fetchedAccount = Account.find.byId(account.getId()); Assert.assertNotNull(fetchedAccount); - + List loggedSql = LoggedSqlCollector.stop(); Assert.assertEquals(1, loggedSql.size()); - // select t0.id c0, t0.name c1, t0.version c2, t0.when_created c3, t0.when_updated c4, t1.id c5 - // from oto_account t0 - // join oto_user t1 on t1.account_id = t0.id - // where t0.id = ? + // select t0.id c0, t0.name c1, t0.version c2, t0.when_created c3, t0.when_updated c4, t1.id c5 + // from oto_account t0 + // join oto_user t1 on t1.account_id = t0.id + // where t0.id = ? String sql = trimSql(loggedSql.get(0), 1); Assert.assertTrue(sql.contains("select t0.id, t0.name")); Assert.assertTrue(sql.contains(" from oto_account t0 left join oto_user t1 on t1.account_id = t0.id where t0.id = ?")); } - + @Test public void testWithUser() { - + Account account = new Account(); account.setName("AC678"); account.save(); - + User user = new User(); user.setName("Geoff"); user.setAccount(account); user.save(); - + LoggedSqlCollector.start(); - + Account fetchedAccount = Account.find.byId(account.getId()); Assert.assertNotNull(fetchedAccount); - + Assert.assertNotNull(fetchedAccount.getUser()); Assert.assertEquals(user.getId(), fetchedAccount.getUser().getId()); Assert.assertEquals(user.getName(), fetchedAccount.getUser().getName()); - + List loggedSql = LoggedSqlCollector.stop(); Assert.assertEquals(2, loggedSql.size()); - // select t0.id c0, t0.name c1, t0.version c2, t0.when_created c3, t0.when_updated c4, t1.id c5 - // from oto_account t0 - // join oto_user t1 on t1.account_id = t0.id - // where t0.id = ? + // select t0.id c0, t0.name c1, t0.version c2, t0.when_created c3, t0.when_updated c4, t1.id c5 + // from oto_account t0 + // join oto_user t1 on t1.account_id = t0.id + // where t0.id = ? String sql = trimSql(loggedSql.get(0), 1); Assert.assertTrue(sql.contains("select t0.id, t0.name")); Assert.assertTrue(sql.contains(" from oto_account t0 left join oto_user t1 on t1.account_id = t0.id where t0.id = ?")); - + String lazyLoadSql = trimSql(loggedSql.get(1), 5); Assert.assertTrue(lazyLoadSql.contains("select t0.id, t0.name, t0.version, t0.when_created, t0.when_modified, t0.account_id from oto_user t0 where t0.id = ?")); } - + @Test public void testWithUserFetch() { @@ -79,28 +79,28 @@ public class TestOneToOneOptionalRelationship extends BaseTestCase { Account account = new Account(); account.setName("AC786"); account.save(); - + User user = new User(); user.setName("Jane"); user.setAccount(account); user.save(); - + LoggedSqlCollector.start(); - + Account fetchedAccount = Account.find.fetch("user").setId(account.getId()).findUnique(); Assert.assertNotNull(fetchedAccount); - + Assert.assertNotNull(fetchedAccount.getUser()); Assert.assertEquals(user.getId(), fetchedAccount.getUser().getId()); Assert.assertEquals(user.getName(), fetchedAccount.getUser().getName()); - + List loggedSql = LoggedSqlCollector.stop(); Assert.assertEquals(1, loggedSql.size()); - // select t0.id c0, t0.name c1, t0.version c2, t0.when_created c3, t0.when_updated c4, t1.id c5 - // from oto_account t0 - // join oto_user t1 on t1.account_id = t0.id - // where t0.id = ? + // select t0.id c0, t0.name c1, t0.version c2, t0.when_created c3, t0.when_updated c4, t1.id c5 + // from oto_account t0 + // join oto_user t1 on t1.account_id = t0.id + // where t0.id = ? String sql = trimSql(loggedSql.get(0), 1); Assert.assertTrue(sql.contains("select t0.id, t0.name")); diff --git a/src/test/java/com/avaje/tests/model/onetoone/User.java b/src/test/java/com/avaje/tests/model/onetoone/User.java index e1cfd8b6c..30d8f0c1c 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/User.java +++ b/src/test/java/com/avaje/tests/model/onetoone/User.java @@ -1,19 +1,20 @@ package com.avaje.tests.model.onetoone; +import com.avaje.tests.model.BaseModel; + import javax.persistence.Entity; import javax.persistence.OneToOne; import javax.persistence.Table; -import com.avaje.tests.model.BaseModel; - @Entity -@Table(name="oto_user") +@Table(name = "oto_user") public class User extends BaseModel { - public static final Find find = new Find(){}; + public static final Find find = new Find() { + }; String name; - + @OneToOne(optional = false) Account account; @@ -32,5 +33,5 @@ public class User extends BaseModel { public void setAccount(Account account) { this.account = account; } - + } diff --git a/src/test/java/com/avaje/tests/model/onetoone/album/Cover.java b/src/test/java/com/avaje/tests/model/onetoone/album/Cover.java index c274dfb4b..e2b097bb8 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/album/Cover.java +++ b/src/test/java/com/avaje/tests/model/onetoone/album/Cover.java @@ -5,7 +5,6 @@ import com.avaje.ebean.annotation.SoftDelete; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.PreRemove; diff --git a/src/test/java/com/avaje/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/src/test/java/com/avaje/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java index adde5f4fe..73153fc4a 100644 --- a/src/test/java/com/avaje/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java +++ b/src/test/java/com/avaje/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java @@ -49,9 +49,9 @@ public class DeleteById_SoftDelete_Tests extends BaseTestCase { assertNull(findWhenSoft); Cover cover1 = Ebean.find(Cover.class) - .setIncludeSoftDeletes() - .setId(cover.getId()) - .findUnique(); + .setIncludeSoftDeletes() + .setId(cover.getId()) + .findUnique(); cover1.setDeleted(false); diff --git a/src/test/java/com/avaje/tests/model/orderentity/OrderEntity.java b/src/test/java/com/avaje/tests/model/orderentity/OrderEntity.java index 981288c52..c402c8883 100644 --- a/src/test/java/com/avaje/tests/model/orderentity/OrderEntity.java +++ b/src/test/java/com/avaje/tests/model/orderentity/OrderEntity.java @@ -1,7 +1,5 @@ package com.avaje.tests.model.orderentity; -import java.util.List; - import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; @@ -9,13 +7,14 @@ import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; +import java.util.List; @Entity @Table(name = "s_orders") -public class OrderEntity { +public class OrderEntity { /** - * Rob Note: Ideally this would be a UUID rather than a String type - then Ebean would automatically + * Rob Note: Ideally this would be a UUID rather than a String type - then Ebean would automatically * assign a UUID based id generator and 'do the right thing'. */ @Id @@ -40,6 +39,6 @@ public class OrderEntity { public void setItems(List items) { this.items = items; } - - + + } diff --git a/src/test/java/com/avaje/tests/model/orderentity/OrderItemEntity.java b/src/test/java/com/avaje/tests/model/orderentity/OrderItemEntity.java index 897a9fe6b..9d85ac551 100644 --- a/src/test/java/com/avaje/tests/model/orderentity/OrderItemEntity.java +++ b/src/test/java/com/avaje/tests/model/orderentity/OrderItemEntity.java @@ -1,20 +1,19 @@ package com.avaje.tests.model.orderentity; -import java.math.BigDecimal; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; +import java.math.BigDecimal; @Entity @Table(name = "s_order_items") public class OrderItemEntity { /** - * Rob Note: Ideally this would be a UUID rather than a String type - then Ebean would automatically + * Rob Note: Ideally this would be a UUID rather than a String type - then Ebean would automatically * assign a UUID based id generator and 'do the right thing'. */ @Id @@ -72,4 +71,4 @@ public class OrderItemEntity { this.amount = amount; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/prnt/MPrinter.java b/src/test/java/com/avaje/tests/model/prnt/MPrinter.java index b75ff1021..6117ea3c6 100644 --- a/src/test/java/com/avaje/tests/model/prnt/MPrinter.java +++ b/src/test/java/com/avaje/tests/model/prnt/MPrinter.java @@ -1,6 +1,12 @@ package com.avaje.tests.model.prnt; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.Version; @Entity public class MPrinter { @@ -13,19 +19,28 @@ public class MPrinter { String name; - @Column(name="flags", nullable=false) - long allFlags=0L; + @Column(name = "flags", nullable = false) + long allFlags = 0L; - @Column(name="dwid",nullable=false) MSomeOther dataWarehouseId; + @Column(name = "dwid", nullable = false) + MSomeOther dataWarehouseId; - @JoinColumn(name="current_state_id") + @JoinColumn(name = "current_state_id") @ManyToOne MPrinterState currentState; - @JoinColumn(name="last_swap_cyan_id") @OneToOne private MPrinterState lastTonerSwapCyan; - @JoinColumn(name="last_swap_magenta_id") @OneToOne private MPrinterState lastTonerSwapMagenta; - @JoinColumn(name="last_swap_yellow_id") @OneToOne private MPrinterState lastTonerSwapYellow; - @JoinColumn(name="last_swap_black_id") @OneToOne private MPrinterState lastTonerSwapBlack; + @JoinColumn(name = "last_swap_cyan_id") + @OneToOne + private MPrinterState lastTonerSwapCyan; + @JoinColumn(name = "last_swap_magenta_id") + @OneToOne + private MPrinterState lastTonerSwapMagenta; + @JoinColumn(name = "last_swap_yellow_id") + @OneToOne + private MPrinterState lastTonerSwapYellow; + @JoinColumn(name = "last_swap_black_id") + @OneToOne + private MPrinterState lastTonerSwapBlack; public Long getId() { return id; diff --git a/src/test/java/com/avaje/tests/model/prnt/MPrinterListener.java b/src/test/java/com/avaje/tests/model/prnt/MPrinterListener.java index 2423ab97a..4d1e8ef31 100644 --- a/src/test/java/com/avaje/tests/model/prnt/MPrinterListener.java +++ b/src/test/java/com/avaje/tests/model/prnt/MPrinterListener.java @@ -18,7 +18,7 @@ public class MPrinterListener extends BeanPersistAdapter { public boolean preUpdate(BeanPersistRequest request) { logger.info("preUpdate ..."); - logger.info("preUpdate ..."+request.getUpdatedValues()); + logger.info("preUpdate ..." + request.getUpdatedValues()); request.getUpdatedProperties(); return super.preUpdate(request); } diff --git a/src/test/java/com/avaje/tests/model/prnt/MPrinterState.java b/src/test/java/com/avaje/tests/model/prnt/MPrinterState.java index 891916fcf..88594cfd2 100644 --- a/src/test/java/com/avaje/tests/model/prnt/MPrinterState.java +++ b/src/test/java/com/avaje/tests/model/prnt/MPrinterState.java @@ -1,6 +1,11 @@ package com.avaje.tests.model.prnt; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Version; @Entity public class MPrinterState { @@ -13,9 +18,10 @@ public class MPrinterState { long flags; - @Column(name="dwid",nullable=false) MSomeOther dataWarehouseId; + @Column(name = "dwid", nullable = false) + MSomeOther dataWarehouseId; - @JoinColumn(name="printer_id") + @JoinColumn(name = "printer_id") @ManyToOne MPrinter printer; diff --git a/src/test/java/com/avaje/tests/model/pview/Paggview.java b/src/test/java/com/avaje/tests/model/pview/Paggview.java index 4ea8bf0ce..963392f6d 100644 --- a/src/test/java/com/avaje/tests/model/pview/Paggview.java +++ b/src/test/java/com/avaje/tests/model/pview/Paggview.java @@ -30,5 +30,5 @@ public class Paggview { public void setAmount(Integer amount) { this.amount = amount; } - + } diff --git a/src/test/java/com/avaje/tests/model/pview/Pview.java b/src/test/java/com/avaje/tests/model/pview/Pview.java index 126bdaaab..e7a073f9d 100644 --- a/src/test/java/com/avaje/tests/model/pview/Pview.java +++ b/src/test/java/com/avaje/tests/model/pview/Pview.java @@ -1,8 +1,5 @@ package com.avaje.tests.model.pview; -import java.util.List; -import java.util.UUID; - import javax.persistence.Basic; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -13,6 +10,8 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToMany; import javax.persistence.Table; +import java.util.List; +import java.util.UUID; @Entity @Table(name = "pp") @@ -27,7 +26,7 @@ public class Pview { @Column(length = 100, nullable = false) private String value; - @JoinTable(name = "pp_to_ww", joinColumns = { @JoinColumn(name = "pp_id", referencedColumnName = "id") }, inverseJoinColumns = { @JoinColumn(name = "ww_id", referencedColumnName = "id") }) + @JoinTable(name = "pp_to_ww", joinColumns = {@JoinColumn(name = "pp_id", referencedColumnName = "id")}, inverseJoinColumns = {@JoinColumn(name = "ww_id", referencedColumnName = "id")}) @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) private List wviews; diff --git a/src/test/java/com/avaje/tests/model/pview/TestPview.java b/src/test/java/com/avaje/tests/model/pview/TestPview.java index 28e809efd..380afd96d 100644 --- a/src/test/java/com/avaje/tests/model/pview/TestPview.java +++ b/src/test/java/com/avaje/tests/model/pview/TestPview.java @@ -14,16 +14,16 @@ public class TestPview extends BaseTestCase { public void test() { Wview wview = Ebean.getReference(Wview.class, UUID.randomUUID()); - + Query query = Ebean.find(Paggview.class); query.select("amount"); query.where().eq("pview.wviews", wview); query.orderBy("pview.value"); query.findList(); String generatedSql = sqlOf(query, 1); - + Assert.assertTrue(generatedSql.contains("select distinct t0.amount, t1.value from paggview t0 join pp u1 on u1.id = t0.pview_id join pp_to_ww u2z_ on u2z_.pp_id = u1.id join wview u2 on u2.id = u2z_.ww_id left join pp t1 on t1.id = t0.pview_id where u2.id = ? order by t1.value")); - + } - + } diff --git a/src/test/java/com/avaje/tests/model/pview/Wview.java b/src/test/java/com/avaje/tests/model/pview/Wview.java index a33cac601..74d4956cf 100644 --- a/src/test/java/com/avaje/tests/model/pview/Wview.java +++ b/src/test/java/com/avaje/tests/model/pview/Wview.java @@ -1,12 +1,11 @@ package com.avaje.tests.model.pview; -import java.util.UUID; - import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; +import java.util.UUID; @Entity @Table(name = "wview") @@ -36,4 +35,4 @@ public class Wview { this.name = name; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/selfref/BaseResourceFile.java b/src/test/java/com/avaje/tests/model/selfref/BaseResourceFile.java index 40c30035f..27f31354c 100644 --- a/src/test/java/com/avaje/tests/model/selfref/BaseResourceFile.java +++ b/src/test/java/com/avaje/tests/model/selfref/BaseResourceFile.java @@ -1,14 +1,13 @@ package com.avaje.tests.model.selfref; -import java.util.UUID; - import javax.persistence.Column; import javax.persistence.Id; import javax.persistence.MappedSuperclass; +import java.util.UUID; @MappedSuperclass public abstract class BaseResourceFile { - + private static final long serialVersionUID = 1L; @Id diff --git a/src/test/java/com/avaje/tests/model/selfref/ResourceFile.java b/src/test/java/com/avaje/tests/model/selfref/ResourceFile.java index 5a328da44..20e87c0ab 100644 --- a/src/test/java/com/avaje/tests/model/selfref/ResourceFile.java +++ b/src/test/java/com/avaje/tests/model/selfref/ResourceFile.java @@ -1,7 +1,6 @@ package com.avaje.tests.model.selfref; -import java.util.HashSet; -import java.util.Set; +import com.avaje.ebean.annotation.PrivateOwned; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -11,13 +10,13 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Table; - -import com.avaje.ebean.annotation.PrivateOwned; +import java.util.HashSet; +import java.util.Set; @Entity @Table(name = "resourcefile") public class ResourceFile extends BaseResourceFile { - + private static final long serialVersionUID = 1L; @ManyToOne(fetch = FetchType.LAZY, optional = true) @@ -54,4 +53,4 @@ public class ResourceFile extends BaseResourceFile { public void setAlternatives(Set alternatives) { this.alternatives = alternatives; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/selfref/SelfParent.java b/src/test/java/com/avaje/tests/model/selfref/SelfParent.java index 3c0c27db4..c3ef61b7d 100644 --- a/src/test/java/com/avaje/tests/model/selfref/SelfParent.java +++ b/src/test/java/com/avaje/tests/model/selfref/SelfParent.java @@ -1,41 +1,40 @@ package com.avaje.tests.model.selfref; -import java.util.List; - import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Table; import javax.persistence.Version; +import java.util.List; @Entity -@Table(name="self_parent") +@Table(name = "self_parent") public class SelfParent { @Id Long id; - + @Version Long version; - + String name; - + @ManyToOne() SelfParent parent; - - @OneToMany(mappedBy="parent") + + @OneToMany(mappedBy = "parent") List children; public SelfParent(String name, SelfParent parent) { - this.name = name; + this.name = name; this.parent = parent; } - + public SelfParent() { - + } - + public Long getId() { return id; } @@ -74,5 +73,5 @@ public class SelfParent { public void setChildren(List children) { this.children = children; - } + } } diff --git a/src/test/java/com/avaje/tests/model/selfref/SelfRefExample.java b/src/test/java/com/avaje/tests/model/selfref/SelfRefExample.java index 713142f79..0495fa9ce 100644 --- a/src/test/java/com/avaje/tests/model/selfref/SelfRefExample.java +++ b/src/test/java/com/avaje/tests/model/selfref/SelfRefExample.java @@ -1,13 +1,12 @@ package com.avaje.tests.model.selfref; -import java.util.List; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.OrderBy; +import java.util.List; @Entity public class SelfRefExample { @@ -38,8 +37,7 @@ public class SelfRefExample { } /** - * @param id - * the id to set + * @param id the id to set */ public void setId(Long id) { this.id = id; @@ -53,8 +51,7 @@ public class SelfRefExample { } /** - * @param name - * the name to set + * @param name the name to set */ public void setName(String name) { this.name = name; @@ -68,8 +65,7 @@ public class SelfRefExample { } /** - * @param parent - * the parent to set + * @param parent the parent to set */ public void setParent(SelfRefExample parent) { this.parent = parent; @@ -83,8 +79,7 @@ public class SelfRefExample { } /** - * @param children - * the children to set + * @param children the children to set */ public void setChildren(List children) { this.children = children; diff --git a/src/test/java/com/avaje/tests/model/selfref/TestResourceFileSelfRef.java b/src/test/java/com/avaje/tests/model/selfref/TestResourceFileSelfRef.java index f49d7e829..995de0ef4 100644 --- a/src/test/java/com/avaje/tests/model/selfref/TestResourceFileSelfRef.java +++ b/src/test/java/com/avaje/tests/model/selfref/TestResourceFileSelfRef.java @@ -1,16 +1,15 @@ package com.avaje.tests.model.selfref; import com.avaje.ebean.BaseTestCase; -import org.junit.Test; - import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; +import org.junit.Test; public class TestResourceFileSelfRef extends BaseTestCase { @Test public void test() { - + EbeanServer server = Ebean.getServer(null); ResourceFile childFile1 = new ResourceFile(); diff --git a/src/test/java/com/avaje/tests/model/selfref/TestSelfRefExample.java b/src/test/java/com/avaje/tests/model/selfref/TestSelfRefExample.java index 1d7a671ec..145bad703 100644 --- a/src/test/java/com/avaje/tests/model/selfref/TestSelfRefExample.java +++ b/src/test/java/com/avaje/tests/model/selfref/TestSelfRefExample.java @@ -1,17 +1,15 @@ package com.avaje.tests.model.selfref; -import java.util.List; - -import org.junit.Test; - -import static org.assertj.core.api.Assertions.*; -import static org.junit.Assert.assertEquals; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; +import org.junit.Test; import javax.persistence.PersistenceException; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; public class TestSelfRefExample extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/model/selfref/TestTextJsonSelfRef.java b/src/test/java/com/avaje/tests/model/selfref/TestTextJsonSelfRef.java index 9da8647eb..18842464e 100644 --- a/src/test/java/com/avaje/tests/model/selfref/TestTextJsonSelfRef.java +++ b/src/test/java/com/avaje/tests/model/selfref/TestTextJsonSelfRef.java @@ -1,14 +1,12 @@ package com.avaje.tests.model.selfref; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.BeanState; import com.avaje.ebean.Ebean; -import com.avaje.ebean.TxRunnable; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestTextJsonSelfRef extends BaseTestCase { @@ -37,13 +35,13 @@ public class TestTextJsonSelfRef extends BaseTestCase { }); List customers = Ebean.find(SelfRefCustomer.class).orderBy("id desc").findList(); - + // Check that there are no 'reference' beans here - for (SelfRefCustomer cust: customers) { + for (SelfRefCustomer cust : customers) { BeanState beanState = Ebean.getBeanState(cust); Assert.assertFalse(beanState.isReference()); } - + // JsonWriteOptions options = JsonWriteOptions.parsePath("(id,name,referredBy(id))"); // String customerContent = Ebean.createJsonContext().toJson(customers);//, false, options); // System.out.println("Customers: " + customerContent); @@ -54,4 +52,4 @@ public class TestTextJsonSelfRef extends BaseTestCase { // customerContent); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/model/softdelete/ESoftDelBook.java b/src/test/java/com/avaje/tests/model/softdelete/ESoftDelBook.java index a6556c3db..02a372099 100644 --- a/src/test/java/com/avaje/tests/model/softdelete/ESoftDelBook.java +++ b/src/test/java/com/avaje/tests/model/softdelete/ESoftDelBook.java @@ -5,7 +5,6 @@ import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.ManyToMany; import javax.persistence.ManyToOne; - import java.util.List; @Entity @@ -46,6 +45,7 @@ public class ESoftDelBook extends BaseSoftDelete { public void setLendBy(ESoftDelUser lendBy) { this.lendBy = lendBy; } + public ESoftDelUser getLendBy() { return lendBy; } diff --git a/src/test/java/com/avaje/tests/model/survey/TestOrderByFetch.java b/src/test/java/com/avaje/tests/model/survey/TestOrderByFetch.java index 5f4c1cbec..8fa8ff87b 100644 --- a/src/test/java/com/avaje/tests/model/survey/TestOrderByFetch.java +++ b/src/test/java/com/avaje/tests/model/survey/TestOrderByFetch.java @@ -42,11 +42,11 @@ public class TestOrderByFetch extends BaseTestCase { Ebean.save(survey); Survey foundSurvey = Ebean.find(Survey.class) - .setDisableLazyLoading(true) - .fetch("categories") - .fetch("categories.groups") - .fetch("categories.groups.questions") - .findUnique(); + .setDisableLazyLoading(true) + .fetch("categories") + .fetch("categories.groups") + .fetch("categories.groups.questions") + .findUnique(); assertEquals(1, foundSurvey.getCategories().size()); diff --git a/src/test/java/com/avaje/tests/model/tevent/TestAssocOneNullTraverse.java b/src/test/java/com/avaje/tests/model/tevent/TestAssocOneNullTraverse.java index b03df5547..171b113bc 100644 --- a/src/test/java/com/avaje/tests/model/tevent/TestAssocOneNullTraverse.java +++ b/src/test/java/com/avaje/tests/model/tevent/TestAssocOneNullTraverse.java @@ -13,8 +13,8 @@ public class TestAssocOneNullTraverse extends BaseTestCase { Ebean.save(event); Ebean.find(TEvent.class) - .fetch("one.logs") - .findList(); + .fetch("one.logs") + .findList(); } // @Test diff --git a/src/test/java/com/avaje/tests/model/types/SomeFileBean.java b/src/test/java/com/avaje/tests/model/types/SomeFileBean.java index 39a4aaa3b..2a4d3512c 100644 --- a/src/test/java/com/avaje/tests/model/types/SomeFileBean.java +++ b/src/test/java/com/avaje/tests/model/types/SomeFileBean.java @@ -1,6 +1,9 @@ package com.avaje.tests.model.types; -import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Lob; +import javax.persistence.Version; import java.io.File; @Entity diff --git a/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java b/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java index cc3015ddd..ad7c49ebd 100644 --- a/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java +++ b/src/test/java/com/avaje/tests/model/types/SomeNewTypesBean.java @@ -5,7 +5,17 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Version; import java.nio.file.Path; -import java.time.*; +import java.time.DayOfWeek; +import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.Month; +import java.time.OffsetDateTime; +import java.time.Year; +import java.time.YearMonth; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; @Entity public class SomeNewTypesBean { diff --git a/src/test/java/com/avaje/tests/model/types/SomePeriodBean.java b/src/test/java/com/avaje/tests/model/types/SomePeriodBean.java index 398e41017..d37d8ff65 100644 --- a/src/test/java/com/avaje/tests/model/types/SomePeriodBean.java +++ b/src/test/java/com/avaje/tests/model/types/SomePeriodBean.java @@ -3,7 +3,8 @@ package com.avaje.tests.model.types; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Version; -import java.time.*; +import java.time.MonthDay; +import java.time.Period; @Entity public class SomePeriodBean { diff --git a/src/test/java/com/avaje/tests/model/view/EOrderAgg.java b/src/test/java/com/avaje/tests/model/view/EOrderAgg.java index ee36547d4..c4fd3cf03 100644 --- a/src/test/java/com/avaje/tests/model/view/EOrderAgg.java +++ b/src/test/java/com/avaje/tests/model/view/EOrderAgg.java @@ -15,7 +15,8 @@ import javax.persistence.OneToOne; @View(name = "order_agg_vw", dependentTables = {"o_order", "o_order_detail"}) public class EOrderAgg { - @Id @Column(name = "order_id") + @Id + @Column(name = "order_id") Long id; @OneToOne diff --git a/src/test/java/com/avaje/tests/model/view/TestViewBaseEntity.java b/src/test/java/com/avaje/tests/model/view/TestViewBaseEntity.java index 32ba8db6f..9f1809a93 100644 --- a/src/test/java/com/avaje/tests/model/view/TestViewBaseEntity.java +++ b/src/test/java/com/avaje/tests/model/view/TestViewBaseEntity.java @@ -20,8 +20,8 @@ public class TestViewBaseEntity extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(EOrderAgg.class) - .where().gt("orderTotal", 20) - .query(); + .where().gt("orderTotal", 20) + .query(); List list = query.findList(); @@ -35,9 +35,9 @@ public class TestViewBaseEntity extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(EOrderAgg.class) - //.fetch("order", "id") - .where().gt("orderTotal", 20) - .query(); + //.fetch("order", "id") + .where().gt("orderTotal", 20) + .query(); List list = query.findList(); for (EOrderAgg agg : list) { @@ -53,10 +53,10 @@ public class TestViewBaseEntity extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(EOrderAgg.class) - .fetch("order") - .fetch("order.details") - .where().gt("orderTotal", 20) - .query(); + .fetch("order") + .fetch("order.details") + .where().gt("orderTotal", 20) + .query(); List list = query.findList(); for (EOrderAgg agg : list) { diff --git a/src/test/java/com/avaje/tests/model/zero/WithZeroParent.java b/src/test/java/com/avaje/tests/model/zero/WithZeroParent.java index 010c935c4..f8f78687a 100644 --- a/src/test/java/com/avaje/tests/model/zero/WithZeroParent.java +++ b/src/test/java/com/avaje/tests/model/zero/WithZeroParent.java @@ -1,6 +1,11 @@ package com.avaje.tests.model.zero; -import javax.persistence.*; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.persistence.Table; import java.util.List; @Entity @@ -18,6 +23,7 @@ public class WithZeroParent { public void setId(int id) { this.id = id; } + public int getId() { return id; } @@ -38,4 +44,4 @@ public class WithZeroParent { this.children = children; } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java index b85678f0c..c3305ddbb 100644 --- a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java +++ b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java @@ -12,32 +12,32 @@ public class TestPersistenceContextOnUpdateDuringTxn extends BaseTestCase { @Test public void test() { - + EbeanServer server = Ebean.getServer(null); - + server.beginTransaction(); try { - + EBasic bean1 = new EBasic(); bean1.setName("hello"); - + server.save(bean1); - + EBasic updatedEntity = new EBasic(); updatedEntity.setId(bean1.getId()); updatedEntity.setName("hello-changed"); - + server.update(updatedEntity); - + // actually the bean is not in the persistence context so ... the assert is fine - EBasic loadedEntity = server.find(EBasic.class,bean1.getId()); + EBasic loadedEntity = server.find(EBasic.class, bean1.getId()); assertThat(loadedEntity.getName()).isEqualTo("hello-changed"); } finally { server.endTransaction(); } - + } - + } diff --git a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextQueryScope.java b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextQueryScope.java index 1a2cd85ce..5c37cf90a 100644 --- a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextQueryScope.java +++ b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextQueryScope.java @@ -6,7 +6,8 @@ import com.avaje.ebean.SqlUpdate; import com.avaje.tests.model.basic.EBasicVer; import org.junit.Test; -import static com.avaje.ebean.PersistenceContextScope.*; +import static com.avaje.ebean.PersistenceContextScope.QUERY; +import static com.avaje.ebean.PersistenceContextScope.TRANSACTION; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; @@ -35,24 +36,24 @@ public class TestPersistenceContextQueryScope extends BaseTestCase { // fetch the bean again... but doesn't hit DB as it // is in the PersistenceContext which is transaction scoped EBasicVer bean2 = Ebean.find(EBasicVer.class) - .setId(bean.getId()) - .setUseCache(false) // ignore L2 cache - .findUnique(); + .setId(bean.getId()) + .setUseCache(false) // ignore L2 cache + .findUnique(); // QUERY scope hits the DB (doesn't use the existing transactions persistence context) // ... also explicitly not use bean cache EBasicVer bean3 = Ebean.find(EBasicVer.class) - .setId(bean.getId()) - .setUseCache(false) // ignore L2 cache - .setPersistenceContextScope(QUERY) - .findUnique(); + .setId(bean.getId()) + .setUseCache(false) // ignore L2 cache + .setPersistenceContextScope(QUERY) + .findUnique(); // TRANsACTION scope ... same as bean2 and does not hit the DB EBasicVer bean5 = Ebean.find(EBasicVer.class) - .setId(bean.getId()) - .setUseCache(false) // ignore L2 cache - .setPersistenceContextScope(TRANSACTION) - .findUnique(); + .setId(bean.getId()) + .setUseCache(false) // ignore L2 cache + .setPersistenceContextScope(TRANSACTION) + .findUnique(); assertEquals("first", bean.getName()); assertEquals("first", bean1.getName()); diff --git a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java index 09d15e5fd..40c7e361a 100644 --- a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java +++ b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java @@ -24,12 +24,12 @@ public class TestPersistenceContextScopeUsingOrders extends BaseTestCase { ResetBasicData.reset(); List orders = Ebean.find(Order.class) - // Use QUERY or TRANSACTION scope (just not NONE) - .setPersistenceContextScope(QUERY) - .fetch("customer", "id, name") - .where().istartsWith("customer.name", "rob").eq("customer.id", 1) - .orderBy().asc("customer.name") - .findList(); + // Use QUERY or TRANSACTION scope (just not NONE) + .setPersistenceContextScope(QUERY) + .fetch("customer", "id, name") + .where().istartsWith("customer.name", "rob").eq("customer.id", 1) + .orderBy().asc("customer.name") + .findList(); assertTrue(!orders.isEmpty()); diff --git a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextServerConfig.java b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextServerConfig.java index f3dac5fd1..d7768576b 100644 --- a/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextServerConfig.java +++ b/src/test/java/com/avaje/tests/persistencecontext/TestPersistenceContextServerConfig.java @@ -21,7 +21,7 @@ public class TestPersistenceContextServerConfig extends BaseTestCase { @Test public void test_config() { - SpiEbeanServer ebeanServer = (SpiEbeanServer)create(); + SpiEbeanServer ebeanServer = (SpiEbeanServer) create(); Query query = ebeanServer.find(EBasicVer.class); @@ -38,10 +38,10 @@ public class TestPersistenceContextServerConfig extends BaseTestCase { config.setName("withPCQuery"); Properties properties = new Properties(); - properties.setProperty("datasource.withPCQuery.username","sa"); - properties.setProperty("datasource.withPCQuery.password",""); - properties.setProperty("datasource.withPCQuery.databaseUrl","jdbc:h2:mem:withPCQuery;"); - properties.setProperty("datasource.withPCQuery.databaseDriver","org.h2.Driver"); + properties.setProperty("datasource.withPCQuery.username", "sa"); + properties.setProperty("datasource.withPCQuery.password", ""); + properties.setProperty("datasource.withPCQuery.databaseUrl", "jdbc:h2:mem:withPCQuery;"); + properties.setProperty("datasource.withPCQuery.databaseDriver", "org.h2.Driver"); config.loadFromProperties(properties); config.setPersistenceContextScope(PersistenceContextScope.QUERY); diff --git a/src/test/java/com/avaje/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/src/test/java/com/avaje/tests/query/TestAddOrderByWithFirstRowsMaxRows.java index 0f94b37a4..7a28eeab5 100644 --- a/src/test/java/com/avaje/tests/query/TestAddOrderByWithFirstRowsMaxRows.java +++ b/src/test/java/com/avaje/tests/query/TestAddOrderByWithFirstRowsMaxRows.java @@ -25,9 +25,9 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { LoggedSqlCollector.start(); Ebean.find(Order.class) - .setFirstRow(3) - .orderBy().asc("id") - .findList(); + .setFirstRow(3) + .orderBy().asc("id") + .findList(); List loggedSql = LoggedSqlCollector.stop(); @@ -44,8 +44,8 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { LoggedSqlCollector.start(); Ebean.find(Order.class) - .setMaxRows(10) - .findList(); + .setMaxRows(10) + .findList(); List loggedSql = LoggedSqlCollector.stop(); @@ -62,10 +62,10 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { LoggedSqlCollector.start(); Ebean.find(Order.class) - .setFirstRow(3) - .setMaxRows(10) - .orderBy().asc("id") - .findList(); + .setFirstRow(3) + .setMaxRows(10) + .orderBy().asc("id") + .findList(); List loggedSql = LoggedSqlCollector.stop(); @@ -83,8 +83,8 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { // maxRows 1 with no first rows means Ebean does not automatically // add the order by id to the query Ebean.find(Order.class) - .setMaxRows(1) - .findList(); + .setMaxRows(1) + .findList(); List loggedSql = LoggedSqlCollector.stop(); @@ -100,9 +100,9 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { LoggedSqlCollector.start(); PagedList pagedList = - Ebean.find(Order.class) - .setMaxRows(10) - .findPagedList(); + Ebean.find(Order.class) + .setMaxRows(10) + .findPagedList(); pagedList.getList(); @@ -120,10 +120,10 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { LoggedSqlCollector.start(); Ebean.find(Order.class) - .setFirstRow(10) - .setMaxRows(10) - .findPagedList() - .getList(); + .setFirstRow(10) + .setMaxRows(10) + .findPagedList() + .getList(); List loggedSql = LoggedSqlCollector.stop(); @@ -140,10 +140,10 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { LoggedSqlCollector.start(); Ebean.find(Order.class) - .order().asc("orderDate") - .setMaxRows(10) - .findPagedList() - .getList(); + .order().asc("orderDate") + .setMaxRows(10) + .findPagedList() + .getList(); List loggedSql = LoggedSqlCollector.stop(); @@ -159,11 +159,11 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase { LoggedSqlCollector.start(); Ebean.find(Order.class) - .order().asc("orderDate") - .order().desc("id") - .setMaxRows(10) - .findPagedList() - .getList(); + .order().asc("orderDate") + .order().desc("id") + .setMaxRows(10) + .findPagedList() + .getList(); List loggedSql = LoggedSqlCollector.stop(); diff --git a/src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java b/src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java index fa86f7b4d..bfa0e0468 100644 --- a/src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java +++ b/src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java @@ -27,10 +27,10 @@ public class TestAutofetchTuneWithJoin extends BaseTestCase { ResetBasicData.reset(); Query q = Ebean.find(Order.class) - .setAutoTune(true) - //.fetch("customer") - //.fetch("customer.contacts") - .where().lt("id", 3).query(); + .setAutoTune(true) + //.fetch("customer") + //.fetch("customer.contacts") + .where().lt("id", 3).query(); List list = q.findList(); diff --git a/src/test/java/com/avaje/tests/query/TestConnectionCloseOnSqlerr.java b/src/test/java/com/avaje/tests/query/TestConnectionCloseOnSqlerr.java index 24caa19f2..1182b6976 100644 --- a/src/test/java/com/avaje/tests/query/TestConnectionCloseOnSqlerr.java +++ b/src/test/java/com/avaje/tests/query/TestConnectionCloseOnSqlerr.java @@ -1,12 +1,11 @@ package com.avaje.tests.query; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.Customer; +import org.junit.Assert; +import org.junit.Test; public class TestConnectionCloseOnSqlerr extends BaseTestCase { @@ -23,7 +22,7 @@ public class TestConnectionCloseOnSqlerr extends BaseTestCase { for (int i = 0; i < 100; i++) { try { Query q0 = Ebean.find(Customer.class).where().icontains("namexxx", "Rob") - .query(); + .query(); q0.findList(); } catch (Exception e) { @@ -53,7 +52,7 @@ public class TestConnectionCloseOnSqlerr extends BaseTestCase { try { Ebean.beginTransaction(); Query q0 = Ebean.find(Customer.class).where().icontains("namexxx", "Rob") - .query(); + .query(); q0.findList(); Ebean.commitTransaction(); diff --git a/src/test/java/com/avaje/tests/query/TestDefaultFetchLazy.java b/src/test/java/com/avaje/tests/query/TestDefaultFetchLazy.java index 61bf4c6ba..2bf7da6c3 100644 --- a/src/test/java/com/avaje/tests/query/TestDefaultFetchLazy.java +++ b/src/test/java/com/avaje/tests/query/TestDefaultFetchLazy.java @@ -1,15 +1,14 @@ package com.avaje.tests.query; -import java.util.Set; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.BeanState; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.MyLobSize; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Set; public class TestDefaultFetchLazy extends BaseTestCase { @@ -40,7 +39,7 @@ public class TestDefaultFetchLazy extends BaseTestCase { // the details is also tuned Query queryMany = Ebean.find(MyLobSize.class).fetch("details")// ,"+query") - .where().gt("id", 0).query(); + .where().gt("id", 0).query(); queryMany.findList(); diff --git a/src/test/java/com/avaje/tests/query/TestExprNestedDisjunction.java b/src/test/java/com/avaje/tests/query/TestExprNestedDisjunction.java index 402879b28..74adeff5a 100644 --- a/src/test/java/com/avaje/tests/query/TestExprNestedDisjunction.java +++ b/src/test/java/com/avaje/tests/query/TestExprNestedDisjunction.java @@ -19,10 +19,10 @@ public class TestExprNestedDisjunction extends BaseTestCase { java.sql.Date onAfter = java.sql.Date.valueOf("2009-08-31"); Query q = Ebean.find(Customer.class).where() - .disjunction() - .conjunction().startsWith("name", "r").eq("anniversary", onAfter).endJunction() - .conjunction().eq("status", Customer.Status.ACTIVE).gt("id", 0).endJunction() - .orderBy().asc("name"); + .disjunction() + .conjunction().startsWith("name", "r").eq("anniversary", onAfter).endJunction() + .conjunction().eq("status", Customer.Status.ACTIVE).gt("id", 0).endJunction() + .orderBy().asc("name"); q.findList(); String s = q.getGeneratedSql(); @@ -40,13 +40,13 @@ public class TestExprNestedDisjunction extends BaseTestCase { java.sql.Date onAfter = java.sql.Date.valueOf("2009-08-31"); Query q = Ebean.find(Customer.class) - .where() - .or() - .and() - .startsWith("name", "r").eq("anniversary", onAfter).endAnd() - .and() - .eq("status", Customer.Status.ACTIVE).gt("id", 0).endAnd() - .orderBy().asc("name"); + .where() + .or() + .and() + .startsWith("name", "r").eq("anniversary", onAfter).endAnd() + .and() + .eq("status", Customer.Status.ACTIVE).gt("id", 0).endAnd() + .orderBy().asc("name"); q.findList(); String s = q.getGeneratedSql(); @@ -63,12 +63,12 @@ public class TestExprNestedDisjunction extends BaseTestCase { java.sql.Date onAfter = java.sql.Date.valueOf("2009-08-31"); Query q = Ebean.find(Customer.class) - .where() - .not() - .gt("id", 1) - .eq("anniversary", onAfter) - .endNot() - .orderBy().asc("name"); + .where() + .not() + .gt("id", 1) + .eq("anniversary", onAfter) + .endNot() + .orderBy().asc("name"); q.findList(); String s = q.getGeneratedSql(); @@ -84,13 +84,13 @@ public class TestExprNestedDisjunction extends BaseTestCase { java.sql.Date onAfter = java.sql.Date.valueOf("2009-08-31"); Query q = Ebean.find(Customer.class) - .where() - .or() - .eq("status", Customer.Status.ACTIVE) - .not() - .gt("id", 1) - .eq("anniversary", onAfter) - .orderBy().asc("name"); + .where() + .or() + .eq("status", Customer.Status.ACTIVE) + .not() + .gt("id", 1) + .eq("anniversary", onAfter) + .orderBy().asc("name"); q.findList(); String s = q.getGeneratedSql(); @@ -106,15 +106,15 @@ public class TestExprNestedDisjunction extends BaseTestCase { java.sql.Date onAfter = java.sql.Date.valueOf("2009-08-31"); Query q = Ebean.find(Customer.class) - .where() - .or() - .eq("status", Customer.Status.ACTIVE) - .not() - .gt("id", 1) - .eq("anniversary", onAfter) - .endNot() - .endOr() - .orderBy().asc("name"); + .where() + .or() + .eq("status", Customer.Status.ACTIVE) + .not() + .gt("id", 1) + .eq("anniversary", onAfter) + .endNot() + .endOr() + .orderBy().asc("name"); q.findList(); String s = q.getGeneratedSql(); diff --git a/src/test/java/com/avaje/tests/query/TestImplicitJoinOnParentRelationship.java b/src/test/java/com/avaje/tests/query/TestImplicitJoinOnParentRelationship.java index 2168aa808..eaf2dc026 100644 --- a/src/test/java/com/avaje/tests/query/TestImplicitJoinOnParentRelationship.java +++ b/src/test/java/com/avaje/tests/query/TestImplicitJoinOnParentRelationship.java @@ -1,13 +1,12 @@ package com.avaje.tests.query; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; public class TestImplicitJoinOnParentRelationship extends BaseTestCase { @@ -17,37 +16,37 @@ public class TestImplicitJoinOnParentRelationship extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Customer.class) - .select("id, name") - .where().eq("orders.details.product.name", "Desk") - .query(); - + .select("id, name") + .where().eq("orders.details.product.name", "Desk") + .query(); + query.findList(); String expectedSql = "select distinct t0.id, t0.name from o_customer t0 join o_order u1 on u1.kcustomer_id = t0.id join o_order_detail u2 on u2.order_id = u1.id join o_product u3 on u3.id = u2.product_id where u3.name = ? "; Assert.assertEquals(expectedSql, sqlOf(query, 1)); - - // select distinct t0.id c0, t0.name c1 - // from o_customer t0 - // join o_order u1 on u1.kcustomer_id = t0.id - // join o_order_detail u2 on u2.order_id = u1.id - // join o_product u3 on u3.id = u2.product_id - // where u3.name = ? - + + // select distinct t0.id c0, t0.name c1 + // from o_customer t0 + // join o_order u1 on u1.kcustomer_id = t0.id + // join o_order_detail u2 on u2.order_id = u1.id + // join o_product u3 on u3.id = u2.product_id + // where u3.name = ? + } - - + + @Test public void testWithDisjunction() { ResetBasicData.reset(); Query query = Ebean.find(Customer.class) - .select("id, name") - .where().disjunction().eq("orders.details.product.name", "Desk").eq("id", 4).endJunction() - .query(); - + .select("id, name") + .where().disjunction().eq("orders.details.product.name", "Desk").eq("id", 4).endJunction() + .query(); + query.findList(); - + String expectedSql = "select distinct t0.id, t0.name from o_customer t0 left join o_order u1 on u1.kcustomer_id = t0.id left join o_order_detail u2 on u2.order_id = u1.id left join o_product u3 on u3.id = u2.product_id where (u3.name = ? or t0.id = ? ) "; Assert.assertEquals(expectedSql, sqlOf(query, 1)); } @@ -58,9 +57,9 @@ public class TestImplicitJoinOnParentRelationship extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Customer.class) - .select("id, name") - .where().or().eq("orders.details.product.name", "Desk").eq("id", 4).endJunction() - .query(); + .select("id, name") + .where().or().eq("orders.details.product.name", "Desk").eq("id", 4).endJunction() + .query(); query.findList(); diff --git a/src/test/java/com/avaje/tests/query/TestInvalidFetchPath.java b/src/test/java/com/avaje/tests/query/TestInvalidFetchPath.java index 2299eeae0..eeef34fa1 100644 --- a/src/test/java/com/avaje/tests/query/TestInvalidFetchPath.java +++ b/src/test/java/com/avaje/tests/query/TestInvalidFetchPath.java @@ -13,23 +13,23 @@ public class TestInvalidFetchPath extends BaseTestCase { public void invalidFetchPathAndProperties_expect_error() { Ebean.find(Customer.class) - .fetch("notValidPath", "notHaveProps") - .findList(); + .fetch("notValidPath", "notHaveProps") + .findList(); } @Test(expected = PersistenceException.class) public void invalidFetchPath_expect_error() { Ebean.find(Customer.class) - .fetch("notValidPath") - .findList(); + .fetch("notValidPath") + .findList(); } @Test public void fetchWithInvalidPropertyName_expect_allowed() { Ebean.find(Customer.class) - .fetch("billingAddress", "invalidPropertyName") - .findList(); + .fetch("billingAddress", "invalidPropertyName") + .findList(); } } diff --git a/src/test/java/com/avaje/tests/query/TestJoinOptOneCascade.java b/src/test/java/com/avaje/tests/query/TestJoinOptOneCascade.java index f7711bd80..f45ac9500 100644 --- a/src/test/java/com/avaje/tests/query/TestJoinOptOneCascade.java +++ b/src/test/java/com/avaje/tests/query/TestJoinOptOneCascade.java @@ -1,12 +1,11 @@ package com.avaje.tests.query; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.EOptOneA; +import org.junit.Assert; +import org.junit.Test; public class TestJoinOptOneCascade extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/query/TestLimitAlterFetchMany.java b/src/test/java/com/avaje/tests/query/TestLimitAlterFetchMany.java index e426c1142..c90925420 100644 --- a/src/test/java/com/avaje/tests/query/TestLimitAlterFetchMany.java +++ b/src/test/java/com/avaje/tests/query/TestLimitAlterFetchMany.java @@ -1,14 +1,13 @@ package com.avaje.tests.query; -import java.util.List; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Test; + +import java.util.List; public class TestLimitAlterFetchMany extends BaseTestCase { @@ -23,9 +22,9 @@ public class TestLimitAlterFetchMany extends BaseTestCase { // limit offset clause Query query = Ebean.find(Customer.class) - // this will automatically get converted to a - // query join ... due to the maxRows - .fetch("contacts").setMaxRows(5); + // this will automatically get converted to a + // query join ... due to the maxRows + .fetch("contacts").setMaxRows(5); List list = query.findList(); diff --git a/src/test/java/com/avaje/tests/query/TestLimitQuery.java b/src/test/java/com/avaje/tests/query/TestLimitQuery.java index 1f7550671..8bb4998d0 100644 --- a/src/test/java/com/avaje/tests/query/TestLimitQuery.java +++ b/src/test/java/com/avaje/tests/query/TestLimitQuery.java @@ -17,14 +17,14 @@ public class TestLimitQuery extends BaseTestCase { ResetBasicData.reset(); List customers = Ebean.find(Customer.class) - .setAutoTune(false) - .setFirstRow(0) - .setMaxRows(10) - .where().like("name", "%A%") - .findList(); + .setAutoTune(false) + .setFirstRow(0) + .setMaxRows(10) + .where().like("name", "%A%") + .findList(); // should at least find the "Cust NoAddress" customer Assert.assertTrue(!customers.isEmpty()); } -} \ No newline at end of file +} diff --git a/src/test/java/com/avaje/tests/query/TestManyWhereJoin.java b/src/test/java/com/avaje/tests/query/TestManyWhereJoin.java index 310fa03f1..edbca4f22 100644 --- a/src/test/java/com/avaje/tests/query/TestManyWhereJoin.java +++ b/src/test/java/com/avaje/tests/query/TestManyWhereJoin.java @@ -1,8 +1,5 @@ package com.avaje.tests.query; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; @@ -10,6 +7,8 @@ import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.Product; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; public class TestManyWhereJoin extends BaseTestCase { @@ -19,19 +18,19 @@ public class TestManyWhereJoin extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Customer.class).select("id,status") - // the where on a 'many' (like orders) requires an - // additional join and distinct which is independent - // of a fetch join (if there is a fetch join) - .where().eq("orders.status", Order.Status.NEW) - // .where().eq("orders.details.product.name", "Desk") - .query(); + // the where on a 'many' (like orders) requires an + // additional join and distinct which is independent + // of a fetch join (if there is a fetch join) + .where().eq("orders.status", Order.Status.NEW) + // .where().eq("orders.details.product.name", "Desk") + .query(); query.findList(); String sql = sqlOf(query, 1); - - // select distinct t0.id c0, t0.status c1 - // from o_customer t0 - // join o_order u1 on u1.kcustomer_id = t0.id + + // select distinct t0.id c0, t0.status c1 + // from o_customer t0 + // join o_order u1 on u1.kcustomer_id = t0.id // where u1.status = ? ; --bind(NEW) Assert.assertTrue(sql.contains("select distinct ")); @@ -39,30 +38,30 @@ public class TestManyWhereJoin extends BaseTestCase { Assert.assertTrue(sql.contains(".status = ?")); Assert.assertTrue(sql.contains("select distinct t0.id, t0.status from o_customer t0 join o_order u1 on u1.kcustomer_id = t0.id where u1.status = ?")); } - + @Test public void testWithFetchJoinAndWhere() { ResetBasicData.reset(); Query query = Ebean.find(Customer.class).select("id,status") - .fetch("orders") - // the where on a 'many' (like orders) requires an - // additional join and distinct which is independent - // of a fetch join (if there is a fetch join) - .where().eq("orders.status", Order.Status.NEW) - // .where().eq("orders.details.product.name", "Desk") - .query(); + .fetch("orders") + // the where on a 'many' (like orders) requires an + // additional join and distinct which is independent + // of a fetch join (if there is a fetch join) + .where().eq("orders.status", Order.Status.NEW) + // .where().eq("orders.details.product.name", "Desk") + .query(); query.findList(); String sql = sqlOf(query, 3); - - // select distinct t0.id c0, t0.status c1, - // t1.id c2, t1.status c3, t1.order_date c4, t1.ship_date c5, t2.name c6, t1.cretime c7, t1.updtime c8, t1.kcustomer_id c9, t0.id - // from o_customer t0 + + // select distinct t0.id c0, t0.status c1, + // t1.id c2, t1.status c3, t1.order_date c4, t1.ship_date c5, t2.name c6, t1.cretime c7, t1.updtime c8, t1.kcustomer_id c9, t0.id + // from o_customer t0 // left join o_order t1 on t1.kcustomer_id = t0.id // left join o_customer t2 on t2.id = t1.kcustomer_id - // join o_order u1 on u1.kcustomer_id = t0.id + // join o_order u1 on u1.kcustomer_id = t0.id // where t1.order_date is not null and u1.status = ? // order by t0.id; --bind(NEW) @@ -71,94 +70,94 @@ public class TestManyWhereJoin extends BaseTestCase { Assert.assertTrue(sql.contains("join o_order u1 on ")); Assert.assertTrue(sql.contains(" u1.status = ?")); } - + @Test public void testUsingForeignKey() { - + ResetBasicData.reset(); - + Long productId = 1L; - + Query query = Ebean.find(Order.class) .where().eq("details.product.id", productId) .orderBy("cretime asc"); - + query.findList(); String sql = sqlOf(query, 3); - - // select distinct t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7, t0.cretime - // from o_order t0 - // join o_customer t1 on t1.id = t0.kcustomer_id - // join o_order_detail u1 on u1.order_id = t0.id - // where u1.product_id = ? + + // select distinct t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7, t0.cretime + // from o_order t0 + // join o_customer t1 on t1.id = t0.kcustomer_id + // join o_order_detail u1 on u1.order_id = t0.id + // where u1.product_id = ? // order by t0.cretime; --bind(1) - + Assert.assertTrue(sql.contains("select distinct t0.id, t0.status,")); Assert.assertTrue(sql.contains(" join o_order_detail u1 on u1.order_id = t0.id")); Assert.assertTrue(sql.contains(" where u1.product_id = ?")); } - + /** * Same as previous test but use a reference bean. */ @Test public void testUsingForeignKeyReferenceBean() { - + ResetBasicData.reset(); - + Product product = Ebean.getReference(Product.class, 1L); - + Query query = Ebean.find(Order.class) //.fetch("details") .where().eq("details.product", product) .orderBy("cretime asc"); - + query.findList(); String sql = sqlOf(query, 3); - - // select distinct t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7, t0.cretime - // from o_order t0 - // join o_customer t1 on t1.id = t0.kcustomer_id - // join o_order_detail u1 on u1.order_id = t0.id - // where u1.product_id = ? + + // select distinct t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7, t0.cretime + // from o_order t0 + // join o_customer t1 on t1.id = t0.kcustomer_id + // join o_order_detail u1 on u1.order_id = t0.id + // where u1.product_id = ? // order by t0.cretime - + Assert.assertTrue(sql.contains("select distinct t0.id, t0.status,")); Assert.assertTrue(sql.contains(" join o_order_detail u1 on u1.order_id = t0.id")); Assert.assertTrue(sql.contains(" where u1.product_id = ?")); } - + /** * Additionally add a fetch join. */ @Test public void testUsingForeignKeyAndFetch() { - + ResetBasicData.reset(); - + Product product = Ebean.getReference(Product.class, 1L); - + Query query = Ebean.find(Order.class) .fetch("details") .where().eq("details.product", product) .orderBy("cretime asc"); - + query.findList(); String sql = sqlOf(query, 3); - - // select distinct t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t2.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7, - // t1.id c8, t1.order_qty c9, t1.ship_qty c10, t1.unit_price c11, t1.cretime c12, t1.updtime c13, t1.order_id c14, t1.product_id c15, t0.cretime, t0.id, t1.id, t1.order_qty, t1.cretime - // from o_order t0 - // join o_customer t2 on t2.id = t0.kcustomer_id + + // select distinct t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t2.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7, + // t1.id c8, t1.order_qty c9, t1.ship_qty c10, t1.unit_price c11, t1.cretime c12, t1.updtime c13, t1.order_id c14, t1.product_id c15, t0.cretime, t0.id, t1.id, t1.order_qty, t1.cretime + // from o_order t0 + // join o_customer t2 on t2.id = t0.kcustomer_id // left join o_order_detail t1 on t1.order_id = t0.id - // join o_order_detail u1 on u1.order_id = t0.id - // where t1.id > 0 and u1.product_id = ? + // join o_order_detail u1 on u1.order_id = t0.id + // where t1.id > 0 and u1.product_id = ? // order by t0.cretime, t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc; --bind(1) Assert.assertTrue(sql.contains("select distinct t0.id, t0.status,")); Assert.assertTrue(sql.contains(" join o_order_detail u1 on u1.order_id = t0.id")); Assert.assertTrue(sql.contains(" u1.product_id = ?")); - + // additional join for fetching the many details Assert.assertTrue(sql.contains(" left join o_order_detail t1 on t1.order_id = t0.id")); } diff --git a/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java b/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java index 7ba3316df..af8c90171 100644 --- a/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java +++ b/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java @@ -1,15 +1,14 @@ package com.avaje.tests.query; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.MRole; import com.avaje.tests.model.basic.MUser; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -52,10 +51,10 @@ public class TestManyWhereJoinM2M extends BaseTestCase { Ebean.commitTransaction(); Query query = Ebean.find(MUser.class).fetch("roles") - // the where on a 'many' (like orders) requires an - // additional join and distinct which is independent - // of a fetch join (if there is a fetch join) - .where().eq("roles.roleName", "role2special").query(); + // the where on a 'many' (like orders) requires an + // additional join and distinct which is independent + // of a fetch join (if there is a fetch join) + .where().eq("roles.roleName", "role2special").query(); query.findList(); @@ -72,8 +71,8 @@ public class TestManyWhereJoinM2M extends BaseTestCase { private void isEmpty() { Query query = Ebean.find(MUser.class) - .where().isEmpty("roles") - .query(); + .where().isEmpty("roles") + .query(); List usersWithNoRoles = query.findList(); @@ -84,9 +83,9 @@ public class TestManyWhereJoinM2M extends BaseTestCase { private void isNotEmpty() { Query query = Ebean.find(MUser.class) - .select("userName") - .where().isNotEmpty("roles") - .query(); + .select("userName") + .where().isNotEmpty("roles") + .query(); List usersWithRoles = query.findList(); diff --git a/src/test/java/com/avaje/tests/query/TestMyAdHocSqlSelect.java b/src/test/java/com/avaje/tests/query/TestMyAdHocSqlSelect.java index 2428626e7..981439d96 100644 --- a/src/test/java/com/avaje/tests/query/TestMyAdHocSqlSelect.java +++ b/src/test/java/com/avaje/tests/query/TestMyAdHocSqlSelect.java @@ -22,15 +22,15 @@ public class TestMyAdHocSqlSelect extends BaseTestCase { String sql = "select order_id, count(*) as detailCount from o_order_detail group by order_id"; RawSql rawSql = RawSqlBuilder - .parse(sql) - .columnMapping("order_id", "order.id") - .create(); + .parse(sql) + .columnMapping("order_id", "order.id") + .create(); Query query = Ebean.find(MyAdHoc.class) - .setRawSql(rawSql) - .where().gt("order_id", 0) - .having().gt("detailCount", 0) - .query(); + .setRawSql(rawSql) + .where().gt("order_id", 0) + .having().gt("detailCount", 0) + .query(); assertNotNull(query.findList()); assertThat(query.getGeneratedSql()).contains(" group by order_id having count(*) > ?"); @@ -44,16 +44,16 @@ public class TestMyAdHocSqlSelect extends BaseTestCase { String sql = "select order_id, count(*) as detail_count from o_order_detail group by order_id"; RawSql rawSql = RawSqlBuilder - .parse(sql) - .columnMapping("order_id", "order.id") - .columnMapping("detail_count", "detailCount") - .create(); + .parse(sql) + .columnMapping("order_id", "order.id") + .columnMapping("detail_count", "detailCount") + .create(); Query query = Ebean.find(MyAdHoc.class) - .setRawSql(rawSql) - .where().gt("order_id", 0) - .having().gt("detailCount", 0) - .query(); + .setRawSql(rawSql) + .where().gt("order_id", 0) + .having().gt("detailCount", 0) + .query(); assertNotNull(query.findList()); assertThat(query.getGeneratedSql()).contains(" group by order_id having count(*) > ?"); diff --git a/src/test/java/com/avaje/tests/query/TestOneToManyCorrectGrouping.java b/src/test/java/com/avaje/tests/query/TestOneToManyCorrectGrouping.java index 59858862e..8331d5b15 100644 --- a/src/test/java/com/avaje/tests/query/TestOneToManyCorrectGrouping.java +++ b/src/test/java/com/avaje/tests/query/TestOneToManyCorrectGrouping.java @@ -3,7 +3,6 @@ package com.avaje.tests.query; import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; -import com.avaje.ebean.QueryEachConsumer; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; @@ -22,9 +21,9 @@ public class TestOneToManyCorrectGrouping extends BaseTestCase { ResetBasicData.reset(); Query customerQuery = Ebean.find(Customer.class) - .fetch("orders") - .where().le("id", 2) - .query(); + .fetch("orders") + .where().le("id", 2) + .query(); final AtomicInteger count = new AtomicInteger(); diff --git a/src/test/java/com/avaje/tests/query/TestQueryAlias.java b/src/test/java/com/avaje/tests/query/TestQueryAlias.java index 69225e3ea..8635537b8 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryAlias.java +++ b/src/test/java/com/avaje/tests/query/TestQueryAlias.java @@ -1,13 +1,12 @@ package com.avaje.tests.query; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.CKeyParent; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; public class TestQueryAlias extends BaseTestCase { @@ -17,8 +16,8 @@ public class TestQueryAlias extends BaseTestCase { ResetBasicData.reset(); Query sq = Ebean.createQuery(CKeyParent.class) - .select("id.oneKey").alias("st0") - .setAutoTune(false).where().query(); + .select("id.oneKey").alias("st0") + .setAutoTune(false).where().query(); Query pq = Ebean.find(CKeyParent.class).alias("myt0").where().in("id.oneKey", sq).query(); @@ -43,8 +42,8 @@ public class TestQueryAlias extends BaseTestCase { ResetBasicData.reset(); Query sq = Ebean.createQuery(CKeyParent.class) - .select("id.oneKey").alias("st0") - .setAutoTune(false).where().query(); + .select("id.oneKey").alias("st0") + .setAutoTune(false).where().query(); Query pq = Ebean.find(CKeyParent.class).alias("myt0").where().notIn("id.oneKey", sq).query(); diff --git a/src/test/java/com/avaje/tests/query/TestQueryExists.java b/src/test/java/com/avaje/tests/query/TestQueryExists.java index 9633f840c..09e46b7fa 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryExists.java +++ b/src/test/java/com/avaje/tests/query/TestQueryExists.java @@ -21,14 +21,14 @@ public class TestQueryExists extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class) - .where().raw("exists (select 1 from o_order_detail where order_id = t0.id)") - .query(); + .where().raw("exists (select 1 from o_order_detail where order_id = t0.id)") + .query(); List ordersThatHave = query.findList(); Query query2 = Ebean.find(Order.class) - .where().raw("not exists (select 1 from o_order_detail where order_id = t0.id)") - .query(); + .where().raw("not exists (select 1 from o_order_detail where order_id = t0.id)") + .query(); List ordersThatDontHave = query2.findList(); @@ -45,14 +45,14 @@ public class TestQueryExists extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Customer.class) - .where().raw("exists (select 1 from contact where customer_id = t0.id)") - .query(); + .where().raw("exists (select 1 from contact where customer_id = t0.id)") + .query(); List customersWithContacts = query.findList(); Query query2 = Ebean.find(Customer.class) - .where().raw("not exists (select 1 FROM contact where customer_id = t0.id)") - .query(); + .where().raw("not exists (select 1 FROM contact where customer_id = t0.id)") + .query(); query2.findList(); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFetchJoinWithOrder.java b/src/test/java/com/avaje/tests/query/TestQueryFetchJoinWithOrder.java index 34fba6cc3..12d091703 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFetchJoinWithOrder.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFetchJoinWithOrder.java @@ -1,16 +1,15 @@ package com.avaje.tests.query; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.FetchConfig; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestQueryFetchJoinWithOrder extends BaseTestCase { @@ -20,26 +19,26 @@ public class TestQueryFetchJoinWithOrder extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Order.class) - .fetch("details", new FetchConfig().query()) - .order().asc("id") - .order().desc("details.id").findList(); + .fetch("details", new FetchConfig().query()) + .order().asc("id") + .order().desc("details.id").findList(); Assert.assertNotNull(list); List list2 = Ebean.find(Order.class) - .fetch("customer", new FetchConfig().query(5)) - .fetch("customer.contacts") - .order().asc("id") - .order().asc("customer.contacts.lastName") - .findList(); + .fetch("customer", new FetchConfig().query(5)) + .fetch("customer.contacts") + .order().asc("id") + .order().asc("customer.contacts.lastName") + .findList(); Assert.assertNotNull(list2); List list3 = Ebean.find(Customer.class) - .fetch("orders") - .filterMany("orders").eq("status", Order.Status.NEW) - .order().desc("orders.id") - .findList(); + .fetch("orders") + .filterMany("orders").eq("status", Order.Status.NEW) + .order().desc("orders.id") + .findList(); Assert.assertNotNull(list3); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFetchManyTwoDeep.java b/src/test/java/com/avaje/tests/query/TestQueryFetchManyTwoDeep.java index af0148973..9cf3dde30 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFetchManyTwoDeep.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFetchManyTwoDeep.java @@ -1,10 +1,5 @@ package com.avaje.tests.query; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; @@ -13,6 +8,10 @@ import com.avaje.tests.model.basic.Contact; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.OrderShipment; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestQueryFetchManyTwoDeep extends BaseTestCase { @@ -23,13 +22,13 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { // test that join to order.details is not included in the initial query (included in query join) Query query = Ebean.find(Customer.class) - .setAutoTune(false) - .fetch("orders") - .fetch("orders.details"); + .setAutoTune(false) + .fetch("orders") + .fetch("orders.details"); - SpiQuery spiQuery = (SpiQuery)query; + SpiQuery spiQuery = (SpiQuery) query; spiQuery.setLogSecondaryQuery(true); - + List list = query.findList(); Assert.assertTrue("has rows", !list.isEmpty()); Assert.assertTrue(query.getGeneratedSql().contains("from o_customer t0 ")); @@ -37,64 +36,64 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { Assert.assertTrue(query.getGeneratedSql().contains("left join o_customer t2 on t2.id = t1.kcustomer_id")); Assert.assertFalse(query.getGeneratedSql().contains("join or_order_ship")); - //select t0.id c0, t0.status c1, t0.name c2, t0.smallnote c3, t0.anniversary c4, t0.cretime c5, t0.updtime c6, t0.billing_address_id c7, t0.shipping_address_id c8, t1.id c9, t1.status c10, t1.order_date c11, t1.ship_date c12, - // t2.name c13, t1.cretime c14, t1.updtime c15, t1.kcustomer_id c16 - // from o_customer t0 + //select t0.id c0, t0.status c1, t0.name c2, t0.smallnote c3, t0.anniversary c4, t0.cretime c5, t0.updtime c6, t0.billing_address_id c7, t0.shipping_address_id c8, t1.id c9, t1.status c10, t1.order_date c11, t1.ship_date c12, + // t2.name c13, t1.cretime c14, t1.updtime c15, t1.kcustomer_id c16 + // from o_customer t0 // left join o_order t1 on t1.kcustomer_id = t0.id // left join o_customer t2 on t2.id = t1.kcustomer_id // where t1.order_date is not null order by t0.id; --bind() - - + + List> secondaryQueries = spiQuery.getLoggedSecondaryQueries(); Assert.assertNotNull(secondaryQueries); Assert.assertEquals(1, secondaryQueries.size()); - + SpiQuery secondaryQuery = secondaryQueries.get(0); String secondarySql = secondaryQuery.getGeneratedSql(); Assert.assertTrue(secondarySql.contains("from o_order_detail t0 where t0.id > 0 and (t0.order_id) in")); - - // select t0.order_id c0, t0.id c1, t0.order_qty c2, t0.ship_qty c3, t0.unit_price c4, t0.cretime c5, t0.updtime c6, t0.order_id c7, t0.product_id c8 - // from o_order_detail t0 - // where (t0.order_id) in (?,?,?,?,?) - + + // select t0.order_id c0, t0.id c1, t0.order_qty c2, t0.ship_qty c3, t0.unit_price c4, t0.cretime c5, t0.updtime c6, t0.order_id c7, t0.product_id c8 + // from o_order_detail t0 + // where (t0.order_id) in (?,?,?,?,?) + } - + @Test public void testFetchOptionalManyToOneThenDownToMany() { - + ResetBasicData.reset(); - + // test that join to order.details is not included Query shipQuery = Ebean.find(OrderShipment.class) - .setAutoTune(false) - .fetch("order") - .fetch("order.details"); + .setAutoTune(false) + .fetch("order") + .fetch("order.details"); List shipList = shipQuery.findList(); Assert.assertTrue("has rows", !shipList.isEmpty()); - + String generatedSql = shipQuery.getGeneratedSql(); - // select ... - // from or_order_ship t0 + // select ... + // from or_order_ship t0 // left join o_order t1 on t1.id = t0.order_id // left join o_customer t3 on t3.id = t1.kcustomer_id // left join o_order_detail t2 on t2.order_id = t1.id // where t2.id > 0 ; --bind() - + Assert.assertTrue(generatedSql.contains("from or_order_ship t0")); // Relationship from OrderShipment to Order is optional so outer join here Assert.assertTrue(generatedSql.contains("left join o_order t1 on t1.id = t0.order_id")); Assert.assertTrue(generatedSql.contains("left join o_customer t3 on t3.id = t1.kcustomer_id")); Assert.assertTrue(generatedSql.contains("left join o_order_detail t2 on t2.order_id = t1.id")); - - + + // If OrderShipment to Order is not optional you get inner joins up to o_order_detail (which is a many) - - // select ... - // from or_order_ship t0 - // join o_order t1 on t1.id = t0.order_id - // join o_customer t3 on t3.id = t1.kcustomer_id + + // select ... + // from or_order_ship t0 + // join o_order t1 on t1.id = t0.order_id + // join o_customer t3 on t3.id = t1.kcustomer_id // left join o_order_detail t2 on t2.order_id = t1.id // where t2.id > 0 ; --bind() } @@ -102,61 +101,61 @@ public class TestQueryFetchManyTwoDeep extends BaseTestCase { @Test public void testFetchMandatoryManyToOneThenDownToMany() { - + ResetBasicData.reset(); - + // test that join to order.details is not included Query query = Ebean.find(Contact.class) - .setAutoTune(false) - .fetch("customer") - .fetch("customer.orders"); + .setAutoTune(false) + .fetch("customer") + .fetch("customer.orders"); List shipList = query.findList(); Assert.assertTrue("has rows", !shipList.isEmpty()); - + String generatedSql = query.getGeneratedSql(); // select ... - // from contact t0 - // join o_customer t1 on t1.id = t0.customer_id + // from contact t0 + // join o_customer t1 on t1.id = t0.customer_id // left join o_order t2 on t2.kcustomer_id = t1.id // left join o_customer t3 on t3.id = t2.kcustomer_id // where t2.order_date is not null ; --bind() - + Assert.assertTrue(generatedSql.contains("from contact t0 ")); // Relationship from Contact to Customer is mandatory so inner join here Assert.assertTrue(generatedSql.contains("join o_customer t1 on t1.id = t0.customer_id")); // outer join on many relationship 'orders' Assert.assertTrue(generatedSql.contains("left join o_order t2 on t2.kcustomer_id = t1.id")); - + } - + @Test public void testFetchMandatoryManyToOneWithPredicate() { - + ResetBasicData.reset(); - + // test that join to order.details is not included Query query = Ebean.find(Contact.class) - .setAutoTune(false) - .fetch("customer") - .where().ilike("customer.name", "Rob%") - .query(); + .setAutoTune(false) + .fetch("customer") + .where().ilike("customer.name", "Rob%") + .query(); List list = query.findList(); Assert.assertTrue("has rows", !list.isEmpty()); - + String generatedSql = query.getGeneratedSql(); - // select ... - // from contact t0 - // join o_customer t1 on t1.id = t0.customer_id + // select ... + // from contact t0 + // join o_customer t1 on t1.id = t0.customer_id // where lower(t1.name) like ? ; --bind(rob%) - + Assert.assertTrue(generatedSql.contains("from contact t0 ")); Assert.assertTrue(generatedSql.contains("join o_customer t1 on t1.id = t0.customer_id")); Assert.assertTrue(generatedSql.contains("where lower(t1.name) like ?")); - + } } diff --git a/src/test/java/com/avaje/tests/query/TestQueryFetchSkipPath.java b/src/test/java/com/avaje/tests/query/TestQueryFetchSkipPath.java index 4c90a6ed3..cd6ff0b78 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFetchSkipPath.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFetchSkipPath.java @@ -1,9 +1,5 @@ package com.avaje.tests.query; -import java.util.List; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Contact; @@ -11,6 +7,9 @@ import com.avaje.tests.model.basic.ContactNote; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Test; + +import java.util.List; public class TestQueryFetchSkipPath extends BaseTestCase { @@ -21,11 +20,11 @@ public class TestQueryFetchSkipPath extends BaseTestCase { List list = Ebean.find(Order.class) - // .setAutoTune(true) - .setAutoTune(false).select("status") - // .fetch("customer","id") - // .fetch("customer.contacts","id") - .fetch("customer.contacts.notes", "title").findList(); + // .setAutoTune(true) + .setAutoTune(false).select("status") + // .fetch("customer","id") + // .fetch("customer.contacts","id") + .fetch("customer.contacts.notes", "title").findList(); for (Order order : list) { order.getStatus(); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFilterMany.java b/src/test/java/com/avaje/tests/query/TestQueryFilterMany.java index 44ba772a4..9995229dc 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFilterMany.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFilterMany.java @@ -25,11 +25,11 @@ public class TestQueryFilterMany extends BaseTestCase { LoggedSqlCollector.start(); Customer customer = Ebean.find(Customer.class) - .fetch("orders", new FetchConfig().lazy()) - .filterMany("orders").eq("status", Order.Status.NEW) - .where().ieq("name", "Rob") - .order().asc("id").setMaxRows(1) - .findList().get(0); + .fetch("orders", new FetchConfig().lazy()) + .filterMany("orders").eq("status", Order.Status.NEW) + .where().ieq("name", "Rob") + .order().asc("id").setMaxRows(1) + .findList().get(0); customer.getOrders().size(); @@ -48,9 +48,9 @@ public class TestQueryFilterMany extends BaseTestCase { ResetBasicData.reset(); LoggedSqlCollector.start(); Ebean.find(Customer.class) - .filterMany("contacts").isNotNull("firstName") - .filterMany("contacts.notes").istartsWith("title", "foo") - .findList(); + .filterMany("contacts").isNotNull("firstName") + .filterMany("contacts.notes").istartsWith("title", "foo") + .findList(); List sql = LoggedSqlCollector.stop(); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFilterManyOnM2M.java b/src/test/java/com/avaje/tests/query/TestQueryFilterManyOnM2M.java index e5136f52a..3fe6548ab 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFilterManyOnM2M.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFilterManyOnM2M.java @@ -1,10 +1,9 @@ package com.avaje.tests.query; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.MUser; +import org.junit.Test; public class TestQueryFilterManyOnM2M extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/query/TestQueryFilterManyOnSecondary.java b/src/test/java/com/avaje/tests/query/TestQueryFilterManyOnSecondary.java index dc0dfc83d..0838c7ca8 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFilterManyOnSecondary.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFilterManyOnSecondary.java @@ -1,10 +1,5 @@ package com.avaje.tests.query; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.FetchConfig; @@ -14,6 +9,10 @@ import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.OrderDetail; import com.avaje.tests.model.basic.Product; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestQueryFilterManyOnSecondary extends BaseTestCase { @@ -23,10 +22,10 @@ public class TestQueryFilterManyOnSecondary extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Customer.class) - .fetch("orders", new FetchConfig().query()) - .where().ilike("name", "Rob%").gt("id", 0) - .filterMany("orders").eq("status", Order.Status.NEW) - .query(); + .fetch("orders", new FetchConfig().query()) + .where().ilike("name", "Rob%").gt("id", 0) + .filterMany("orders").eq("status", Order.Status.NEW) + .query(); List list = query.findList(); for (Customer customer : list) { @@ -37,19 +36,19 @@ public class TestQueryFilterManyOnSecondary extends BaseTestCase { } } - - + + @Test public void testFilterManyWithPathPredicate() { - + ResetBasicData.reset(); - + Query query = Ebean.find(Order.class) .fetch("details", new FetchConfig().query()) - .fetch("details.product","name") + .fetch("details.product", "name") .filterMany("details").ilike("product.name", "c%") .query(); - + List orders = query.findList(); for (Order order : orders) { List details = order.getDetails(); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFilterManySimple.java b/src/test/java/com/avaje/tests/query/TestQueryFilterManySimple.java index 7ffaaaf86..ca80c8ebb 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFilterManySimple.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFilterManySimple.java @@ -1,16 +1,15 @@ package com.avaje.tests.query; -import java.sql.Date; -import java.util.List; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.FetchConfig; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Test; + +import java.sql.Date; +import java.util.List; public class TestQueryFilterManySimple extends BaseTestCase { @@ -23,12 +22,12 @@ public class TestQueryFilterManySimple extends BaseTestCase { Date lastWeek = Date.valueOf("2010-01-01"); List list = Ebean - .find(Customer.class) - // .join("orders", new JoinConfig().lazy()) - // .join("orders", new JoinConfig().query()) - .fetch("orders").fetch("contacts", new FetchConfig().query()).where().ilike("name", "rob%") - .filterMany("orders").eq("status", Order.Status.NEW).gt("orderDate", lastWeek) - .filterMany("contacts").isNotNull("firstName").findList(); + .find(Customer.class) + // .join("orders", new JoinConfig().lazy()) + // .join("orders", new JoinConfig().query()) + .fetch("orders").fetch("contacts", new FetchConfig().query()).where().ilike("name", "rob%") + .filterMany("orders").eq("status", Order.Status.NEW).gt("orderDate", lastWeek) + .filterMany("contacts").isNotNull("firstName").findList(); // invoke lazy loading list.get(0).getOrders().size(); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindEach.java b/src/test/java/com/avaje/tests/query/TestQueryFindEach.java index 1db5af130..2f58399e7 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindEach.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFindEach.java @@ -1,6 +1,10 @@ package com.avaje.tests.query; -import com.avaje.ebean.*; +import com.avaje.ebean.BaseTestCase; +import com.avaje.ebean.Ebean; +import com.avaje.ebean.EbeanServer; +import com.avaje.ebean.FetchConfig; +import com.avaje.ebean.Query; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; import org.junit.Assert; @@ -18,10 +22,10 @@ public class TestQueryFindEach extends BaseTestCase { EbeanServer server = Ebean.getServer(null); Query query - = server.find(Customer.class) - .setAutoTune(false) - .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") - .setMaxRows(2); + = server.find(Customer.class) + .setAutoTune(false) + .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") + .setMaxRows(2); final AtomicInteger counter = new AtomicInteger(0); @@ -32,11 +36,11 @@ public class TestQueryFindEach extends BaseTestCase { Assert.assertEquals(2, counter.get()); } - + /** * Test the behaviour when an exception is thrown inside the findVisit(). */ - @Test(expected=IllegalStateException.class) + @Test(expected = IllegalStateException.class) public void testVisitThrowingException() { ResetBasicData.reset(); @@ -44,8 +48,8 @@ public class TestQueryFindEach extends BaseTestCase { EbeanServer server = Ebean.getServer(null); Query query = server.find(Customer.class).setAutoTune(false) - .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") - .setMaxRows(2); + .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") + .setMaxRows(2); final AtomicInteger counter = new AtomicInteger(0); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindEachWhile.java b/src/test/java/com/avaje/tests/query/TestQueryFindEachWhile.java index 943d1b1a5..8d8f4ef18 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindEachWhile.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFindEachWhile.java @@ -1,6 +1,10 @@ package com.avaje.tests.query; -import com.avaje.ebean.*; +import com.avaje.ebean.BaseTestCase; +import com.avaje.ebean.Ebean; +import com.avaje.ebean.EbeanServer; +import com.avaje.ebean.FetchConfig; +import com.avaje.ebean.Query; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; import org.junit.Assert; @@ -18,10 +22,10 @@ public class TestQueryFindEachWhile extends BaseTestCase { EbeanServer server = Ebean.getServer(null); Query query - = server.find(Customer.class) - .setAutoTune(false) - .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") - .setMaxRows(2); + = server.find(Customer.class) + .setAutoTune(false) + .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") + .setMaxRows(2); final AtomicInteger counter = new AtomicInteger(0); @@ -33,11 +37,11 @@ public class TestQueryFindEachWhile extends BaseTestCase { Assert.assertEquals(2, counter.get()); } - + /** * Test the behaviour when an exception is thrown inside the findVisit(). */ - @Test(expected=IllegalStateException.class) + @Test(expected = IllegalStateException.class) public void testVisitThrowingException() { ResetBasicData.reset(); @@ -45,8 +49,8 @@ public class TestQueryFindEachWhile extends BaseTestCase { EbeanServer server = Ebean.getServer(null); Query query = server.find(Customer.class).setAutoTune(false) - .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") - .setMaxRows(2); + .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") + .setMaxRows(2); final AtomicInteger counter = new AtomicInteger(0); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java b/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java index 1d219807e..057bd69c6 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java @@ -1,16 +1,18 @@ package com.avaje.tests.query; -import javax.persistence.PersistenceException; - -import com.avaje.ebean.*; +import com.avaje.ebean.BaseTestCase; +import com.avaje.ebean.Ebean; +import com.avaje.ebean.EbeanServer; +import com.avaje.ebean.Query; +import com.avaje.ebean.QueryIterator; +import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.OrderShipment; +import com.avaje.tests.model.basic.ResetBasicData; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Test; -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; - +import javax.persistence.PersistenceException; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @@ -28,7 +30,7 @@ public class TestQueryFindIterate extends BaseTestCase { EbeanServer server = Ebean.getServer(null); Query query = server.find(Customer.class) - .setMaxRows(2); + .setMaxRows(2); final AtomicInteger count = new AtomicInteger(); @@ -53,11 +55,11 @@ public class TestQueryFindIterate extends BaseTestCase { EbeanServer server = Ebean.getServer(null); QueryIterator queryIterator = server.find(Customer.class) - .where() - .isNotNull("name") - .setMaxRows(3) - .order().asc("id") - .findIterate(); + .where() + .isNotNull("name") + .setMaxRows(3) + .order().asc("id") + .findIterate(); try { // check that hasNext does not move to the next bean @@ -88,9 +90,9 @@ public class TestQueryFindIterate extends BaseTestCase { EbeanServer server = Ebean.getServer(null); Query query = server.find(Customer.class) - .setAutoTune(false) - //.fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") - .setMaxRows(2); + .setAutoTune(false) + //.fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") + .setMaxRows(2); final AtomicInteger count = new AtomicInteger(); @@ -105,16 +107,16 @@ public class TestQueryFindIterate extends BaseTestCase { ResetBasicData.reset(); Ebean.find(Order.class) - //.select("orderDate") - .where().gt("id",0).le("id",10) - .findEach(order -> { - Customer customer = order.getCustomer(); - // invoke lazy loading on customer, order details and order shipments - order.getId(); - customer.getName(); - order.getDetails().size(); - order.getShipments().size(); - }); + //.select("orderDate") + .where().gt("id", 0).le("id", 10) + .findEach(order -> { + Customer customer = order.getCustomer(); + // invoke lazy loading on customer, order details and order shipments + order.getId(); + customer.getName(); + order.getDetails().size(); + order.getShipments().size(); + }); } @@ -129,7 +131,7 @@ public class TestQueryFindIterate extends BaseTestCase { .setLazyLoadBatchSize(10) .select("status, orderDate") .fetch("customer", "name") - .where().gt("id",0).le("id",10) + .where().gt("id", 0).le("id", 10) .setUseCache(false) .findEach(order -> { Customer customer = order.getCustomer(); @@ -161,29 +163,29 @@ public class TestQueryFindIterate extends BaseTestCase { Ebean.getServerCacheManager().getQueryCache(OrderShipment.class).clear(); Ebean.find(Order.class) - .setLazyLoadBatchSize(10) - .setUseCache(false) - .select("status, orderDate") - .fetch("customer", "name") - .fetch("details") - .where().gt("id",0).le("id",10) - .order().asc("id") - .findEach(order -> { - Customer customer = order.getCustomer(); - order.getId(); - customer.getName(); - order.getDetails().size(); - order.getShipments().size(); - }); + .setLazyLoadBatchSize(10) + .setUseCache(false) + .select("status, orderDate") + .fetch("customer", "name") + .fetch("details") + .where().gt("id", 0).le("id", 10) + .order().asc("id") + .findEach(order -> { + Customer customer = order.getCustomer(); + order.getId(); + customer.getName(); + order.getDetails().size(); + order.getShipments().size(); + }); List loggedSql = LoggedSqlCollector.stop(); - assertEquals("Got SQL: "+loggedSql, 2, loggedSql.size()); + assertEquals("Got SQL: " + loggedSql, 2, loggedSql.size()); assertThat(trimSql(loggedSql.get(0), 7).contains("select t0.id, t0.status, t0.order_date, t1.id, t1.name, t2.id, t2.order_qty, t2.ship_qty")); assertThat(trimSql(loggedSql.get(1), 7).contains("select t0.order_id, t0.id, t0.ship_time, t0.cretime, t0.updtime, t0.version, t0.order_id from or_order_ship")); } - @Test(expected=PersistenceException.class) + @Test(expected = PersistenceException.class) public void testWithExceptionInQuery() { ResetBasicData.reset(); @@ -192,9 +194,9 @@ public class TestQueryFindIterate extends BaseTestCase { // intentionally a query with incorrect type binding Query query = server.find(Customer.class) - .setAutoTune(false) - .where().gt("id","JUNK_NOT_A_LONG") - .setMaxRows(2); + .setAutoTune(false) + .where().gt("id", "JUNK_NOT_A_LONG") + .setMaxRows(2); // this throws an exception immediately query.findEach(bean -> { @@ -207,9 +209,9 @@ public class TestQueryFindIterate extends BaseTestCase { } assertTrue("Never get here as exception thrown", false); } - - - @Test(expected=IllegalStateException.class) + + + @Test(expected = IllegalStateException.class) public void testWithExceptionInLoop() { ResetBasicData.reset(); @@ -217,9 +219,9 @@ public class TestQueryFindIterate extends BaseTestCase { EbeanServer server = Ebean.getServer(null); Query query = server.find(Customer.class) - .setAutoTune(false) - .where().gt("id", 0) - .setMaxRows(2); + .setAutoTune(false) + .where().gt("id", 0) + .setMaxRows(2); query.findEach(customer -> { if (customer != null) { diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindMapTypedKey.java b/src/test/java/com/avaje/tests/query/TestQueryFindMapTypedKey.java index 6648eb5f1..9dfa3b575 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindMapTypedKey.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFindMapTypedKey.java @@ -20,8 +20,8 @@ public class TestQueryFindMapTypedKey extends BaseTestCase { ResetBasicData.reset(); Map productsBySku = Ebean.find(Product.class) - .setMapKey("sku") - .findMap(); + .setMapKey("sku") + .findMap(); assertThat(productsBySku).isNotEmpty(); @@ -29,9 +29,9 @@ public class TestQueryFindMapTypedKey extends BaseTestCase { assertNotNull(desk); Map map = Ebean.find(Customer.class) - .select("id, name") - .setMapKey("name") - .findMap(); + .select("id, name") + .setMapKey("name") + .findMap(); assertNotNull(map); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java b/src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java index eb98592a4..ef4812e8b 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java @@ -16,9 +16,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class TestQueryFindPagedList extends BaseTestCase { @@ -35,8 +33,8 @@ public class TestQueryFindPagedList extends BaseTestCase { ResetBasicData.reset(); PagedList pagedList = Ebean.find(Order.class) - .setMaxRows(4) - .findPagedList(); + .setMaxRows(4) + .findPagedList(); LoggedSqlCollector.start(); @@ -45,7 +43,7 @@ public class TestQueryFindPagedList extends BaseTestCase { assertTrue(!orders.isEmpty()); List loggedSql = LoggedSqlCollector.stop(); - assertEquals("Only 1 SQL statement, no count query",1, loggedSql.size()); + assertEquals("Only 1 SQL statement, no count query", 1, loggedSql.size()); } @@ -55,8 +53,8 @@ public class TestQueryFindPagedList extends BaseTestCase { ResetBasicData.reset(); PagedList pagedList = Ebean.find(Order.class) - .setMaxRows(3) - .findPagedList(); + .setMaxRows(3) + .findPagedList(); Future rowCount = pagedList.getFutureCount(); List orders = pagedList.getList(); @@ -78,8 +76,8 @@ public class TestQueryFindPagedList extends BaseTestCase { // fetch less that total orders (page size 3) PagedList pagedList = Ebean.find(Order.class) - .setMaxRows(3) - .findPagedList(); + .setMaxRows(3) + .findPagedList(); pagedList.loadCount(); List orders = pagedList.getList(); @@ -92,9 +90,9 @@ public class TestQueryFindPagedList extends BaseTestCase { // fetch less that total orders (page size 3) PagedList pagedList2 = Ebean.find(Order.class) - .setFirstRow(1) - .setMaxRows(3) - .findPagedList(); + .setFirstRow(1) + .setMaxRows(3) + .findPagedList(); pagedList2.loadCount(); List orders2 = pagedList2.getList(); @@ -107,31 +105,31 @@ public class TestQueryFindPagedList extends BaseTestCase { PagedList pagedList3 = Ebean.find(Order.class) - .setFirstRow(2) - .setMaxRows(150) - .findPagedList(); + .setFirstRow(2) + .setMaxRows(150) + .findPagedList(); assertFalse(pagedList3.hasNext()); assertTrue(pagedList3.hasPrev()); List list3 = pagedList3.getList(); String xtoYofZ = pagedList3.getDisplayXtoYofZ(" to ", " of "); - assertThat(xtoYofZ).isEqualTo("3 to "+totalRowCount+" of "+totalRowCount); + assertThat(xtoYofZ).isEqualTo("3 to " + totalRowCount + " of " + totalRowCount); assertThat(list3.size()).isEqualTo(totalRowCount - 2); PagedList pagedList4 = Ebean.find(Order.class) - .setFirstRow(0) - .setMaxRows(totalRowCount) - .findPagedList(); + .setFirstRow(0) + .setMaxRows(totalRowCount) + .findPagedList(); assertFalse(pagedList4.hasNext()); assertFalse(pagedList4.hasPrev()); - assertThat(pagedList4.getDisplayXtoYofZ(" to ", " of ")).isEqualTo("1 to "+totalRowCount+" of "+totalRowCount); + assertThat(pagedList4.getDisplayXtoYofZ(" to ", " of ")).isEqualTo("1 to " + totalRowCount + " of " + totalRowCount); PagedList pagedList5 = Ebean.find(Order.class) - .setFirstRow(0) - .setMaxRows(totalRowCount - 1) - .findPagedList(); + .setFirstRow(0) + .setMaxRows(totalRowCount - 1) + .findPagedList(); assertTrue(pagedList5.hasNext()); assertFalse(pagedList5.hasPrev()); @@ -151,7 +149,7 @@ public class TestQueryFindPagedList extends BaseTestCase { assertTrue(!orders.isEmpty()); List loggedSql = LoggedSqlCollector.stop(); - assertEquals("Only 1 SQL statement, no count query",1, loggedSql.size()); + assertEquals("Only 1 SQL statement, no count query", 1, loggedSql.size()); } @Test @@ -235,10 +233,10 @@ public class TestQueryFindPagedList extends BaseTestCase { ResetBasicData.reset(); PagedList pagedList = Ebean.find(Order.class) - .alias("b") - .where().raw("b.id > 0") - .setMaxRows(6) - .findPagedList(); + .alias("b") + .where().raw("b.id > 0") + .setMaxRows(6) + .findPagedList(); LoggedSqlCollector.start(); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindReadOnly.java b/src/test/java/com/avaje/tests/query/TestQueryFindReadOnly.java index 451d73024..224d8ae7d 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindReadOnly.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFindReadOnly.java @@ -1,14 +1,13 @@ package com.avaje.tests.query; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Article; import com.avaje.tests.model.basic.Section; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestQueryFindReadOnly extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindVisit.java b/src/test/java/com/avaje/tests/query/TestQueryFindVisit.java index e863e8598..b7bf1372c 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindVisit.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFindVisit.java @@ -5,7 +5,6 @@ import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.ebean.FetchConfig; import com.avaje.ebean.Query; -import com.avaje.ebean.QueryEachConsumer; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; import org.junit.Assert; @@ -23,8 +22,8 @@ public class TestQueryFindVisit extends BaseTestCase { EbeanServer server = Ebean.getServer(null); Query query = server.find(Customer.class).setAutoTune(false) - .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") - .setMaxRows(2); + .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") + .setMaxRows(2); final AtomicInteger counter = new AtomicInteger(0); @@ -32,11 +31,11 @@ public class TestQueryFindVisit extends BaseTestCase { Assert.assertEquals(2, counter.get()); } - + /** * Test the behaviour when an exception is thrown inside the findVisit(). */ - @Test(expected=IllegalStateException.class) + @Test(expected = IllegalStateException.class) public void testVisitThrowingException() { ResetBasicData.reset(); @@ -44,8 +43,8 @@ public class TestQueryFindVisit extends BaseTestCase { EbeanServer server = Ebean.getServer(null); Query query = server.find(Customer.class).setAutoTune(false) - .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") - .setMaxRows(2); + .fetch("contacts", new FetchConfig().query(2)).where().gt("id", 0).orderBy("id") + .setMaxRows(2); final AtomicInteger counter = new AtomicInteger(0); diff --git a/src/test/java/com/avaje/tests/query/TestQueryInAssocOne.java b/src/test/java/com/avaje/tests/query/TestQueryInAssocOne.java index 85e2cfa3d..318c81b1b 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryInAssocOne.java +++ b/src/test/java/com/avaje/tests/query/TestQueryInAssocOne.java @@ -1,16 +1,15 @@ package com.avaje.tests.query; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestQueryInAssocOne extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/query/TestQueryJoinBatchSize.java b/src/test/java/com/avaje/tests/query/TestQueryJoinBatchSize.java index 56f9158b8..1eeefff5c 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryJoinBatchSize.java +++ b/src/test/java/com/avaje/tests/query/TestQueryJoinBatchSize.java @@ -1,15 +1,14 @@ package com.avaje.tests.query; -import java.util.List; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.FetchConfig; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Test; + +import java.util.List; public class TestQueryJoinBatchSize extends BaseTestCase { @@ -19,18 +18,18 @@ public class TestQueryJoinBatchSize extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Order.class) - .fetch("customer", new FetchConfig().queryFirst(3).lazy(2)) - //.fetch("orders.details", new FetchConfig().query()) - //.fetch("orders.shipments", new FetchConfig().query()) - .findList(); - + .fetch("customer", new FetchConfig().queryFirst(3).lazy(2)) + //.fetch("orders.details", new FetchConfig().query()) + //.fetch("orders.shipments", new FetchConfig().query()) + .findList(); + for (Order order : list) { Customer customer = order.getCustomer(); customer.getName(); } } - + // @Test // public void test() { // diff --git a/src/test/java/com/avaje/tests/query/TestQueryJoinMulipleMany.java b/src/test/java/com/avaje/tests/query/TestQueryJoinMulipleMany.java index 55e0eef9f..1df94308c 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryJoinMulipleMany.java +++ b/src/test/java/com/avaje/tests/query/TestQueryJoinMulipleMany.java @@ -1,15 +1,14 @@ package com.avaje.tests.query; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Contact; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestQueryJoinMulipleMany extends BaseTestCase { @@ -19,7 +18,7 @@ public class TestQueryJoinMulipleMany extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Order.class).fetch("customer").fetch("customer.contacts").where() - .gt("id", 0).findList(); + .gt("id", 0).findList(); Assert.assertNotNull(list); diff --git a/src/test/java/com/avaje/tests/query/TestQueryMultiManyOrder.java b/src/test/java/com/avaje/tests/query/TestQueryMultiManyOrder.java index 4525c0a37..f5c60cca2 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryMultiManyOrder.java +++ b/src/test/java/com/avaje/tests/query/TestQueryMultiManyOrder.java @@ -1,15 +1,14 @@ package com.avaje.tests.query; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestQueryMultiManyOrder extends BaseTestCase { @@ -19,7 +18,7 @@ public class TestQueryMultiManyOrder extends BaseTestCase { ResetBasicData.reset(); Query q = Ebean.find(Order.class).fetch("shipments").fetch("details") - .fetch("details.product").fetch("customer").where().gt("id", 0).query(); + .fetch("details.product").fetch("customer").where().gt("id", 0).query(); List list = q.findList(); String sql = q.getGeneratedSql(); diff --git a/src/test/java/com/avaje/tests/query/TestQueryNullAssocOne.java b/src/test/java/com/avaje/tests/query/TestQueryNullAssocOne.java index 90c9367bc..e8167628b 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryNullAssocOne.java +++ b/src/test/java/com/avaje/tests/query/TestQueryNullAssocOne.java @@ -1,15 +1,14 @@ package com.avaje.tests.query; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestQueryNullAssocOne extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/query/TestQueryPathJoinAndOrder.java b/src/test/java/com/avaje/tests/query/TestQueryPathJoinAndOrder.java index 7c0016533..95a93d41c 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryPathJoinAndOrder.java +++ b/src/test/java/com/avaje/tests/query/TestQueryPathJoinAndOrder.java @@ -1,14 +1,13 @@ package com.avaje.tests.query; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestQueryPathJoinAndOrder extends BaseTestCase { @@ -18,7 +17,7 @@ public class TestQueryPathJoinAndOrder extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Customer.class).select("id,name, status").fetch("contacts") - .order().asc("id").order().desc("contacts.firstName").setMaxRows(3).findList(); + .order().asc("id").order().desc("contacts.firstName").setMaxRows(3).findList(); Assert.assertNotNull(list); diff --git a/src/test/java/com/avaje/tests/query/TestQueryPlanCacheRowCount.java b/src/test/java/com/avaje/tests/query/TestQueryPlanCacheRowCount.java index fd74211ce..248d32f21 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryPlanCacheRowCount.java +++ b/src/test/java/com/avaje/tests/query/TestQueryPlanCacheRowCount.java @@ -1,15 +1,14 @@ package com.avaje.tests.query; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestQueryPlanCacheRowCount extends BaseTestCase { @@ -19,7 +18,7 @@ public class TestQueryPlanCacheRowCount extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class).where().eq("status", Order.Status.NEW).ge("id", 1) - .order().desc("id"); + .order().desc("id"); int rc0 = query.findCount(); @@ -46,7 +45,7 @@ public class TestQueryPlanCacheRowCount extends BaseTestCase { // should still hit query plan cache Query query2 = Ebean.find(Order.class).where().eq("status", Order.Status.NEW) - .ge("id", idGt).order().desc("id"); + .ge("id", idGt).order().desc("id"); int rc2 = query2.findCount(); diff --git a/src/test/java/com/avaje/tests/query/TestRefToLazyLoadMany.java b/src/test/java/com/avaje/tests/query/TestRefToLazyLoadMany.java index f4310b8ae..eb611305a 100644 --- a/src/test/java/com/avaje/tests/query/TestRefToLazyLoadMany.java +++ b/src/test/java/com/avaje/tests/query/TestRefToLazyLoadMany.java @@ -1,15 +1,14 @@ package com.avaje.tests.query; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Contact; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestRefToLazyLoadMany extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/query/TestRowCount.java b/src/test/java/com/avaje/tests/query/TestRowCount.java index ae7196f04..da4f110e2 100644 --- a/src/test/java/com/avaje/tests/query/TestRowCount.java +++ b/src/test/java/com/avaje/tests/query/TestRowCount.java @@ -1,15 +1,14 @@ package com.avaje.tests.query; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestRowCount extends BaseTestCase { @@ -19,7 +18,7 @@ public class TestRowCount extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class).fetch("details").where().gt("id", 1) - .gt("details.id", 1).order("id desc"); + .gt("details.id", 1).order("id desc"); int rc = query.findCount(); diff --git a/src/test/java/com/avaje/tests/query/TestSubQuery.java b/src/test/java/com/avaje/tests/query/TestSubQuery.java index e7d26851d..0dcb2d382 100644 --- a/src/test/java/com/avaje/tests/query/TestSubQuery.java +++ b/src/test/java/com/avaje/tests/query/TestSubQuery.java @@ -1,11 +1,5 @@ package com.avaje.tests.query; -import java.util.ArrayList; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; @@ -14,6 +8,10 @@ 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 org.junit.Test; + +import java.util.ArrayList; +import java.util.List; import static org.assertj.core.api.StrictAssertions.assertThat; @@ -28,7 +26,7 @@ public class TestSubQuery extends BaseTestCase { productIds.add(3); Query sq = Ebean.createQuery(Order.class).select("id").where() - .in("details.product.id", productIds).query(); + .in("details.product.id", productIds).query(); Ebean.find(Order.class).where().in("id", sq).findList(); } @@ -37,7 +35,7 @@ public class TestSubQuery extends BaseTestCase { ResetBasicData.reset(); Query sq = Ebean.createQuery(CKeyParent.class).select("id.oneKey") - .setAutoTune(false).where().query(); + .setAutoTune(false).where().query(); Query pq = Ebean.find(CKeyParent.class).where().in("id.oneKey", sq).query(); @@ -52,23 +50,23 @@ public class TestSubQuery extends BaseTestCase { /** * show that ebean is not using the correct table name in the subquery (sq) - * + * * public void testInheritance1() { ResetBasicData.reset(); - * + * * Query sq = Ebean.createQuery(Vehicle.class) .select("id") * .setAutoTune(false) .where() .query(); - * + * * Query 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"); } - * + * * } */ @@ -80,7 +78,7 @@ public class TestSubQuery extends BaseTestCase { ResetBasicData.reset(); Query sq = Ebean.createQuery(VehicleDriver.class).select("vehicle") - .setAutoTune(false).where().query(); + .setAutoTune(false).where().query(); Query pq = Ebean.find(Vehicle.class).where().in("id", sq).query(); @@ -105,7 +103,7 @@ public class TestSubQuery extends BaseTestCase { ResetBasicData.reset(); Query sq = Ebean.createQuery(VehicleDriver.class).select("vehicle") - .setAutoTune(false).where().eq("vehicle.licenseNumber", "abc").query(); + .setAutoTune(false).where().eq("vehicle.licenseNumber", "abc").query(); Query pq = Ebean.find(Vehicle.class).where().in("id", sq).query(); @@ -126,7 +124,7 @@ public class TestSubQuery extends BaseTestCase { ResetBasicData.reset(); Query sq = Ebean.createQuery(VehicleDriver.class).select("vehicle.id") - .setAutoTune(false).where().query(); + .setAutoTune(false).where().query(); Query pq = Ebean.find(Vehicle.class).where().in("id", sq).query(); diff --git a/src/test/java/com/avaje/tests/query/TestThreeLevelQueryJoin.java b/src/test/java/com/avaje/tests/query/TestThreeLevelQueryJoin.java index 2e043c136..4d1e28dba 100644 --- a/src/test/java/com/avaje/tests/query/TestThreeLevelQueryJoin.java +++ b/src/test/java/com/avaje/tests/query/TestThreeLevelQueryJoin.java @@ -1,12 +1,11 @@ package com.avaje.tests.query; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.FetchConfig; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Test; public class TestThreeLevelQueryJoin extends BaseTestCase { @@ -16,10 +15,10 @@ public class TestThreeLevelQueryJoin extends BaseTestCase { ResetBasicData.reset(); Ebean.find(Customer.class).fetch("orders", new FetchConfig().query()) - .fetch("orders.details", new FetchConfig().query()) - .fetch("orders.shipments", new FetchConfig().query()) - .fetch("shippingAddress", new FetchConfig().query()) - .fetch("billingAddress", new FetchConfig().query()).findList(); + .fetch("orders.details", new FetchConfig().query()) + .fetch("orders.shipments", new FetchConfig().query()) + .fetch("shippingAddress", new FetchConfig().query()) + .fetch("billingAddress", new FetchConfig().query()).findList(); } diff --git a/src/test/java/com/avaje/tests/query/TestWhereRawClause.java b/src/test/java/com/avaje/tests/query/TestWhereRawClause.java index 38a25d562..b9abda112 100644 --- a/src/test/java/com/avaje/tests/query/TestWhereRawClause.java +++ b/src/test/java/com/avaje/tests/query/TestWhereRawClause.java @@ -1,14 +1,13 @@ package com.avaje.tests.query; -import com.avaje.ebean.Query; -import com.avaje.tests.model.basic.Order; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Expr; +import com.avaje.ebean.Query; +import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.OrderDetail; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Test; import java.sql.Timestamp; @@ -23,10 +22,10 @@ public class TestWhereRawClause extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class) - .where() - .raw("(status = ? or (orderDate < ? and shipDate is null) or customer.name like ?)", - Order.Status.APPROVED, new Timestamp(System.currentTimeMillis()), "Rob") - .query(); + .where() + .raw("(status = ? or (orderDate < ? and shipDate is null) or customer.name like ?)", + Order.Status.APPROVED, new Timestamp(System.currentTimeMillis()), "Rob") + .query(); query.findList(); @@ -39,10 +38,10 @@ public class TestWhereRawClause extends BaseTestCase { ResetBasicData.reset(); Ebean.find(OrderDetail.class) - .where() - .not(Expr.eq("id", 1)) - .raw("orderQty < shipQty") - .findList(); + .where() + .not(Expr.eq("id", 1)) + .raw("orderQty < shipQty") + .findList(); } @@ -52,12 +51,12 @@ public class TestWhereRawClause extends BaseTestCase { ResetBasicData.reset(); Ebean.find(OrderDetail.class) - .where() - .ne("id", 42) - .raw("orderQty < ?", 100) - .gt("id", 1) - .raw("unitPrice > ? and product.id > ?", 2, 3) - .findList(); + .where() + .ne("id", 42) + .raw("orderQty < ?", 100) + .gt("id", 1) + .raw("unitPrice > ? and product.id > ?", 2, 3) + .findList(); } } diff --git a/src/test/java/com/avaje/tests/query/aggregation/TestAggregationCount.java b/src/test/java/com/avaje/tests/query/aggregation/TestAggregationCount.java index d633d1f78..3e47dba7b 100644 --- a/src/test/java/com/avaje/tests/query/aggregation/TestAggregationCount.java +++ b/src/test/java/com/avaje/tests/query/aggregation/TestAggregationCount.java @@ -65,12 +65,12 @@ public class TestAggregationCount extends BaseTestCase { public void testFull() { Query query2 = Ebean.find(TEventOne.class) - .select("name, count, totalUnits, totalAmount") - .where() - .startsWith("logs.description", "a") - .having() - .ge("count", 1) - .orderBy().asc("name"); + .select("name, count, totalUnits, totalAmount") + .where() + .startsWith("logs.description", "a") + .having() + .ge("count", 1) + .orderBy().asc("name"); List list = query2.findList(); for (TEventOne eventOne : list) { @@ -94,7 +94,7 @@ public class TestAggregationCount extends BaseTestCase { public void testSelectOnly() { Query query0 = Ebean.find(TEventOne.class) - .select("name, count, totalUnits, totalAmount"); + .select("name, count, totalUnits, totalAmount"); query0.findList(); assertThat(query0.getGeneratedSql()).contains("select t0.id c0, t0.name c1, count(u1.*) c2, sum(u1.units) c3, sum(u1.units * u1.amount) c4 from tevent_one t0"); @@ -105,8 +105,8 @@ public class TestAggregationCount extends BaseTestCase { public void testSelectWhere() { Query query0 = Ebean.find(TEventOne.class) - .select("name, count, totalUnits, totalAmount") - .where().gt("logs.description", "a").query(); + .select("name, count, totalUnits, totalAmount") + .where().gt("logs.description", "a").query(); query0.findList(); assertThat(query0.getGeneratedSql()).contains("select t0.id c0, t0.name c1, count(u1.*) c2, sum(u1.units) c3, sum(u1.units * u1.amount) c4 from tevent_one t0"); @@ -117,9 +117,9 @@ public class TestAggregationCount extends BaseTestCase { public void testSelectHavingOrderBy() { Query query1 = Ebean.find(TEventOne.class) - .select("name, count, totalUnits, totalAmount") - .having().ge("count", 1) - .orderBy().asc("name"); + .select("name, count, totalUnits, totalAmount") + .having().ge("count", 1) + .orderBy().asc("name"); query1.findList(); assertThat(query1.getGeneratedSql()).contains("having count(u1.*) >= ? order by t0.name"); diff --git a/src/test/java/com/avaje/tests/query/autotune/TestAutoTuneProfiling.java b/src/test/java/com/avaje/tests/query/autotune/TestAutoTuneProfiling.java index c4491e3be..17c7ccdb3 100644 --- a/src/test/java/com/avaje/tests/query/autotune/TestAutoTuneProfiling.java +++ b/src/test/java/com/avaje/tests/query/autotune/TestAutoTuneProfiling.java @@ -57,9 +57,9 @@ public class TestAutoTuneProfiling extends BaseTestCase { private Order findById(long id) { return Ebean.find(Order.class) - .select("status, orderDate, shipDate") - .setId(id) - .findUnique(); + .select("status, orderDate, shipDate") + .setId(id) + .findUnique(); } private void useOrderDate() { diff --git a/src/test/java/com/avaje/tests/query/embedded/TestMultipleEmbeddedLoading.java b/src/test/java/com/avaje/tests/query/embedded/TestMultipleEmbeddedLoading.java index 6fcd55427..7ed43bf02 100644 --- a/src/test/java/com/avaje/tests/query/embedded/TestMultipleEmbeddedLoading.java +++ b/src/test/java/com/avaje/tests/query/embedded/TestMultipleEmbeddedLoading.java @@ -20,7 +20,7 @@ public class TestMultipleEmbeddedLoading extends BaseTestCase { @Test public void testSimpleCase() { - + // prepare test EAddress ship = new EAddress(); ship.setStreet("1 Banana St"); @@ -37,52 +37,52 @@ public class TestMultipleEmbeddedLoading extends BaseTestCase { invoice.setState(State.New); invoice.setShipAddress(ship); invoice.setBillAddress(bill); - + // act: save and fetch Ebean.save(invoice); - + EInvoice invoice2 = Ebean.find(EInvoice.class, invoice.getId()); - + // assert fetched bean populated as expected assertEquals(invoice.getId(), invoice2.getId()); assertEquals(invoice.getState(), invoice2.getState()); assertEquals(invoice.getInvoiceDate(), invoice2.getInvoiceDate()); assertEquals("2 Apple St", invoice.getBillAddress().getStreet()); assertEquals("2 Apple St", invoice2.getBillAddress().getStreet()); - + // act: only update one of the embedded fields invoice2.getBillAddress().setStreet("3 Pineapple St"); // bean should be dirty Ebean.save(invoice2); awaitL2Cache(); - + EInvoice invoice3 = Ebean.find(EInvoice.class, invoice.getId()); - + // assert field has updated value assertEquals("3 Pineapple St", invoice3.getBillAddress().getStreet()); - - + + // fetch a partial EInvoice invoicePartial = Ebean.find(EInvoice.class) - .select("state, date") - .where().idEq(invoice.getId()) - .findUnique(); - + .select("state, date") + .where().idEq(invoice.getId()) + .findUnique(); + // lazy load of embedded bean EAddress billAddress = invoicePartial.getBillAddress(); - + assertNotNull(billAddress); assertEquals("3 Pineapple St", billAddress.getStreet()); - + EbeanServer server = Ebean.getServer(null); ServerCacheManager serverCacheManager = server.getServerCacheManager(); - + // get cache, clear the cache and statistics ServerCache beanCache = serverCacheManager.getBeanCache(EInvoice.class); beanCache.clear(); beanCache.getStatistics(true); - + // fetch and load the cache EInvoice invoice4 = Ebean.find(EInvoice.class, invoice.getId()); assertNotNull(invoice4); @@ -95,16 +95,16 @@ public class TestMultipleEmbeddedLoading extends BaseTestCase { // fetch out of the cache this time EInvoice invoice5 = Ebean.find(EInvoice.class, invoice.getId()); assertNotNull(invoice5); - + statistics = beanCache.getStatistics(false); assertEquals(1, statistics.getSize()); assertEquals(1, statistics.getHitCount()); billAddress = invoice5.getBillAddress(); - + assertNotNull(billAddress); assertEquals("3 Pineapple St", billAddress.getStreet()); } - + } diff --git a/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterJoin.java b/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterJoin.java index 8e49dbc3c..8355bbd62 100644 --- a/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterJoin.java +++ b/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterJoin.java @@ -1,15 +1,14 @@ package com.avaje.tests.query.joins; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.MRole; import com.avaje.tests.model.basic.MUser; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestDisjunctWhereOuterJoin extends BaseTestCase { @@ -46,10 +45,10 @@ public class TestDisjunctWhereOuterJoin extends BaseTestCase { Query query = Ebean.find(MUser.class) - .where().disjunction() - .eq("roles.roleName", "role2specialB") // user0 - .eq("roles.roleName", "role3B") // nobody - .endJunction().query(); + .where().disjunction() + .eq("roles.roleName", "role2specialB") // user0 + .eq("roles.roleName", "role3B") // nobody + .endJunction().query(); List list = query.findList(); Assert.assertSame(1, list.size()); // list should contain user0 diff --git a/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterOnMany.java b/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterOnMany.java index bc1a1abed..c5ddb5801 100644 --- a/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterOnMany.java +++ b/src/test/java/com/avaje/tests/query/joins/TestDisjunctWhereOuterOnMany.java @@ -1,15 +1,14 @@ package com.avaje.tests.query.joins; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.UUOne; import com.avaje.tests.model.basic.UUTwo; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestDisjunctWhereOuterOnMany extends BaseTestCase { @@ -33,32 +32,32 @@ public class TestDisjunctWhereOuterOnMany extends BaseTestCase { Ebean.save(master1); Ebean.save(detail1); Ebean.save(master2); - - + + // Have outer join so that "testDisjOuter_2_name" is found Query query = Ebean.find(UUOne.class) .where().disjunction() - .eq("name", "testDisjOuter_2_name") - .eq("comments.name", "testDisjOuter_CHILD_1") - .endJunction() - .query(); - + .eq("name", "testDisjOuter_2_name") + .eq("comments.name", "testDisjOuter_CHILD_1") + .endJunction() + .query(); + List list = query.findList(); int rowCount = query.findCount(); - - // select distinct t0.id c0, t0.name c1 - // from uuone t0 - // join uutwo u1 on u1.master_id = t0.id + + // select distinct t0.id c0, t0.name c1 + // from uuone t0 + // join uutwo u1 on u1.master_id = t0.id // left join uutwo t1 on t1.master_id = t0.id - // where (t0.name = ? or u1.name = ? ) ; + // where (t0.name = ? or u1.name = ? ) ; // --bind(testDisjOuter_2_name,testDisjOuter_CHILD_1) - + Assert.assertEquals(2, list.size()); Assert.assertEquals(2, rowCount); - + String expectedSql = "select distinct t0.id, t0.name from uuone t0 left join uutwo u1 on u1.master_id = t0.id where (t0.name = ? or u1.name = ? ) "; Assert.assertEquals(expectedSql, sqlOf(query, 1)); - + } - + } diff --git a/src/test/java/com/avaje/tests/query/joins/TestQueryJoinManyNonRoot.java b/src/test/java/com/avaje/tests/query/joins/TestQueryJoinManyNonRoot.java index aaa39ebca..c86203174 100644 --- a/src/test/java/com/avaje/tests/query/joins/TestQueryJoinManyNonRoot.java +++ b/src/test/java/com/avaje/tests/query/joins/TestQueryJoinManyNonRoot.java @@ -1,14 +1,16 @@ package com.avaje.tests.query.joins; -import java.util.List; - -import com.avaje.ebean.*; +import com.avaje.ebean.BaseTestCase; +import com.avaje.ebean.Ebean; +import com.avaje.ebean.FetchConfig; +import com.avaje.ebean.Query; +import com.avaje.tests.model.basic.Order; +import com.avaje.tests.model.basic.ResetBasicData; import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; -import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.ResetBasicData; +import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -23,9 +25,9 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { LoggedSqlCollector.start(); List orders = Ebean.find(Order.class) - .select("id, status, orderDate") - .where().gt("details.orderQty", 0) - .findList(); + .select("id, status, orderDate") + .where().gt("details.orderQty", 0) + .findList(); assertTrue(!orders.isEmpty()); @@ -41,9 +43,9 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { ResetBasicData.reset(); Query q = Ebean.find(Order.class) - .fetch("customer") - .fetch("customer.contacts") - .where().gt("id", 0).query(); + .fetch("customer") + .fetch("customer.contacts") + .where().gt("id", 0).query(); List list = q.findList(); String sql = q.getGeneratedSql(); @@ -51,15 +53,15 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { assertTrue(!list.isEmpty()); assertTrue(sql.contains("join o_customer t1 on t1.id ")); assertTrue(sql.contains("left join contact t2 on")); - - // select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, - // t1.id c7, t1.status c8, t1.name c9, t1.smallnote c10, t1.anniversary c11, t1.cretime c12, t1.updtime c13, t1.billing_address_id c14, t1.shipping_address_id c15, - // t2.id c16, t2.first_name c17, t2.last_name c18, t2.phone c19, t2.mobile c20, t2.email c21, t2.cretime c22, t2.updtime c23, t2.customer_id c24, t2.group_id c25 - // from o_order t0 - // join o_customer t1 on t1.id = t0.kcustomer_id + + // select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, + // t1.id c7, t1.status c8, t1.name c9, t1.smallnote c10, t1.anniversary c11, t1.cretime c12, t1.updtime c13, t1.billing_address_id c14, t1.shipping_address_id c15, + // t2.id c16, t2.first_name c17, t2.last_name c18, t2.phone c19, t2.mobile c20, t2.email c21, t2.cretime c22, t2.updtime c23, t2.customer_id c24, t2.group_id c25 + // from o_order t0 + // join o_customer t1 on t1.id = t0.kcustomer_id // left join contact t2 on t2.customer_id = t1.id // where t0.id > ? ; --bind(0) - + } @Test @@ -68,11 +70,11 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { ResetBasicData.reset(); Query q = Ebean.find(Order.class) - .fetch("details") - .fetch("details.product") - .fetch("customer") - .fetch("customer.contacts") - .where().gt("id", 0).query(); + .fetch("details") + .fetch("details.product") + .fetch("customer") + .fetch("customer.contacts") + .where().gt("id", 0).query(); List list = q.findList(); String sql = q.getGeneratedSql(); @@ -92,15 +94,15 @@ public class TestQueryJoinManyNonRoot extends BaseTestCase { ResetBasicData.reset(); Query q = Ebean.find(Order.class) - .fetch("customer") - .fetch("customer.contacts") - .fetch("details", new FetchConfig().query(10)) - .fetch("details.product") - .where().gt("id", 0).query(); + .fetch("customer") + .fetch("customer.contacts") + .fetch("details", new FetchConfig().query(10)) + .fetch("details.product") + .where().gt("id", 0).query(); List list = q.findList(); String sql = q.getGeneratedSql(); - + for (Order order : list) { order.getCustomer().getContacts().size(); } diff --git a/src/test/java/com/avaje/tests/query/joins/TestQueryJoinQueryNonRoot.java b/src/test/java/com/avaje/tests/query/joins/TestQueryJoinQueryNonRoot.java index 88c78a6d4..1309684c7 100644 --- a/src/test/java/com/avaje/tests/query/joins/TestQueryJoinQueryNonRoot.java +++ b/src/test/java/com/avaje/tests/query/joins/TestQueryJoinQueryNonRoot.java @@ -1,10 +1,5 @@ package com.avaje.tests.query.joins; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.FetchConfig; @@ -14,6 +9,10 @@ import com.avaje.ebeaninternal.server.el.ElPropertyValue; import com.avaje.tests.model.basic.Contact; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestQueryJoinQueryNonRoot extends BaseTestCase { @@ -29,10 +28,10 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Order.class) - .fetch("customer") - .fetch("customer.contacts", "firstName", new FetchConfig().query().lazy(10)) - .fetch("customer.contacts.group") - .where().lt("id", 3).findList(); + .fetch("customer") + .fetch("customer.contacts", "firstName", new FetchConfig().query().lazy(10)) + .fetch("customer.contacts.group") + .where().lt("id", 3).findList(); Assert.assertNotNull(list); Assert.assertTrue(!list.isEmpty()); @@ -53,6 +52,6 @@ public class TestQueryJoinQueryNonRoot extends BaseTestCase { // Assert.assertTrue(list2.size() > 0); } - + } diff --git a/src/test/java/com/avaje/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java b/src/test/java/com/avaje/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java index ab0ee7d70..8cb8b9a6c 100644 --- a/src/test/java/com/avaje/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java +++ b/src/test/java/com/avaje/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java @@ -1,13 +1,12 @@ package com.avaje.tests.query.joins; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Assert; +import org.junit.Test; public class TestQueryManyToOneWhereClauseJoin extends BaseTestCase { @@ -21,18 +20,18 @@ public class TestQueryManyToOneWhereClauseJoin extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class) - .where().ilike("customer.name", "rob%") - .query(); + .where().ilike("customer.name", "rob%") + .query(); query.findList(); - - //select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7 + + //select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7 String expectedSql = "from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id where lower(t1.name) like ? "; Assert.assertTrue(query.getGeneratedSql().contains(expectedSql)); - // select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7 - // from o_order t0 - // join o_customer t1 on t1.id = t0.kcustomer_id + // select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7 + // from o_order t0 + // join o_customer t1 on t1.id = t0.kcustomer_id // where lower(t1.name) like ? ; --bind(rob%) } @@ -45,22 +44,22 @@ public class TestQueryManyToOneWhereClauseJoin extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class) - .where().disjunction().ilike("customer.name", "rob%").gt("id", 1).endJunction() - .query(); + .where().disjunction().ilike("customer.name", "rob%").gt("id", 1).endJunction() + .query(); query.findList(); - - //select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7 + + //select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7 String expectedSql = "from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id where (lower(t1.name) like ? "; Assert.assertTrue(query.getGeneratedSql().contains(expectedSql)); - - // select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7 - // from o_order t0 - // join o_customer t1 on t1.id = t0.kcustomer_id + + // select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7 + // from o_order t0 + // join o_customer t1 on t1.id = t0.kcustomer_id // where (lower(t1.name) like ? or t0.id > ? ) ; --bind(rob%,1) - + } - + /** * Testing ManyToOne relationship with predicate and fetch. @@ -71,23 +70,23 @@ public class TestQueryManyToOneWhereClauseJoin extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class) - .fetch("customer") - .fetch("customer.contacts") - .where().ilike("customer.name", "rob%") - .query(); + .fetch("customer") + .fetch("customer.contacts") + .where().ilike("customer.name", "rob%") + .query(); query.findList(); - + String generatedSql = query.getGeneratedSql(); Assert.assertTrue(generatedSql.contains("from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id")); Assert.assertTrue(generatedSql.contains("left join contact t2 on t2.customer_id = t1.id")); Assert.assertTrue(generatedSql.contains("where lower(t1.name) like ?")); - - // select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, - // t1.id c7, t1.status c8, t1.name c9, t1.smallnote c10, t1.anniversary c11, t1.cretime c12, t1.updtime c13, t1.billing_address_id c14, t1.shipping_address_id c15, - // t2.id c16, t2.first_name c17, t2.last_name c18, t2.phone c19, t2.mobile c20, t2.email c21, t2.cretime c22, t2.updtime c23, t2.customer_id c24, t2.group_id c25 - // from o_order t0 - // join o_customer t1 on t1.id = t0.kcustomer_id + + // select t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t1.name c4, t0.cretime c5, t0.updtime c6, + // t1.id c7, t1.status c8, t1.name c9, t1.smallnote c10, t1.anniversary c11, t1.cretime c12, t1.updtime c13, t1.billing_address_id c14, t1.shipping_address_id c15, + // t2.id c16, t2.first_name c17, t2.last_name c18, t2.phone c19, t2.mobile c20, t2.email c21, t2.cretime c22, t2.updtime c23, t2.customer_id c24, t2.group_id c25 + // from o_order t0 + // join o_customer t1 on t1.id = t0.kcustomer_id // left join contact t2 on t2.customer_id = t1.id // where lower(t1.name) like ? ; --bind(rob%) } diff --git a/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java b/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java index 92a93822c..c8ac80101 100644 --- a/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java +++ b/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java @@ -2,7 +2,6 @@ package com.avaje.tests.query.lazy; import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; -import com.avaje.ebean.QueryEachConsumer; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.OrderDetail; @@ -20,8 +19,8 @@ public class TestQueryDefaultBatchSize extends BaseTestCase { ResetBasicData.reset(); Ebean.find(Order.class) - .setLazyLoadBatchSize(2) - .findEach(bean -> doStuff(bean)); + .setLazyLoadBatchSize(2) + .findEach(bean -> doStuff(bean)); } @Test @@ -30,12 +29,12 @@ public class TestQueryDefaultBatchSize extends BaseTestCase { ResetBasicData.reset(); Ebean.find(Order.class) - .fetch("details", "id") - .fetch("details.product", "sku") - .fetch("customer") - .fetch("customer.contacts") - .setLazyLoadBatchSize(2) - .findEach(bean -> doStuff(bean)); + .fetch("details", "id") + .fetch("details.product", "sku") + .fetch("customer") + .fetch("customer.contacts") + .setLazyLoadBatchSize(2) + .findEach(bean -> doStuff(bean)); } @Test @@ -44,9 +43,9 @@ public class TestQueryDefaultBatchSize extends BaseTestCase { ResetBasicData.reset(); List orders = - Ebean.find(Order.class) - .setLazyLoadBatchSize(2) - .findList(); + Ebean.find(Order.class) + .setLazyLoadBatchSize(2) + .findList(); for (Order order : orders) { doStuff(order); @@ -59,13 +58,13 @@ public class TestQueryDefaultBatchSize extends BaseTestCase { ResetBasicData.reset(); List orders = - Ebean.find(Order.class) - .fetch("details", "id") - .fetch("details.product", "sku") - .fetch("customer") - .fetch("customer.contacts") - .setLazyLoadBatchSize(2) - .findList(); + Ebean.find(Order.class) + .fetch("details", "id") + .fetch("details.product", "sku") + .fetch("customer") + .fetch("customer.contacts") + .setLazyLoadBatchSize(2) + .findList(); for (Order order : orders) { doStuff(order); @@ -78,8 +77,8 @@ public class TestQueryDefaultBatchSize extends BaseTestCase { ResetBasicData.reset(); List orders = Ebean.find(Order.class) - .setLazyLoadBatchSize(100) - .findList(); + .setLazyLoadBatchSize(100) + .findList(); for (Order order : orders) { List details = order.getDetails(); diff --git a/src/test/java/com/avaje/tests/query/orderby/TestOrderByClear.java b/src/test/java/com/avaje/tests/query/orderby/TestOrderByClear.java index 4338c6d7f..49a38515e 100644 --- a/src/test/java/com/avaje/tests/query/orderby/TestOrderByClear.java +++ b/src/test/java/com/avaje/tests/query/orderby/TestOrderByClear.java @@ -5,14 +5,10 @@ import com.avaje.ebean.Ebean; import com.avaje.ebean.OrderBy; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.Order; -import com.avaje.tests.model.basic.OrderDetail; import com.avaje.tests.model.basic.ResetBasicData; -import org.avaje.ebeantest.LoggedSqlCollector; import org.junit.Assert; import org.junit.Test; -import java.util.List; - import static org.junit.Assert.assertTrue; public class TestOrderByClear extends BaseTestCase { @@ -23,7 +19,7 @@ public class TestOrderByClear extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Order.class) - .orderBy().asc("orderDate"); + .orderBy().asc("orderDate"); OrderBy orderBy = query.orderBy(); diff --git a/src/test/java/com/avaje/tests/query/orderby/TestOrderByOnComplex.java b/src/test/java/com/avaje/tests/query/orderby/TestOrderByOnComplex.java index b31bd1eb7..e78f01b86 100644 --- a/src/test/java/com/avaje/tests/query/orderby/TestOrderByOnComplex.java +++ b/src/test/java/com/avaje/tests/query/orderby/TestOrderByOnComplex.java @@ -1,13 +1,12 @@ package com.avaje.tests.query.orderby; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Assert; +import org.junit.Test; public class TestOrderByOnComplex extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinct.java b/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinct.java index 4e94b3b33..a2bc000a1 100644 --- a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinct.java +++ b/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinct.java @@ -1,19 +1,18 @@ package com.avaje.tests.query.orderby; -import java.util.List; -import java.util.Set; - -import com.avaje.tests.model.basic.Customer; -import com.avaje.tests.model.basic.ResetBasicData; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; +import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.MRole; import com.avaje.tests.model.basic.MUser; import com.avaje.tests.model.basic.MUserType; +import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; +import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; @@ -26,100 +25,99 @@ public class TestOrderByWithDistinct extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Customer.class) - .where() - .eq("junk","blah") - .eq("name","jim") - .orderBy("id desc,path.that.does.not.exist,contacts.group.name asc"); + .where() + .eq("junk", "blah") + .eq("name", "jim") + .orderBy("id desc,path.that.does.not.exist,contacts.group.name asc"); Set unknownProperties = query.validate(); assertThat(unknownProperties).isNotEmpty(); assertThat(unknownProperties).hasSize(2); - assertThat(unknownProperties).contains("junk","path.that.does.not.exist"); + assertThat(unknownProperties).contains("junk", "path.that.does.not.exist"); } - @Test - public void test() { - /* + @Test + public void test() { + /* * Original conversation: * https://groups.google.com/forum/?fromgroups=#!topic/ebean/uuvi1btdCDQ%5B1-25-false%5D - * + * * This test exposes what may be a general problem with columns required by the order by phrase being omitted from the select. * I'm not sure this exposes all causes of the problem. */ - - MUserType ut = new MUserType("md"); - Ebean.save(ut); - MUser user1 = new MUser("one"); - user1.setUserType(ut); - Ebean.save(user1); - MUser user2 = new MUser("two"); - user2.setUserType(ut); - Ebean.save(user2); - - MRole roleA = new MRole("A"); - Ebean.save(roleA); - MRole roleB = new MRole("B"); - Ebean.save(roleB); - - user1.addRole(roleA); - Ebean.save(user1); - user2.addRole(roleB); - Ebean.save(user2); - - Query query = Ebean.find(MUser.class) - .fetch("userType","name") - .where() - .eq("roles.roleName", "A") - .orderBy("userType.name, userName"); - List list = query.findList(); - - // select distinct t0.userid c0, t0.user_name c1, t1.id c2, t1.name c3 - // from muser t0 - // left join muser_type t1 on t1.id = t0.user_type_id - // join mrole_muser u1z_ on u1z_.muser_userid = t0.userid - // join mrole u1 on u1.roleid = u1z_.mrole_roleid - // where u1.role_name = ? - // order by t1.name, t0.user_name; --bind(A) - - Assert.assertEquals(1, list.size()); - Assert.assertEquals(user1, list.get(0)); + + MUserType ut = new MUserType("md"); + Ebean.save(ut); + MUser user1 = new MUser("one"); + user1.setUserType(ut); + Ebean.save(user1); + MUser user2 = new MUser("two"); + user2.setUserType(ut); + Ebean.save(user2); + + MRole roleA = new MRole("A"); + Ebean.save(roleA); + MRole roleB = new MRole("B"); + Ebean.save(roleB); + + user1.addRole(roleA); + Ebean.save(user1); + user2.addRole(roleB); + Ebean.save(user2); + + Query query = Ebean.find(MUser.class) + .fetch("userType", "name") + .where() + .eq("roles.roleName", "A") + .orderBy("userType.name, userName"); + List list = query.findList(); + + // select distinct t0.userid c0, t0.user_name c1, t1.id c2, t1.name c3 + // from muser t0 + // left join muser_type t1 on t1.id = t0.user_type_id + // join mrole_muser u1z_ on u1z_.muser_userid = t0.userid + // join mrole u1 on u1.roleid = u1z_.mrole_roleid + // where u1.role_name = ? + // order by t1.name, t0.user_name; --bind(A) + + Assert.assertEquals(1, list.size()); + Assert.assertEquals(user1, list.get(0)); String generatedSql = query.getGeneratedSql(); Assert.assertTrue(generatedSql.contains("select distinct t0.userid")); // using distinct Assert.assertTrue(generatedSql.contains("order by t1.name,")); // name in order by Assert.assertTrue(generatedSql.contains("t1.name"));// name in select - - - - // repeat with slight variation, not sure this really produces a different execution path - // this problem also manifests when autofetch eliminates properties from the select that aren't used in the objects - // still need them to be present for purpose of order by - // so here I'm "simulating" a scenario where autofetch has dropped userType.name - query = Ebean.find(MUser.class) - .setAutoTune(false) - .select("userName") - .fetch("userType","name") - .where() - .eq("roles.roleName", "A") - .orderBy("userType.name"); - list = query.findList(); - - Assert.assertEquals(1, list.size()); - Assert.assertEquals(user1, list.get(0)); - - // select distinct t0.userid c0, t0.user_name c1, t1.id c2, t1.name c3 - // from muser t0 - // left join muser_type t1 on t1.id = t0.user_type_id - // join mrole_muser u1z_ on u1z_.muser_userid = t0.userid - // join mrole u1 on u1.roleid = u1z_.mrole_roleid - // where u1.role_name = ? - // order by t1.name; --bind(A) - - generatedSql = query.getGeneratedSql(); + + + // repeat with slight variation, not sure this really produces a different execution path + // this problem also manifests when autofetch eliminates properties from the select that aren't used in the objects + // still need them to be present for purpose of order by + // so here I'm "simulating" a scenario where autofetch has dropped userType.name + query = Ebean.find(MUser.class) + .setAutoTune(false) + .select("userName") + .fetch("userType", "name") + .where() + .eq("roles.roleName", "A") + .orderBy("userType.name"); + list = query.findList(); + + Assert.assertEquals(1, list.size()); + Assert.assertEquals(user1, list.get(0)); + + // select distinct t0.userid c0, t0.user_name c1, t1.id c2, t1.name c3 + // from muser t0 + // left join muser_type t1 on t1.id = t0.user_type_id + // join mrole_muser u1z_ on u1z_.muser_userid = t0.userid + // join mrole u1 on u1.roleid = u1z_.mrole_roleid + // where u1.role_name = ? + // order by t1.name; --bind(A) + + generatedSql = query.getGeneratedSql(); Assert.assertTrue(generatedSql.contains("select distinct t0.userid")); // using distinct Assert.assertTrue(generatedSql.contains("order by t1.name")); // name in order by Assert.assertTrue(generatedSql.contains("t1.name"));// name in select - - } + + } } diff --git a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinctTake2.java b/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinctTake2.java index c697f9468..244ef7369 100644 --- a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinctTake2.java +++ b/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinctTake2.java @@ -1,40 +1,39 @@ package com.avaje.tests.query.orderby; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.Customer; +import org.junit.Assert; +import org.junit.Test; public class TestOrderByWithDistinctTake2 extends BaseTestCase { @Test public void testRegex() { - + String test = "helloasc asc ASC desc DESC boodesc desc ASC"; - + test = test.replaceAll("(?i)\\b asc\\b|\\b desc\\b", ""); Assert.assertEquals("helloasc boodesc", test); } - - + + @Test public void test() { - + Query query = Ebean.find(Customer.class) .select("id") .where().ilike("contacts.firstName", "R%") .order("name desc"); - + query.findList(); - + String generatedSql = sqlOf(query); - - // select distinct t0.id c0, t0.name - // from o_customer t0 join contact u1 on u1.customer_id = t0.id - // where lower(u1.first_name) like ? + + // select distinct t0.id c0, t0.name + // from o_customer t0 join contact u1 on u1.customer_id = t0.id + // where lower(u1.first_name) like ? // order by t0.name; --bind(r%) Assert.assertTrue("t0.name added to the select clause", generatedSql.contains("select distinct t0.id, t0.name")); @@ -42,17 +41,17 @@ public class TestOrderByWithDistinctTake2 extends BaseTestCase { Assert.assertTrue(generatedSql.contains("from o_customer t0 join contact u1 on u1.customer_id = t0.id")); Assert.assertTrue(generatedSql.contains("where lower(u1.first_name) like ?")); } - + @Test public void testWithAscAndDesc() { - + Query query = Ebean.find(Customer.class) .select("id") .where().ilike("contacts.firstName", "R%") .order("name asc,id desc"); - + query.findList(); - + String generatedSql = sqlOf(query); Assert.assertTrue("t0.name added to the select clause", generatedSql.contains("select distinct t0.id, t0.name, t0.id")); @@ -60,5 +59,5 @@ public class TestOrderByWithDistinctTake2 extends BaseTestCase { Assert.assertTrue(generatedSql.contains("from o_customer t0 join contact u1 on u1.customer_id = t0.id")); Assert.assertTrue(generatedSql.contains("where lower(u1.first_name) like ?")); } - + } diff --git a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithFunction.java b/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithFunction.java index 2858e871a..a937dff13 100644 --- a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithFunction.java +++ b/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithFunction.java @@ -1,13 +1,12 @@ package com.avaje.tests.query.orderby; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; public class TestOrderByWithFunction extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithMany.java b/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithMany.java index 4f8ebff01..8bfd502d5 100644 --- a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithMany.java +++ b/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithMany.java @@ -1,17 +1,16 @@ package com.avaje.tests.query.orderby; -import java.util.List; - -import org.avaje.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.OrderDetail; import com.avaje.tests.model.basic.ResetBasicData; +import org.avaje.ebeantest.LoggedSqlCollector; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestOrderByWithMany extends BaseTestCase { @@ -109,7 +108,7 @@ public class TestOrderByWithMany extends BaseTestCase { private void checkBoth() { Query query = Ebean.find(Order.class).fetch("shipments").order() - .desc("customer.name, shipments.shipTime"); + .desc("customer.name, shipments.shipTime"); query.findList(); @@ -121,7 +120,7 @@ public class TestOrderByWithMany extends BaseTestCase { private void checkPrepend() { Query query = Ebean.find(Order.class).fetch("shipments").order() - .desc("shipments.shipTime"); + .desc("shipments.shipTime"); query.findList(); @@ -133,7 +132,7 @@ public class TestOrderByWithMany extends BaseTestCase { private void checkAlreadyIncluded() { Query query = Ebean.find(Order.class).fetch("shipments").order() - .desc("id, shipments.shipTime"); + .desc("id, shipments.shipTime"); query.findList(); @@ -145,7 +144,7 @@ public class TestOrderByWithMany extends BaseTestCase { private void checkAlreadyIncluded2() { Query query = Ebean.find(Order.class).fetch("shipments").order() - .desc("orderDate, id, shipments.shipTime"); + .desc("orderDate, id, shipments.shipTime"); query.findList(); diff --git a/src/test/java/com/avaje/tests/query/other/TestFindIdsWithInheritance.java b/src/test/java/com/avaje/tests/query/other/TestFindIdsWithInheritance.java index fb65a46ee..f891cf146 100644 --- a/src/test/java/com/avaje/tests/query/other/TestFindIdsWithInheritance.java +++ b/src/test/java/com/avaje/tests/query/other/TestFindIdsWithInheritance.java @@ -1,30 +1,29 @@ package com.avaje.tests.query.other; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.Truck; import com.avaje.tests.model.basic.Vehicle; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestFindIdsWithInheritance extends BaseTestCase { @Test public void testQuery() { - + Truck truck = new Truck(); truck.setLicenseNumber("TK123"); - + Ebean.save(truck); - + List ids = Ebean.find(Vehicle.class).findIds(); Assert.assertNotNull(ids); - + Ebean.delete(truck); - + } - + } diff --git a/src/test/java/com/avaje/tests/query/other/TestFindIterateHeapDump.java b/src/test/java/com/avaje/tests/query/other/TestFindIterateHeapDump.java index f5ae9ad73..7e4e10c22 100644 --- a/src/test/java/com/avaje/tests/query/other/TestFindIterateHeapDump.java +++ b/src/test/java/com/avaje/tests/query/other/TestFindIterateHeapDump.java @@ -15,7 +15,7 @@ import java.util.concurrent.atomic.AtomicInteger; @SuppressWarnings("restriction") public class TestFindIterateHeapDump extends BaseTestCase { - + // All that heap dumping code from : // https://blogs.oracle.com/sundararajan/entry/programmatically_dumping_heap_from_java private static final String HOTSPOT_BEAN_NAME = "com.sun.management:type=HotSpotDiagnostic"; @@ -58,13 +58,13 @@ public class TestFindIterateHeapDump extends BaseTestCase { final AtomicInteger counter = new AtomicInteger(); server.find(EBasic.class) - .findEach(bean -> { + .findEach(bean -> { - int count = counter.incrementAndGet(); - if (count == 1) { - dumpHeap("heap-dump13-initial.snapshot", true); - } - }); + int count = counter.incrementAndGet(); + if (count == 1) { + dumpHeap("heap-dump13-initial.snapshot", true); + } + }); // try { // while (iterate.hasNext()) { diff --git a/src/test/java/com/avaje/tests/query/other/TestFindPartialWithConstructorSetFields.java b/src/test/java/com/avaje/tests/query/other/TestFindPartialWithConstructorSetFields.java index 4e4ae9e25..979a01e08 100644 --- a/src/test/java/com/avaje/tests/query/other/TestFindPartialWithConstructorSetFields.java +++ b/src/test/java/com/avaje/tests/query/other/TestFindPartialWithConstructorSetFields.java @@ -4,11 +4,9 @@ import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.BeanState; 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; import org.junit.Test; -import java.sql.Date; import java.util.List; import java.util.Set; @@ -19,7 +17,7 @@ public class TestFindPartialWithConstructorSetFields extends BaseTestCase { @Test public void test() { - + ResetBasicData.reset(); List list = Ebean.find(Order.class) @@ -51,5 +49,5 @@ public class TestFindPartialWithConstructorSetFields extends BaseTestCase { } } - + } diff --git a/src/test/java/com/avaje/tests/query/other/TestFindWhereUsingEnumerated.java b/src/test/java/com/avaje/tests/query/other/TestFindWhereUsingEnumerated.java index 60b9106cb..f07f14f66 100644 --- a/src/test/java/com/avaje/tests/query/other/TestFindWhereUsingEnumerated.java +++ b/src/test/java/com/avaje/tests/query/other/TestFindWhereUsingEnumerated.java @@ -1,11 +1,10 @@ package com.avaje.tests.query.other; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.MNonEnum; import com.avaje.tests.model.basic.MNonUpdPropEntity; +import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -22,11 +21,11 @@ public class TestFindWhereUsingEnumerated extends BaseTestCase { Ebean.save(e); MNonUpdPropEntity unique = Ebean.find(MNonUpdPropEntity.class).where() - .eq("nonEnum", MNonEnum.END) - .eq("name", "TheNonEnumIsEnd") - .findUnique(); + .eq("nonEnum", MNonEnum.END) + .eq("name", "TheNonEnumIsEnd") + .findUnique(); assertThat(unique).isNotNull(); } - + } diff --git a/src/test/java/com/avaje/tests/query/other/TestFormulaWithFindCount.java b/src/test/java/com/avaje/tests/query/other/TestFormulaWithFindCount.java index f4cc122ef..b053a6672 100644 --- a/src/test/java/com/avaje/tests/query/other/TestFormulaWithFindCount.java +++ b/src/test/java/com/avaje/tests/query/other/TestFormulaWithFindCount.java @@ -1,27 +1,26 @@ package com.avaje.tests.query.other; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.ebean.ExpressionList; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestFormulaWithFindCount extends BaseTestCase { @Test public void testFindCount() { - + ResetBasicData.reset(); - + EbeanServer server = Ebean.getServer(null); - + ExpressionList ex = server.find(Order.class).select("id, status ,totalAmount").where().gt("totalAmount", 1d); List list = ex.findList(); @@ -29,7 +28,7 @@ public class TestFormulaWithFindCount extends BaseTestCase { Double amount = order.getTotalAmount(); Assert.assertNotNull(amount); } - + ExpressionList expressionList = server.find(Order.class).where().gt("totalAmount", 1d); int rowCount = expressionList.findCount(); Assert.assertEquals(list.size(), rowCount); diff --git a/src/test/java/com/avaje/tests/query/other/TestManyLazyLoadingQuery.java b/src/test/java/com/avaje/tests/query/other/TestManyLazyLoadingQuery.java index b1b1cfe5f..f085bc07b 100644 --- a/src/test/java/com/avaje/tests/query/other/TestManyLazyLoadingQuery.java +++ b/src/test/java/com/avaje/tests/query/other/TestManyLazyLoadingQuery.java @@ -1,10 +1,5 @@ package com.avaje.tests.query.other; -import java.util.ArrayList; -import java.util.List; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebeaninternal.api.SpiEbeanServer; @@ -14,6 +9,10 @@ import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.OrderDetail; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -21,56 +20,55 @@ public class TestManyLazyLoadingQuery extends BaseTestCase { @Test public void test() { - + ResetBasicData.reset(); - - SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null); - + + SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); + BeanDescriptor descOrder = server.getBeanDescriptor(Order.class); - BeanPropertyAssocMany beanProperty = (BeanPropertyAssocMany)descOrder.getBeanProperty("details"); - + BeanPropertyAssocMany beanProperty = (BeanPropertyAssocMany) descOrder.getBeanProperty("details"); + List parentIds = new ArrayList<>(); parentIds.add(1); - - - List orders = - Ebean.find(Order.class) - .where().lt("id", 4) - .findList(); - + + + List orders = + Ebean.find(Order.class) + .where().lt("id", 4) + .findList(); + for (Order order : orders) { List details = order.getDetails(); System.out.println(details.size()); } - - - + + // start transaction to keep PC going to lazy query Ebean.beginTransaction(); try { Ebean.find(Order.class, 1); - - SpiQuery query0 = (SpiQuery)Ebean.find(OrderDetail.class); - + + SpiQuery query0 = (SpiQuery) Ebean.find(OrderDetail.class); + query0.setLazyLoadForParents(beanProperty); - + beanProperty.addWhereParentIdIn(query0, parentIds, false); - + query0.findList(); assertThat(query0.getGeneratedSql()).contains(" from o_order_detail t0 where (t0.order_id) in ("); } finally { Ebean.endTransaction(); } - + List details = Ebean.find(OrderDetail.class) .where().eq("order.id", 1) .findList(); - + for (OrderDetail orderDetail : details) { - System.out.println(orderDetail); + System.out.println(orderDetail); } - + } - + } diff --git a/src/test/java/com/avaje/tests/query/other/TestManyToManyLazyLoading.java b/src/test/java/com/avaje/tests/query/other/TestManyToManyLazyLoading.java index 3bdad0fc0..aac6b3cd4 100644 --- a/src/test/java/com/avaje/tests/query/other/TestManyToManyLazyLoading.java +++ b/src/test/java/com/avaje/tests/query/other/TestManyToManyLazyLoading.java @@ -1,31 +1,30 @@ package com.avaje.tests.query.other; -import java.util.List; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.MRole; import com.avaje.tests.model.basic.MUser; +import org.junit.Test; -public class TestManyToManyLazyLoading extends BaseTestCase { +import java.util.List; + +public class TestManyToManyLazyLoading extends BaseTestCase { @Test public void test() { - + createData(); - + List users = Ebean.find(MUser.class).findList(); - + for (MUser user : users) { List roles = user.getRoles(); roles.size(); } - + } - - private void createData() { + + private void createData() { MRole r0 = new MRole("r0"); MRole r1 = new MRole("r1"); @@ -38,5 +37,5 @@ public class TestManyToManyLazyLoading extends BaseTestCase { Ebean.save(u0); } - + } diff --git a/src/test/java/com/avaje/tests/query/other/TestObjectGraphNodeStatsCollection.java b/src/test/java/com/avaje/tests/query/other/TestObjectGraphNodeStatsCollection.java index 9decc1dff..5539a1a8c 100644 --- a/src/test/java/com/avaje/tests/query/other/TestObjectGraphNodeStatsCollection.java +++ b/src/test/java/com/avaje/tests/query/other/TestObjectGraphNodeStatsCollection.java @@ -1,10 +1,5 @@ package com.avaje.tests.query.other; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; @@ -16,20 +11,24 @@ 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 org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestObjectGraphNodeStatsCollection extends BaseTestCase { @Test public void test() { - + ResetBasicData.reset(); - + EbeanServer server = Ebean.getServer(null); - + MetaInfoManager infoManager = server.getMetaInfoManager(); - + server.find(Order.class).findCount(); - + infoManager.collectNodeStatistics(true); infoManager.collectQueryPlanStatistics(true); @@ -45,7 +44,7 @@ public class TestObjectGraphNodeStatsCollection extends BaseTestCase { for (MetaQueryPlanStatistic planStatistic : planStatistics) { planStatistic.getSql(); } - + } private void runFindCustomerQuery(EbeanServer server) { @@ -54,22 +53,22 @@ public class TestObjectGraphNodeStatsCollection extends BaseTestCase { .select("name") .fetch("contacts") .findList(); - + Assert.assertTrue(!customers.isEmpty()); - + List custs = server.find(Customer.class).select("name").findList(); for (Customer customer : custs) { customer.getShippingAddress(); } } - + private void runFindOrderQuery(EbeanServer server) { List orders = server.find(Order.class) .where().gt("id", 0) .order().asc("orderDate") .setMaxRows(40) .findList(); - + for (Order order : orders) { Customer customer = order.getCustomer(); Address billingAddress = customer.getBillingAddress(); @@ -85,19 +84,19 @@ public class TestObjectGraphNodeStatsCollection extends BaseTestCase { orderDetail.getUnitPrice(); orderDetail.getProduct().getName(); } - + } - + } - + @Test public void testFindByIds() { - + ResetBasicData.reset(); - + List ids = Ebean.find(Order.class).findIds(); Assert.assertTrue(!ids.isEmpty()); - + } - + } diff --git a/src/test/java/com/avaje/tests/query/other/TestOneToManyAsMap.java b/src/test/java/com/avaje/tests/query/other/TestOneToManyAsMap.java index 4fa20a0d5..5e4a17da8 100644 --- a/src/test/java/com/avaje/tests/query/other/TestOneToManyAsMap.java +++ b/src/test/java/com/avaje/tests/query/other/TestOneToManyAsMap.java @@ -1,15 +1,14 @@ package com.avaje.tests.query.other; -import java.util.Map; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.tests.model.map.MpRole; import com.avaje.tests.model.map.MpUser; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Map; public class TestOneToManyAsMap extends BaseTestCase { @@ -35,12 +34,12 @@ public class TestOneToManyAsMap extends BaseTestCase { Map listMap = u3.getRoles(); Assert.assertEquals(1, listMap.size()); - + MpRole mpRole = listMap.get("one"); Assert.assertNotNull(mpRole); Assert.assertEquals(Long.valueOf(47L), mpRole.getOrganizationId()); Assert.assertEquals("one", mpRole.getCode()); - + } } diff --git a/src/test/java/com/avaje/tests/query/other/TestQueryConversationRowCount.java b/src/test/java/com/avaje/tests/query/other/TestQueryConversationRowCount.java index e93fa3617..a686bef08 100644 --- a/src/test/java/com/avaje/tests/query/other/TestQueryConversationRowCount.java +++ b/src/test/java/com/avaje/tests/query/other/TestQueryConversationRowCount.java @@ -1,64 +1,63 @@ package com.avaje.tests.query.other; -import java.util.List; - -import org.avaje.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; import com.avaje.tests.model.converstation.Conversation; +import org.avaje.ebeantest.LoggedSqlCollector; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestQueryConversationRowCount extends BaseTestCase { @Test public void test() { - + //"find conversation where club = :clubId and ( ( isPublic = :false and participants.user.id = :userId ) or isPublic = :true ) order by createdAt desc "; //"find conversation where groupId = :groupId and ( ( open = :false and participants.user.id = :userId ) or open = :true ) order by whenCreated desc "; - + Long groupId = 1L; Long userId = 1L; - + Query query = Ebean.find(Conversation.class) .where().eq("group.id", groupId) .disjunction() - .conjunction() - .eq("open", false).eq("participants.user.id", userId) - .endJunction() - .eq("open", true) + .conjunction() + .eq("open", false).eq("participants.user.id", userId) + .endJunction() + .eq("open", true) .endJunction() .orderBy("whenCreated desc"); - + query.findList(); String generatedSql = sqlOf(query, 1); - - // select distinct t0.id c0, t0.title c1, t0.open c2, t0.version c3, t0.when_created c4, t0.when_updated c5, t0.group_id c6, t0.when_created - // from c_conversation t0 + + // select distinct t0.id c0, t0.title c1, t0.open c2, t0.version c3, t0.when_created c4, t0.when_updated c5, t0.group_id c6, t0.when_created + // from c_conversation t0 // left join c_participation u1 on u1.conversation_id = t0.id - // where t0.group_id = ? and ((t0.open = ? and u1.user_id = ? ) or t0.open = ? ) - // order by t0.when_created desc; + // where t0.group_id = ? and ((t0.open = ? and u1.user_id = ? ) or t0.open = ? ) + // order by t0.when_created desc; Assert.assertTrue(generatedSql.contains("select distinct t0.id, t0.title, t0.isopen")); Assert.assertTrue(generatedSql.contains("left join c_participation u1 on u1.conversation_id = t0.id")); Assert.assertTrue(generatedSql.contains("where t0.group_id = ? and ((t0.isopen = ? and u1.user_id = ? ) or t0.isopen = ? )")); - + LoggedSqlCollector.start(); query.findCount(); - // select count(*) from ( - // select distinct t0.id c0 - // from c_conversation t0 + // select count(*) from ( + // select distinct t0.id c0 + // from c_conversation t0 // left join c_participation u1 on u1.conversation_id = t0.id - // where t0.group_id = ? and ((t0.open = ? and u1.user_id = ? ) or t0.open = ? ) + // where t0.group_id = ? and ((t0.open = ? and u1.user_id = ? ) or t0.open = ? ) // ); --bind(1,true,1,true) - + List loggedSql = LoggedSqlCollector.stop(); Assert.assertEquals(1, loggedSql.size()); - + String countSql = trimSql(loggedSql.get(0), 0); Assert.assertTrue(countSql.contains("select count(*) from ( select distinct t0.id from c_conversation t0 left join c_participation u1 on u1.conversation_id = t0.id where t0.group_id = ? and ((t0.isopen = ? and u1.user_id = ? ) or t0.isopen = ? )")); } diff --git a/src/test/java/com/avaje/tests/query/other/TestQueryDistinct.java b/src/test/java/com/avaje/tests/query/other/TestQueryDistinct.java index 1e02c5a28..d9b9ceddc 100644 --- a/src/test/java/com/avaje/tests/query/other/TestQueryDistinct.java +++ b/src/test/java/com/avaje/tests/query/other/TestQueryDistinct.java @@ -20,24 +20,24 @@ public class TestQueryDistinct extends BaseTestCase { @Test public void test() { - + ResetBasicData.reset(); - + Query query = Ebean.find(Customer.class) .setDistinct(true) .select("name"); - + List customers = query.findList(); - + String generatedSql = sqlOf(query); assertThat(generatedSql).contains("select distinct t0.name from o_customer t0"); - + for (Customer customer : customers) { - - EntityBeanIntercept ebi = ((EntityBean)customer)._ebean_getIntercept(); + + EntityBeanIntercept ebi = ((EntityBean) customer)._ebean_getIntercept(); assertTrue(ebi.isDisableLazyLoad()); assertNull(ebi.getPersistenceContext()); - + // lazy loading disabled assertNull(customer.getId()); assertNull(customer.getAnniversary()); @@ -50,34 +50,34 @@ public class TestQueryDistinct extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Customer.class) - .where().setDistinct(true) - .select("name"); + .where().setDistinct(true) + .select("name"); query.findList(); String generatedSql = sqlOf(query); assertThat(generatedSql).contains("select distinct t0.name from o_customer t0"); } - + @Test public void testDistinctStatus() { - + ResetBasicData.reset(); - + Query query = Ebean.find(Customer.class) .setDistinct(true) .select("status") .where().isNotNull("status").query(); - + List customers = query.findList(); - + String generatedSql = sqlOf(query); assertThat(generatedSql).contains("select distinct t0.status from o_customer t0"); - + for (Customer customer : customers) { - + assertNotNull(customer.getStatus()); - + // lazy loading disabled assertNull(customer.getId()); assertNull(customer.getAnniversary()); @@ -101,5 +101,5 @@ public class TestQueryDistinct extends BaseTestCase { assertThat(generatedSql).contains("select distinct t0.name from o_customer t0 limit 10"); } } - + } diff --git a/src/test/java/com/avaje/tests/query/other/TestQueryRawExpressionMany.java b/src/test/java/com/avaje/tests/query/other/TestQueryRawExpressionMany.java index e55e5606e..4ac173387 100644 --- a/src/test/java/com/avaje/tests/query/other/TestQueryRawExpressionMany.java +++ b/src/test/java/com/avaje/tests/query/other/TestQueryRawExpressionMany.java @@ -22,8 +22,8 @@ public class TestQueryRawExpressionMany extends BaseTestCase { Integer quantity = 1; Query query = Ebean.find(Order.class) - .where().raw("details.orderQty = ?", quantity) - .query(); + .where().raw("details.orderQty = ?", quantity) + .query(); LoggedSqlCollector.start(); diff --git a/src/test/java/com/avaje/tests/query/other/TestQueryRowCountWithMany.java b/src/test/java/com/avaje/tests/query/other/TestQueryRowCountWithMany.java index 5885d196a..6546411ee 100644 --- a/src/test/java/com/avaje/tests/query/other/TestQueryRowCountWithMany.java +++ b/src/test/java/com/avaje/tests/query/other/TestQueryRowCountWithMany.java @@ -1,16 +1,15 @@ package com.avaje.tests.query.other; -import java.util.List; - -import org.avaje.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.avaje.ebeantest.LoggedSqlCollector; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestQueryRowCountWithMany extends BaseTestCase { @@ -24,21 +23,21 @@ public class TestQueryRowCountWithMany extends BaseTestCase { Long productId = 1L; Query query = Ebean.find(Order.class) - .fetch("details") - .where().eq("details.product.id", productId) - .orderBy("cretime asc"); + .fetch("details") + .where().eq("details.product.id", productId) + .orderBy("cretime asc"); List list = query.findList(); - // select distinct t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t2.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7, - // t1.id c8, t1.order_qty c9, t1.ship_qty c10, t1.unit_price c11, t1.cretime c12, t1.updtime c13, t1.order_id c14, t1.product_id c15, t0.cretime, t0.id, t1.id, t1.order_qty, t1.cretime - // from o_order t0 - // join o_customer t2 on t2.id = t0.kcustomer_id + // select distinct t0.id c0, t0.status c1, t0.order_date c2, t0.ship_date c3, t2.name c4, t0.cretime c5, t0.updtime c6, t0.kcustomer_id c7, + // t1.id c8, t1.order_qty c9, t1.ship_qty c10, t1.unit_price c11, t1.cretime c12, t1.updtime c13, t1.order_id c14, t1.product_id c15, t0.cretime, t0.id, t1.id, t1.order_qty, t1.cretime + // from o_order t0 + // join o_customer t2 on t2.id = t0.kcustomer_id // left join o_order_detail t1 on t1.order_id = t0.id - // join o_order_detail u1 on u1.order_id = t0.id - // where t1.id > 0 and u1.product_id = ? + // join o_order_detail u1 on u1.order_id = t0.id + // where t1.id > 0 and u1.product_id = ? // order by t0.cretime, t0.id, t1.id asc, t1.order_qty asc, t1.cretime desc; --bind(1) - + String generatedSql = sqlOf(query, 1); Assert.assertTrue(generatedSql.contains("select distinct t0.id, t0.status,")); // need the distinct Assert.assertTrue(generatedSql.contains("left join o_order_detail t1 on t1.order_id = t0.id")); //fetch join @@ -46,7 +45,7 @@ public class TestQueryRowCountWithMany extends BaseTestCase { Assert.assertTrue(generatedSql.contains(" u1.product_id = ?")); // u1 as predicate alias Assert.assertTrue(generatedSql.contains(" order by t0.cretime")); - + int rowCount = query.findCount(); // select count(*) from o_order t0 @@ -63,12 +62,11 @@ public class TestQueryRowCountWithMany extends BaseTestCase { Assert.assertEquals(list.size(), rowCount); Assert.assertEquals(2, sqlLogged.size()); Assert.assertTrue(trimSql(sqlLogged.get(1), 1).contains( - "select count(*) from ( select distinct t0.id from o_order t0 join o_order_detail u1 on u1.order_id = t0.id where u1.product_id = ? )")); + "select count(*) from ( select distinct t0.id from o_order t0 join o_order_detail u1 on u1.order_id = t0.id where u1.product_id = ? )")); } - @Test public void testWithFirstRowsMaxRows() { @@ -77,11 +75,11 @@ public class TestQueryRowCountWithMany extends BaseTestCase { Long productId = 1L; Query query = Ebean.find(Order.class) - .fetch("details") - .where().eq("details.product.id", productId) - .setFirstRow(2) - .setMaxRows(20) - .orderBy("cretime asc"); + .fetch("details") + .where().eq("details.product.id", productId) + .setFirstRow(2) + .setMaxRows(20) + .orderBy("cretime asc"); LoggedSqlCollector.start(); query.findCount(); diff --git a/src/test/java/com/avaje/tests/query/other/TestQuerySingleAttribute.java b/src/test/java/com/avaje/tests/query/other/TestQuerySingleAttribute.java index f6103f1d4..dff521e02 100644 --- a/src/test/java/com/avaje/tests/query/other/TestQuerySingleAttribute.java +++ b/src/test/java/com/avaje/tests/query/other/TestQuerySingleAttribute.java @@ -21,13 +21,13 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); List names = - Ebean.find(Customer.class) - .setDistinct(true) - .select("name") - .where().eq("status", Customer.Status.NEW) - .orderBy().asc("name") - .setMaxRows(100) - .findSingleAttributeList(); + Ebean.find(Customer.class) + .setDistinct(true) + .select("name") + .where().eq("status", Customer.Status.NEW) + .orderBy().asc("name") + .setMaxRows(100) + .findSingleAttributeList(); assertThat(names).isNotNull(); } @@ -38,12 +38,12 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); List dates = - Ebean.find(Customer.class) - .setDistinct(true) - .select("anniversary") - .where().isNotNull("anniversary") - .orderBy().asc("anniversary") - .findSingleAttributeList(); + Ebean.find(Customer.class) + .setDistinct(true) + .select("anniversary") + .where().isNotNull("anniversary") + .orderBy().asc("anniversary") + .findSingleAttributeList(); assertThat(dates).isNotNull(); } @@ -52,12 +52,12 @@ public class TestQuerySingleAttribute extends BaseTestCase { public void withOrderBy() { Query query = - Ebean.find(Customer.class) - .setDistinct(true) - .select("name") - .where().eq("status", Customer.Status.NEW) - .orderBy().asc("name") - .setMaxRows(100); + Ebean.find(Customer.class) + .setDistinct(true) + .select("name") + .where().eq("status", Customer.Status.NEW) + .orderBy().asc("name") + .setMaxRows(100); query.findSingleAttributeList(); assertThat(sqlOf(query)).contains("select distinct t0.name from o_customer t0 where t0.status = ? order by t0.name "); @@ -82,10 +82,10 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Customer.class) - .setDistinct(true) - .select("name") - .where().eq("status", Customer.Status.NEW) - .query(); + .setDistinct(true) + .select("name") + .where().eq("status", Customer.Status.NEW) + .query(); List names = query.findSingleAttributeList(); @@ -99,11 +99,11 @@ public class TestQuerySingleAttribute extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Customer.class) - .setDistinct(true) - .select("name") - .where().eq("status", Customer.Status.NEW) - .istartsWith("billingAddress.city", "auck") - .query(); + .setDistinct(true) + .select("name") + .where().eq("status", Customer.Status.NEW) + .istartsWith("billingAddress.city", "auck") + .query(); List names = query.findSingleAttributeList(); diff --git a/src/test/java/com/avaje/tests/query/other/TestSelfParent.java b/src/test/java/com/avaje/tests/query/other/TestSelfParent.java index 7e8e35306..633919629 100644 --- a/src/test/java/com/avaje/tests/query/other/TestSelfParent.java +++ b/src/test/java/com/avaje/tests/query/other/TestSelfParent.java @@ -1,13 +1,12 @@ package com.avaje.tests.query.other; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.selfref.SelfParent; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestSelfParent extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/query/other/TestSubQueryBinding.java b/src/test/java/com/avaje/tests/query/other/TestSubQueryBinding.java index 9537a4361..91106d2a5 100644 --- a/src/test/java/com/avaje/tests/query/other/TestSubQueryBinding.java +++ b/src/test/java/com/avaje/tests/query/other/TestSubQueryBinding.java @@ -1,13 +1,12 @@ package com.avaje.tests.query.other; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.ebean.Expression; import com.avaje.ebean.Query; import com.avaje.tests.model.basic.Customer; +import org.junit.Test; public class TestSubQueryBinding extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/query/other/TestWhereAnnotation.java b/src/test/java/com/avaje/tests/query/other/TestWhereAnnotation.java index 7d5410321..e9d9fa721 100644 --- a/src/test/java/com/avaje/tests/query/other/TestWhereAnnotation.java +++ b/src/test/java/com/avaje/tests/query/other/TestWhereAnnotation.java @@ -1,54 +1,53 @@ package com.avaje.tests.query.other; -import java.util.List; - -import org.avaje.ebeantest.LoggedSqlCollector; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.avaje.ebeantest.LoggedSqlCollector; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestWhereAnnotation extends BaseTestCase { @Test - public void fetchEager_inFirstQuery(){ - + public void fetchEager_inFirstQuery() { + ResetBasicData.reset(); - + LoggedSqlCollector.start(); - + Ebean.find(Customer.class) .fetch("orders") .findList(); - + List loggedSql = LoggedSqlCollector.stop(); - + Assert.assertEquals(1, loggedSql.size()); - + String sql = loggedSql.get(0); Assert.assertTrue(sql.contains("t1.order_date is not null")); } @Test - public void fetchLazy_inLazyLoadQuery(){ - + public void fetchLazy_inLazyLoadQuery() { + ResetBasicData.reset(); - + LoggedSqlCollector.start(); - + List customers = Ebean.find(Customer.class).findList(); - + List orders = customers.get(0).getOrders(); orders.size(); - + List loggedSql = LoggedSqlCollector.stop(); - + Assert.assertEquals(2, loggedSql.size()); - + String sql = loggedSql.get(1); Assert.assertTrue(sql.contains("t0.order_date is not null")); } diff --git a/src/test/java/com/avaje/tests/query/other/TestWhereLikeWithSlash.java b/src/test/java/com/avaje/tests/query/other/TestWhereLikeWithSlash.java index 285053af8..4090bf56d 100644 --- a/src/test/java/com/avaje/tests/query/other/TestWhereLikeWithSlash.java +++ b/src/test/java/com/avaje/tests/query/other/TestWhereLikeWithSlash.java @@ -6,16 +6,14 @@ import com.avaje.ebean.Query; import com.avaje.tests.model.basic.EBasic; import org.junit.Test; -import java.util.List; - -public class TestWhereLikeWithSlash extends BaseTestCase { +public class TestWhereLikeWithSlash extends BaseTestCase { @Test public void test() { - + EBasic basic = new EBasic(); basic.setName("slash\\monkey"); - + Ebean.save(basic); Query query = Ebean.find(EBasic.class).where().like("name", "slash\\mon%").query(); @@ -25,5 +23,5 @@ public class TestWhereLikeWithSlash extends BaseTestCase { // Still good on Postgres which was the original issue //Assert.assertEquals(1, list.size()); } - + } diff --git a/src/test/java/com/avaje/tests/query/softdelete/TestSoftDeletePagingList.java b/src/test/java/com/avaje/tests/query/softdelete/TestSoftDeletePagingList.java index a0ba745c8..2428bf0dd 100644 --- a/src/test/java/com/avaje/tests/query/softdelete/TestSoftDeletePagingList.java +++ b/src/test/java/com/avaje/tests/query/softdelete/TestSoftDeletePagingList.java @@ -28,9 +28,9 @@ public class TestSoftDeletePagingList extends BaseTestCase { LoggedSqlCollector.start(); PagedList pagedList = Ebean.find(Cover.class) - .where().startsWith("s3Url", "SoftDelPaged-") - .setMaxRows(10) - .findPagedList(); + .where().startsWith("s3Url", "SoftDelPaged-") + .setMaxRows(10) + .findPagedList(); int totalRowCount = pagedList.getTotalCount(); List resultList = pagedList.getList(); diff --git a/src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java b/src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java index 83c0db136..09d234d62 100644 --- a/src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java +++ b/src/test/java/com/avaje/tests/query/sqlquery/SqlQueryTests.java @@ -2,8 +2,6 @@ package com.avaje.tests.query.sqlquery; import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; -import com.avaje.ebean.QueryEachConsumer; -import com.avaje.ebean.QueryEachWhileConsumer; import com.avaje.ebean.SqlQuery; import com.avaje.ebean.SqlRow; import com.avaje.tests.model.basic.Order; diff --git a/src/test/java/com/avaje/tests/query/sqlquery/TestNativeILikeExpression.java b/src/test/java/com/avaje/tests/query/sqlquery/TestNativeILikeExpression.java index ff07ddf86..e9a35e621 100644 --- a/src/test/java/com/avaje/tests/query/sqlquery/TestNativeILikeExpression.java +++ b/src/test/java/com/avaje/tests/query/sqlquery/TestNativeILikeExpression.java @@ -22,8 +22,8 @@ public class TestNativeILikeExpression extends BaseTestCase { ResetBasicData.reset(); Query query = Ebean.find(Customer.class) - .where().ilike("name", "rob") - .query(); + .where().ilike("name", "rob") + .query(); List list = query.findList(); diff --git a/src/test/java/com/avaje/tests/rawsql/TestInsertSqlLogging.java b/src/test/java/com/avaje/tests/rawsql/TestInsertSqlLogging.java index c5cf75e31..d2f4b39ad 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestInsertSqlLogging.java +++ b/src/test/java/com/avaje/tests/rawsql/TestInsertSqlLogging.java @@ -1,11 +1,10 @@ package com.avaje.tests.rawsql; -import com.avaje.tests.idkeys.db.AuditLog; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.SqlUpdate; +import com.avaje.tests.idkeys.db.AuditLog; +import org.junit.Test; public class TestInsertSqlLogging extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/rawsql/TestOrderReportTotal.java b/src/test/java/com/avaje/tests/rawsql/TestOrderReportTotal.java index d114541df..04bf37a23 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestOrderReportTotal.java +++ b/src/test/java/com/avaje/tests/rawsql/TestOrderReportTotal.java @@ -40,9 +40,9 @@ public class TestOrderReportTotal extends BaseTestCase { private RawSql getRawSql() { String sql = - "select order_id, count(*) as totalItems, sum(order_qty*unit_price) as totalAmount \n" + - "from o_order_detail \n" + - "group by order_id"; + "select order_id, count(*) as totalItems, sum(order_qty*unit_price) as totalAmount \n" + + "from o_order_detail \n" + + "group by order_id"; return RawSqlBuilder.parse(sql).columnMapping("order_id", "order.id").create(); } @@ -53,10 +53,10 @@ public class TestOrderReportTotal extends BaseTestCase { ResetBasicData.reset(); int detailsCount = Ebean.find(OrderDetail.class) - .where() - .gt("order.id", 2) - .istartsWith("order.customer.name","rob") - .findCount(); + .where() + .gt("order.id", 2) + .istartsWith("order.customer.name", "rob") + .findCount(); assertThat(detailsCount).isGreaterThan(0); } diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlAsKeyword.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlAsKeyword.java index 0222d82d2..652283f59 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlAsKeyword.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlAsKeyword.java @@ -1,10 +1,5 @@ package com.avaje.tests.rawsql; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; @@ -12,71 +7,75 @@ import com.avaje.ebean.RawSql; import com.avaje.ebean.RawSqlBuilder; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestRawSqlAsKeyword extends BaseTestCase { - + @Test public void test() { // Make this false to run this test ... as the pipe string concatenation syntax is DB specific boolean skipTestAsDBSpecficSQL = true; - + if (skipTestAsDBSpecficSQL) { - + return; } - - ResetBasicData.reset(); - - - // try valid query where spaces in the formula ... - RawSql rawSql = - RawSqlBuilder - .parse("select r.id, r.name || 'hello' as name from o_customer r ") - .create(); - - Query query = Ebean.find(Customer.class); - query.setRawSql(rawSql); - query.where().ilike("name", "r%"); - - List list = query.findList(); - Assert.assertNotNull(list); - - - // try valid query with no spaces - rawSql = - RawSqlBuilder - .parse("select r.id, r.name||'hello' as name from o_customer r ") - .create(); - - query = Ebean.find(Customer.class); - query.setRawSql(rawSql); - query.where().ilike("name", "r%"); - - list = query.findList(); - Assert.assertNotNull(list); - - rawSql = - RawSqlBuilder - .parse("select r.id, r.name||'hello' name from o_customer r ") - .create(); - query = Ebean.find(Customer.class); - query.setRawSql(rawSql); - query.where().ilike("name", "r%"); - - list = query.findList(); - Assert.assertNotNull(list); - - // this will barf - expecting the AS keyword now - rawSql = - RawSqlBuilder - .parse("select r.id, r.name || 'hello' name from o_customer r ") - .create(); - query = Ebean.find(Customer.class); - query.setRawSql(rawSql); - query.where().ilike("name", "r%"); - - list = query.findList(); - Assert.assertNotNull(list); + + ResetBasicData.reset(); + + + // try valid query where spaces in the formula ... + RawSql rawSql = + RawSqlBuilder + .parse("select r.id, r.name || 'hello' as name from o_customer r ") + .create(); + + Query query = Ebean.find(Customer.class); + query.setRawSql(rawSql); + query.where().ilike("name", "r%"); + + List list = query.findList(); + Assert.assertNotNull(list); + + + // try valid query with no spaces + rawSql = + RawSqlBuilder + .parse("select r.id, r.name||'hello' as name from o_customer r ") + .create(); + + query = Ebean.find(Customer.class); + query.setRawSql(rawSql); + query.where().ilike("name", "r%"); + + list = query.findList(); + Assert.assertNotNull(list); + + rawSql = + RawSqlBuilder + .parse("select r.id, r.name||'hello' name from o_customer r ") + .create(); + query = Ebean.find(Customer.class); + query.setRawSql(rawSql); + query.where().ilike("name", "r%"); + + list = query.findList(); + Assert.assertNotNull(list); + + // this will barf - expecting the AS keyword now + rawSql = + RawSqlBuilder + .parse("select r.id, r.name || 'hello' name from o_customer r ") + .create(); + query = Ebean.find(Customer.class); + query.setRawSql(rawSql); + query.where().ilike("name", "r%"); + + list = query.findList(); + Assert.assertNotNull(list); } } diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlCustomerAggregate.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlCustomerAggregate.java index 9aa2ea8cd..98074dfa9 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlCustomerAggregate.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlCustomerAggregate.java @@ -1,10 +1,5 @@ package com.avaje.tests.rawsql; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; @@ -12,6 +7,10 @@ import com.avaje.ebean.RawSql; import com.avaje.ebean.RawSqlBuilder; import com.avaje.tests.model.basic.CustomerAggregate; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestRawSqlCustomerAggregate extends BaseTestCase { @@ -21,9 +20,9 @@ public class TestRawSqlCustomerAggregate extends BaseTestCase { ResetBasicData.reset(); RawSql rawSql = RawSqlBuilder - .parse( - "select c.customer_id, count(*) as totalContacts from contact c group by c.customer_id") - .columnMapping("c.customer_id", "customer.id").create(); + .parse( + "select c.customer_id, count(*) as totalContacts from contact c group by c.customer_id") + .columnMapping("c.customer_id", "customer.id").create(); Query query = Ebean.find(CustomerAggregate.class); query.setRawSql(rawSql); diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlMasterDetail.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlMasterDetail.java index 1a1e7639f..561f91294 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlMasterDetail.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlMasterDetail.java @@ -15,9 +15,7 @@ import java.util.List; import java.util.Random; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.*; public class TestRawSqlMasterDetail extends BaseTestCase { @@ -26,30 +24,30 @@ public class TestRawSqlMasterDetail extends BaseTestCase { ResetBasicData.reset(); - String rs = "select t0.id, t0.status, t1.id, t1.name, "+ - " t2.id, t2.order_qty, t3.id, t3.name " + - "from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id " + - "join o_order_detail t2 on t2.order_id = t0.id " + - "join o_product t3 on t3.id = t2.product_id " + - "where t0.id <= :maxOrderId and t3.id = :productId "+ - "order by t0.id, t2.id asc"; + String rs = "select t0.id, t0.status, t1.id, t1.name, " + + " t2.id, t2.order_qty, t3.id, t3.name " + + "from o_order t0 join o_customer t1 on t1.id = t0.kcustomer_id " + + "join o_order_detail t2 on t2.order_id = t0.id " + + "join o_product t3 on t3.id = t2.product_id " + + "where t0.id <= :maxOrderId and t3.id = :productId " + + "order by t0.id, t2.id asc"; RawSql rawSql = RawSqlBuilder.parse(rs) - .columnMapping("t0.id", "id") - .columnMapping("t0.status", "status") - .columnMapping("t1.id", "customer.id") - .columnMapping("t1.name", "customer.name") - .columnMapping("t2.id", "details.id") - .columnMapping("t2.order_qty", "details.orderQty") - .columnMapping("t3.id", "details.product.id") - .columnMapping("t3.name", "details.product.name") - .create(); + .columnMapping("t0.id", "id") + .columnMapping("t0.status", "status") + .columnMapping("t1.id", "customer.id") + .columnMapping("t1.name", "customer.name") + .columnMapping("t2.id", "details.id") + .columnMapping("t2.order_qty", "details.orderQty") + .columnMapping("t3.id", "details.product.id") + .columnMapping("t3.name", "details.product.name") + .create(); List ordersFromRaw = Ebean.find(Order.class) - .setRawSql(rawSql) - .setParameter("maxOrderId", 2) - .setParameter("productId", 1) - .findList(); + .setRawSql(rawSql) + .setParameter("maxOrderId", 2) + .setParameter("productId", 1) + .findList(); printOrders(ordersFromRaw, "using RawSql"); @@ -63,15 +61,15 @@ public class TestRawSqlMasterDetail extends BaseTestCase { // billing_address_id fk column is automatically // mapped to the logical path: billingAddress.id - String rs = "select c.id, c.name, c.billing_address_id, c.updtime "+ - "from o_customer c " + - "order by c.id"; + String rs = "select c.id, c.name, c.billing_address_id, c.updtime " + + "from o_customer c " + + "order by c.id"; RawSql rawSql = RawSqlBuilder.parse(rs).create(); List customers = Ebean.find(Customer.class) - .setRawSql(rawSql) - .findList(); + .setRawSql(rawSql) + .findList(); assertThat(customers).isNotEmpty(); } @@ -82,18 +80,18 @@ public class TestRawSqlMasterDetail extends BaseTestCase { ResetBasicData.reset(); - String rs = "select c.id, c.name, c.billing_address_id, ba.line_1, ba.city, c.updtime "+ - "from o_customer c " + - " left join o_address ba on ba.id = c.billing_address_id "+ - "order by c.id"; + String rs = "select c.id, c.name, c.billing_address_id, ba.line_1, ba.city, c.updtime " + + "from o_customer c " + + " left join o_address ba on ba.id = c.billing_address_id " + + "order by c.id"; RawSql rawSql = RawSqlBuilder.parse(rs) - .tableAliasMapping("ba", "billingAddress") - .create(); + .tableAliasMapping("ba", "billingAddress") + .create(); List customers = Ebean.find(Customer.class) - .setRawSql(rawSql) - .findList(); + .setRawSql(rawSql) + .findList(); assertThat(customers).isNotEmpty(); } @@ -103,20 +101,20 @@ public class TestRawSqlMasterDetail extends BaseTestCase { ResetBasicData.reset(); - String rs = "select c.id, c.name, c.billing_address_id, ba.line_1, ba.city, c.updtime, sa.id, sa.line_1, sa.city "+ - "from o_customer c " + - " left join o_address ba on ba.id = c.billing_address_id "+ - " left join o_address sa on sa.id = c.shipping_address_id "+ - "order by c.id"; + String rs = "select c.id, c.name, c.billing_address_id, ba.line_1, ba.city, c.updtime, sa.id, sa.line_1, sa.city " + + "from o_customer c " + + " left join o_address ba on ba.id = c.billing_address_id " + + " left join o_address sa on sa.id = c.shipping_address_id " + + "order by c.id"; RawSql rawSql = RawSqlBuilder.parse(rs) - .tableAliasMapping("ba", "billingAddress") - .tableAliasMapping("sa", "shippingAddress") - .create(); + .tableAliasMapping("ba", "billingAddress") + .tableAliasMapping("sa", "shippingAddress") + .create(); List customers = Ebean.find(Customer.class) - .setRawSql(rawSql) - .findList(); + .setRawSql(rawSql) + .findList(); assertThat(customers).isNotEmpty(); } @@ -126,26 +124,26 @@ public class TestRawSqlMasterDetail extends BaseTestCase { ResetBasicData.reset(); - String rs = "select o.id, o.status, c.id, c.name, "+ - " d.id, d.order_qty, p.id, p.name " + - "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 " + - "join o_product p on p.id = d.product_id " + - "where o.id <= :maxOrderId and p.id = :productId "+ - "order by o.id, d.id asc"; + String rs = "select o.id, o.status, c.id, c.name, " + + " d.id, d.order_qty, p.id, p.name " + + "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 " + + "join o_product p on p.id = d.product_id " + + "where o.id <= :maxOrderId and p.id = :productId " + + "order by o.id, d.id asc"; RawSql rawSql = RawSqlBuilder.parse(rs) - .tableAliasMapping("c", "customer") - .tableAliasMapping("d", "details") - .tableAliasMapping("p", "details.product") - .create(); + .tableAliasMapping("c", "customer") + .tableAliasMapping("d", "details") + .tableAliasMapping("p", "details.product") + .create(); List ordersFromRaw = Ebean.find(Order.class) - .setRawSql(rawSql) - .setParameter("maxOrderId", 2) - .setParameter("productId", 1) - .findList(); + .setRawSql(rawSql) + .setParameter("maxOrderId", 2) + .setParameter("productId", 1) + .findList(); printOrders(ordersFromRaw, "using RawSql with tableAlias mapping"); @@ -154,7 +152,7 @@ public class TestRawSqlMasterDetail extends BaseTestCase { @Test public void testWithNoIdPropertyWithInsert() { - String name = "RawSql-NoIdTest"+new Random().nextInt(); + String name = "RawSql-NoIdTest" + new Random().nextInt(); EBasic basic = new EBasic(); basic.setName(name); basic.setStatus(EBasic.Status.ACTIVE); @@ -166,9 +164,9 @@ public class TestRawSqlMasterDetail extends BaseTestCase { RawSql rawSql = RawSqlBuilder.parse(rs).create(); List list = Ebean.find(EBasic.class) - .setRawSql(rawSql) - .where().eq("name", name) - .findList(); + .setRawSql(rawSql) + .where().eq("name", name) + .findList(); assertEquals(1, list.size()); EBasic basic1 = list.get(0); @@ -185,11 +183,11 @@ public class TestRawSqlMasterDetail extends BaseTestCase { String rs = "select o.status, o.order_date from o_order o "; RawSql rawSql = RawSqlBuilder.parse(rs) - .create(); + .create(); List ordersFromRaw = Ebean.find(Order.class) - .setRawSql(rawSql) - .findList(); + .setRawSql(rawSql) + .findList(); assertNotNull(ordersFromRaw); assertFalse(ordersFromRaw.isEmpty()); @@ -201,14 +199,14 @@ public class TestRawSqlMasterDetail extends BaseTestCase { ResetBasicData.reset(); String rs = "select o.id, o.status " + - "from o_order o order by o.id asc"; + "from o_order o order by o.id asc"; RawSql rawSql = RawSqlBuilder.parse(rs) - .create(); + .create(); List ordersFromRaw = Ebean.find(Order.class) - .setRawSql(rawSql) - .findList(); + .setRawSql(rawSql) + .findList(); for (Order order : ordersFromRaw) { assertThat(order.getId()).isNotNull(); @@ -223,15 +221,15 @@ public class TestRawSqlMasterDetail extends BaseTestCase { ResetBasicData.reset(); String rs = "select o.id, o.status " + - "from o_order o order by o.id asc"; + "from o_order o order by o.id asc"; RawSql rawSql = RawSqlBuilder.parse(rs) - .tableAliasMapping("o", null) - .create(); + .tableAliasMapping("o", null) + .create(); List ordersFromRaw = Ebean.find(Order.class) - .setRawSql(rawSql) - .findList(); + .setRawSql(rawSql) + .findList(); for (Order order : ordersFromRaw) { assertThat(order.getId()).isNotNull(); @@ -244,23 +242,23 @@ public class TestRawSqlMasterDetail extends BaseTestCase { ResetBasicData.reset(); - String rs = "select o.id, o.status, c.id, c.name, "+ - " d.id, d.order_qty, p.id, p.name " + - "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 " + - "join o_product p on p.id = d.product_id " + - "order by o.id, d.id asc"; + String rs = "select o.id, o.status, c.id, c.name, " + + " d.id, d.order_qty, p.id, p.name " + + "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 " + + "join o_product p on p.id = d.product_id " + + "order by o.id, d.id asc"; RawSql rawSql = RawSqlBuilder.parse(rs) - .tableAliasMapping("c", "customer") - .tableAliasMapping("d", "details") - .tableAliasMapping("p", "details.product") - .create(); + .tableAliasMapping("c", "customer") + .tableAliasMapping("d", "details") + .tableAliasMapping("p", "details.product") + .create(); List ordersFromRaw = Ebean.find(Order.class) - .setRawSql(rawSql) - .findList(); + .setRawSql(rawSql) + .findList(); printOrders(ordersFromRaw, "using RawSql with tableAlias mapping"); diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlNamedParams.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlNamedParams.java index 423301bc1..d0add8794 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlNamedParams.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlNamedParams.java @@ -1,10 +1,5 @@ package com.avaje.tests.rawsql; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; @@ -12,6 +7,10 @@ import com.avaje.ebean.RawSql; import com.avaje.ebean.RawSqlBuilder; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestRawSqlNamedParams extends BaseTestCase { @@ -21,8 +20,8 @@ public class TestRawSqlNamedParams extends BaseTestCase { ResetBasicData.reset(); RawSql rawSql = RawSqlBuilder - .parse("select r.id, r.name from o_customer r where r.id > :id and r.name like :name") - .columnMapping("r.id", "id").columnMapping("r.name", "name").create(); + .parse("select r.id, r.name from o_customer r where r.id > :id and r.name like :name") + .columnMapping("r.id", "id").columnMapping("r.name", "name").create(); Query query = Ebean.find(Customer.class); query.setRawSql(rawSql); diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQuery.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQuery.java index 2edb3f395..158d76c74 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQuery.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQuery.java @@ -1,12 +1,5 @@ package com.avaje.tests.rawsql; -import java.util.List; -import java.util.concurrent.ExecutionException; - -import com.avaje.tests.model.basic.Order; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.FetchConfig; @@ -16,7 +9,13 @@ 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.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; +import java.util.concurrent.ExecutionException; import static org.assertj.core.api.Assertions.assertThat; @@ -47,8 +46,8 @@ public class TestRawSqlOrmQuery extends BaseTestCase { ResetBasicData.reset(); RawSql rawSql = RawSqlBuilder.parse("select r.id, r.name from o_customer r ") - .columnMapping("r.id", "id") - .columnMapping("r.name", "name").create(); + .columnMapping("r.id", "id") + .columnMapping("r.name", "name").create(); Query query = Ebean.find(Customer.class); query.setRawSql(rawSql); @@ -60,21 +59,21 @@ public class TestRawSqlOrmQuery extends BaseTestCase { List list = query.findList(); Assert.assertNotNull(list); } - + @Test public void testFirstRowsMaxRows() throws InterruptedException, ExecutionException { if (isMsSqlServer()) return; ResetBasicData.reset(); - - RawSql rawSql = - RawSqlBuilder - .parse("select r.id, r.name from o_customer r ") - .columnMapping("r.id", "id") - .columnMapping("r.name", "name") - .create(); - + + RawSql rawSql = + RawSqlBuilder + .parse("select r.id, r.name from o_customer r ") + .columnMapping("r.id", "id") + .columnMapping("r.name", "name") + .create(); + Query query = Ebean.find(Customer.class); query.setRawSql(rawSql); @@ -83,40 +82,40 @@ public class TestRawSqlOrmQuery extends BaseTestCase { query.setFirstRow(1); query.setMaxRows(2); List list = query.findList(); - + int rowCount = query.findCount(); FutureRowCount futureRowCount = query.findFutureCount(); Assert.assertEquals(initialRowCount, rowCount); Assert.assertEquals(initialRowCount, futureRowCount.get().intValue()); - + // check that lazy loading still executes for (Customer customer : list) { customer.getCretime(); } - + } - + @Test public void testPaging() { ResetBasicData.reset(); RawSql rawSql = RawSqlBuilder.parse("select r.id, r.name from o_customer r ") - .columnMapping("r.id", "id") - .columnMapping("r.name", "name") - .create(); + .columnMapping("r.id", "id") + .columnMapping("r.name", "name") + .create(); Query query = Ebean.find(Customer.class); query.setRawSql(rawSql); - + int initialRowCount = query.findCount(); - + PagedList page = query.setMaxRows(2).findPagedList(); List list = page.getList(); int rowCount = page.getTotalCount(); - + Assert.assertEquals(2, list.size()); Assert.assertEquals(initialRowCount, rowCount); @@ -133,10 +132,10 @@ public class TestRawSqlOrmQuery extends BaseTestCase { ResetBasicData.reset(); RawSql rawSql = RawSqlBuilder.parse("select o.id, o.order_date, o.ship_date from o_order o order by o.ship_date desc") - .columnMapping("o.id", "id") - .columnMapping("o.order_date", "orderDate") - .columnMapping("o.ship_date", "shipDate") - .create(); + .columnMapping("o.id", "id") + .columnMapping("o.order_date", "orderDate") + .columnMapping("o.ship_date", "shipDate") + .create(); Query query = Ebean.find(Order.class); query.setRawSql(rawSql); @@ -153,10 +152,10 @@ public class TestRawSqlOrmQuery extends BaseTestCase { ResetBasicData.reset(); RawSql rawSql = RawSqlBuilder.parse("select o.id, o.order_date, o.ship_date from o_order o order by o.ship_date desc nulls last") - .columnMapping("o.id", "id") - .columnMapping("o.order_date", "orderDate") - .columnMapping("o.ship_date", "shipDate") - .create(); + .columnMapping("o.id", "id") + .columnMapping("o.order_date", "orderDate") + .columnMapping("o.ship_date", "shipDate") + .create(); Query query = Ebean.find(Order.class); query.setRawSql(rawSql); @@ -174,10 +173,10 @@ public class TestRawSqlOrmQuery extends BaseTestCase { ResetBasicData.reset(); RawSql rawSql = RawSqlBuilder.parse("select o.id, o.order_date, o.ship_date from o_order o order by o.ship_date desc") - .columnMapping("o.id", "id") - .columnMapping("o.order_date", "orderDate") - .columnMapping("o.ship_date", "shipDate") - .create(); + .columnMapping("o.id", "id") + .columnMapping("o.order_date", "orderDate") + .columnMapping("o.ship_date", "shipDate") + .create(); Query query = Ebean.find(Order.class); query.setRawSql(rawSql); diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQueryDistinct.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQueryDistinct.java index 33d1fc300..6c580f529 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQueryDistinct.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQueryDistinct.java @@ -1,10 +1,5 @@ package com.avaje.tests.rawsql; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.FetchConfig; @@ -13,6 +8,10 @@ import com.avaje.ebean.RawSql; import com.avaje.ebean.RawSqlBuilder; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestRawSqlOrmQueryDistinct extends BaseTestCase { @@ -22,14 +21,14 @@ public class TestRawSqlOrmQueryDistinct extends BaseTestCase { ResetBasicData.reset(); RawSql rawSql0 = RawSqlBuilder.parse(" select distinct r.id, r.name from o_customer r ") - .create(); + .create(); Query query0 = Ebean.find(Customer.class); query0.setRawSql(rawSql0); query0.where().ilike("name", "r%"); RawSql rawSql = RawSqlBuilder.parse(" select distinct r.id, r.name from o_customer r ") - .columnMapping("r.id", "id").columnMapping("r.name", "name").create(); + .columnMapping("r.id", "id").columnMapping("r.name", "name").create(); Query query = Ebean.find(Customer.class); query.setRawSql(rawSql); diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper.java index bb7b7e7bf..21da0059f 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper.java @@ -1,10 +1,5 @@ package com.avaje.tests.rawsql; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Query; @@ -12,9 +7,12 @@ 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; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestRawSqlOrmWrapper extends BaseTestCase { @@ -24,21 +22,21 @@ public class TestRawSqlOrmWrapper extends BaseTestCase { 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 "; + + " 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(); + .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 query = Ebean.find(OrderAggregate.class); query.setRawSql(rawSql) - // .fetch("order.details", new FetchConfig().query()) - .where().gt("order.id", 0).having().gt("totalAmount", 20); + // .fetch("order.details", new FetchConfig().query()) + .where().gt("order.id", 0).having().gt("totalAmount", 20); List list = query.findList(); Assert.assertNotNull(list); @@ -46,8 +44,8 @@ public class TestRawSqlOrmWrapper extends BaseTestCase { output(list); List list2 = Ebean.find(OrderAggregate.class).setRawSql(rawSql) - // .fetch("order.details", new FetchConfig().query()) - .where().gt("order.id", 2).having().gt("totalAmount", 10).findList(); + // .fetch("order.details", new FetchConfig().query()) + .where().gt("order.id", 2).having().gt("totalAmount", 10).findList(); output(list2); diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper2.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper2.java index 183a0dba1..845421677 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper2.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper2.java @@ -1,10 +1,5 @@ package com.avaje.tests.rawsql; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.FetchConfig; @@ -14,6 +9,10 @@ import com.avaje.ebean.RawSqlBuilder; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.OrderAggregate; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestRawSqlOrmWrapper2 extends BaseTestCase { @@ -23,18 +22,18 @@ public class TestRawSqlOrmWrapper2 extends BaseTestCase { ResetBasicData.reset(); String sql = " select order_id, 'ignoreMe', sum(d.order_qty*d.unit_price) as totalAmount " - + " from o_order_detail d group by order_id "; + + " from o_order_detail d group by order_id "; RawSql rawSql = RawSqlBuilder.parse(sql).columnMapping("order_id", "order.id") - .columnMappingIgnore("'ignoreMe'") - // don't need this when using column alias - // .columnMapping("sum(d.order_qty*d.unit_price)", "totalAmount") - .create(); + .columnMappingIgnore("'ignoreMe'") + // don't need this when using column alias + // .columnMapping("sum(d.order_qty*d.unit_price)", "totalAmount") + .create(); Query query = Ebean.find(OrderAggregate.class); query.setRawSql(rawSql).fetch("order", "status,orderDate", new FetchConfig().query()) - .fetch("order.customer", "name").where().gt("order.id", 0).having().gt("totalAmount", 20) - .order().desc("totalAmount").setMaxRows(10); + .fetch("order.customer", "name").where().gt("order.id", 0).having().gt("totalAmount", 20) + .order().desc("totalAmount").setMaxRows(10); List list = query.findList(); Assert.assertNotNull(list); diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper3.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper3.java index f69e8aacb..89b42312d 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper3.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper3.java @@ -1,9 +1,5 @@ package com.avaje.tests.rawsql; -import java.util.List; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.FetchConfig; @@ -11,9 +7,11 @@ 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; +import org.junit.Test; + +import java.util.List; public class TestRawSqlOrmWrapper3 extends BaseTestCase { @@ -23,24 +21,24 @@ public class TestRawSqlOrmWrapper3 extends BaseTestCase { 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 "; + + " 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(); + .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 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(); + .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); diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlPositionedParams.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlPositionedParams.java index 6ec2b6c75..aa4269f62 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlPositionedParams.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlPositionedParams.java @@ -21,8 +21,8 @@ public class TestRawSqlPositionedParams extends BaseTestCase { ResetBasicData.reset(); RawSql rawSql = RawSqlBuilder - .parse("select r.id, r.name from o_customer r where r.id >= ? and r.name like ?") - .create(); + .parse("select r.id, r.name from o_customer r where r.id >= ? and r.name like ?") + .create(); Query query = Ebean.find(Customer.class); query.setRawSql(rawSql); @@ -41,9 +41,9 @@ public class TestRawSqlPositionedParams extends BaseTestCase { ResetBasicData.reset(); RawSql rawSql = RawSqlBuilder - .unparsed("select r.id, r.name from o_customer r where r.id >= ? and r.name like ?") - .columnMapping("r.id", "id") - .columnMapping("r.name", "name").create(); + .unparsed("select r.id, r.name from o_customer r where r.id >= ? and r.name like ?") + .columnMapping("r.id", "id") + .columnMapping("r.name", "name").create(); Query query = Ebean.find(Customer.class); query.setRawSql(rawSql); diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlUnparsedQuery.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlUnparsedQuery.java index c2843b320..c16a74401 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlUnparsedQuery.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlUnparsedQuery.java @@ -1,6 +1,10 @@ package com.avaje.tests.rawsql; -import com.avaje.ebean.*; +import com.avaje.ebean.BaseTestCase; +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.ResetBasicData; import org.junit.Assert; @@ -10,28 +14,28 @@ import java.util.List; public class TestRawSqlUnparsedQuery extends BaseTestCase { - @Test - public void testDoubleUnparsedQuery() { + @Test + public void testDoubleUnparsedQuery() { - // Checks for RawSql caching issue https://github.com/ebean-orm/avaje-ebeanorm/issues/259 - ResetBasicData.reset(); + // Checks for RawSql caching issue https://github.com/ebean-orm/avaje-ebeanorm/issues/259 + ResetBasicData.reset(); - test(); - test(); - } + test(); + test(); + } - private static void test() { - RawSql rawSql = RawSqlBuilder - .unparsed("select r.id, r.name from o_customer r where r.id >= :a and r.name like :b") - .columnMapping("r.id", "id").columnMapping("r.name", "name").create(); + private static void test() { + RawSql rawSql = RawSqlBuilder + .unparsed("select r.id, r.name from o_customer r where r.id >= :a and r.name like :b") + .columnMapping("r.id", "id").columnMapping("r.name", "name").create(); - Query query = Ebean.find(Customer.class); - query.setRawSql(rawSql); - query.setParameter("a", 1); - query.setParameter("b", "R%"); + Query query = Ebean.find(Customer.class); + query.setRawSql(rawSql); + query.setParameter("a", 1); + query.setParameter("b", "R%"); - List list = query.findList(); - Assert.assertNotNull(list); - } + List list = query.findList(); + Assert.assertNotNull(list); + } } diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlWithResultSet.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlWithResultSet.java index 32bef08ef..122501d8d 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlWithResultSet.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlWithResultSet.java @@ -1,13 +1,5 @@ package com.avaje.tests.rawsql; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.List; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.FetchConfig; @@ -15,30 +7,37 @@ import com.avaje.ebean.RawSql; import com.avaje.ebean.Transaction; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Test; + +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.List; public class TestRawSqlWithResultSet extends BaseTestCase { @Test public void test() throws SQLException { - + ResetBasicData.reset(); - + // Transaction supplies our jdbc Connection Transaction txn = Ebean.beginTransaction(); - + PreparedStatement pstmt = null; - + try { pstmt = txn.getConnection().prepareStatement("select id, name, billing_address_id from o_customer"); - + // ResultSet will be closed by Ebean ResultSet resultSet = pstmt.executeQuery(); - + RawSql rawSql = new RawSql(resultSet, "id", "name", "billingAddress.id"); - + List list = Ebean.find(Customer.class) .setRawSql(rawSql) - // also test a secondary query join + // also test a secondary query join .fetch("billingAddress", new FetchConfig().query()) .findList(); @@ -47,14 +46,14 @@ public class TestRawSqlWithResultSet extends BaseTestCase { customer.getName(); customer.getBillingAddress(); } - + } finally { close(pstmt); txn.end(); } - + } - + private static void close(Statement stmt) { if (stmt != null) { @@ -65,5 +64,5 @@ public class TestRawSqlWithResultSet extends BaseTestCase { } } } - + } diff --git a/src/test/java/com/avaje/tests/rawsql/inherit/ParentRawSqlTest.java b/src/test/java/com/avaje/tests/rawsql/inherit/ParentRawSqlTest.java index 6a867ac26..d7747f24d 100644 --- a/src/test/java/com/avaje/tests/rawsql/inherit/ParentRawSqlTest.java +++ b/src/test/java/com/avaje/tests/rawsql/inherit/ParentRawSqlTest.java @@ -16,9 +16,7 @@ import org.junit.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class ParentRawSqlTest extends BaseTestCase { @@ -43,12 +41,12 @@ public class ParentRawSqlTest extends BaseTestCase { Ebean.save(c); RawSql rawSql = RawSqlBuilder - .parse("select type, id, val from rawinherit_parent where val > 1") - .create(); + .parse("select type, id, val from rawinherit_parent where val > 1") + .create(); List partial = Ebean.find(Parent.class) - .setRawSql(rawSql) - .findList(); + .setRawSql(rawSql) + .findList(); assertNotNull(partial.get(0).getData()); assertEquals(partial.get(0).getData().get(0).getVal().intValue(), 0); @@ -95,13 +93,13 @@ public class ParentRawSqlTest extends BaseTestCase { // For bug 416 we need the parent.more to trigger it RawSql rawSql = RawSqlBuilder - .unparsed("select u.id, u.name, p.type as p_type, p.id as p_id, p.more as p_more from rawinherit_uncle u join rawinherit_parent p on p.id = u.parent_id") - .columnMapping("id", "id") - .columnMapping("name", "name") - .columnMapping("p_type", "parent.type") - .columnMapping("p_id", "parent.id") - .columnMapping("p_more", "parent.more") - .create(); + .unparsed("select u.id, u.name, p.type as p_type, p.id as p_id, p.more as p_more from rawinherit_uncle u join rawinherit_parent p on p.id = u.parent_id") + .columnMapping("id", "id") + .columnMapping("name", "name") + .columnMapping("p_type", "parent.type") + .columnMapping("p_id", "parent.id") + .columnMapping("p_more", "parent.more") + .create(); List uncles = Ebean.find(EUncle.class).setRawSql(rawSql).findList(); @@ -113,16 +111,16 @@ public class ParentRawSqlTest extends BaseTestCase { private void joinToInheritanceHierarchy_with_queryJoin() { RawSql rawSql = RawSqlBuilder - .unparsed("select u.id, u.name, p.type as p_type, p.id as p_id from rawinherit_uncle u join rawinherit_parent p on p.id = u.parent_id") - .columnMapping("id", "id") - .columnMapping("name", "name") - .columnMapping("p_type", "parent.type") - .columnMapping("p_id", "parent.id") - .create(); + .unparsed("select u.id, u.name, p.type as p_type, p.id as p_id from rawinherit_uncle u join rawinherit_parent p on p.id = u.parent_id") + .columnMapping("id", "id") + .columnMapping("name", "name") + .columnMapping("p_type", "parent.type") + .columnMapping("p_id", "parent.id") + .create(); List uncles = Ebean.find(EUncle.class).setRawSql(rawSql) - .fetch("parent", new FetchConfig().query()) - .findList(); + .fetch("parent", new FetchConfig().query()) + .findList(); assertNotNull(uncles.get(0)); Parent parent = uncles.get(0).getParent(); @@ -132,16 +130,16 @@ public class ParentRawSqlTest extends BaseTestCase { private void joinToInheritanceHierarchy_withIgnore() { RawSql rawSql = RawSqlBuilder - .unparsed("select u.id, u.name, p.type as ptype, p.id as pid from rawinherit_uncle u join rawinherit_parent p on p.id = u.parent_id") - .columnMapping("id", "id") - .columnMapping("name", "name") - .columnMappingIgnore("ptype") - .columnMapping("pid", "parent.id") - .create(); + .unparsed("select u.id, u.name, p.type as ptype, p.id as pid from rawinherit_uncle u join rawinherit_parent p on p.id = u.parent_id") + .columnMapping("id", "id") + .columnMapping("name", "name") + .columnMappingIgnore("ptype") + .columnMapping("pid", "parent.id") + .create(); List uncles = Ebean.find(EUncle.class).setRawSql(rawSql) - .fetch("parent", new FetchConfig().query()) - .findList(); + .fetch("parent", new FetchConfig().query()) + .findList(); assertNotNull(uncles.get(0)); Parent parent = uncles.get(0).getParent(); @@ -151,12 +149,12 @@ public class ParentRawSqlTest extends BaseTestCase { private void joinToInheritanceHierarchy_withAliasMapping() { RawSql rawSql = RawSqlBuilder - .parse("select u.id, u.name, p.type, p.id from rawinherit_uncle u join rawinherit_parent p on p.id = u.parent_id") - .tableAliasMapping("p", "parent") - .create(); + .parse("select u.id, u.name, p.type, p.id from rawinherit_uncle u join rawinherit_parent p on p.id = u.parent_id") + .tableAliasMapping("p", "parent") + .create(); List uncles = Ebean.find(EUncle.class).setRawSql(rawSql) - .findList(); + .findList(); assertNotNull(uncles.get(0)); Parent parent = uncles.get(0).getParent(); @@ -169,14 +167,14 @@ public class ParentRawSqlTest extends BaseTestCase { private void useColumnMappingWithDiscriminator() { RawSql rawSql = RawSqlBuilder - .unparsed("select type, id from rawinherit_parent where val > 1") - .columnMapping("type", "parent.type") // can map the discriminator column 'type' - .columnMapping("id", "parent.id") - .create(); + .unparsed("select type, id from rawinherit_parent where val > 1") + .columnMapping("type", "parent.type") // can map the discriminator column 'type' + .columnMapping("id", "parent.id") + .create(); List aggregates = Ebean.find(ParentAggregate.class).setRawSql(rawSql) - .fetch("parent", new FetchConfig().query()) - .findList(); + .fetch("parent", new FetchConfig().query()) + .findList(); List partial = new ArrayList<>(); for (ParentAggregate aggregate : aggregates) { @@ -193,14 +191,14 @@ public class ParentRawSqlTest extends BaseTestCase { private void useColumnMappingIgnore() { RawSql rawSql = RawSqlBuilder - .unparsed("select type, id from rawinherit_parent where val > 1") - .columnMappingIgnore("type") // can ignore the discriminator 'type' - .columnMapping("id", "parent.id") - .create(); + .unparsed("select type, id from rawinherit_parent where val > 1") + .columnMappingIgnore("type") // can ignore the discriminator 'type' + .columnMapping("id", "parent.id") + .create(); List aggregates = Ebean.find(ParentAggregate.class).setRawSql(rawSql) - .fetch("parent", new FetchConfig().query()) - .findList(); + .fetch("parent", new FetchConfig().query()) + .findList(); List partial = new ArrayList<>(); for (ParentAggregate aggregate : aggregates) { @@ -217,16 +215,16 @@ public class ParentRawSqlTest extends BaseTestCase { private void useExtraColumnMappingIgnore() { RawSql rawSql = RawSqlBuilder - .unparsed("select 'a', type, id, 'b' from rawinherit_parent where val > 1") - .columnMappingIgnore("a") // extra ignore before - .columnMappingIgnore("type") - .columnMapping("id", "parent.id") - .columnMappingIgnore("b") // extra ignore after - .create(); + .unparsed("select 'a', type, id, 'b' from rawinherit_parent where val > 1") + .columnMappingIgnore("a") // extra ignore before + .columnMappingIgnore("type") + .columnMapping("id", "parent.id") + .columnMappingIgnore("b") // extra ignore after + .create(); List aggregates = Ebean.find(ParentAggregate.class).setRawSql(rawSql) - .fetch("parent", new FetchConfig().query()) - .findList(); + .fetch("parent", new FetchConfig().query()) + .findList(); List partial = new ArrayList<>(); for (ParentAggregate aggregate : aggregates) { diff --git a/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java b/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java index 59657d078..df741e4b4 100644 --- a/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java +++ b/src/test/java/com/avaje/tests/readaudit/TestReadAudit.java @@ -3,7 +3,6 @@ package com.avaje.tests.readaudit; import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.EbeanServerFactory; import com.avaje.ebean.FutureList; -import com.avaje.ebean.QueryEachConsumer; import com.avaje.ebean.cache.ServerCache; import com.avaje.ebean.cache.ServerCacheStatistics; import com.avaje.ebean.config.ServerConfig; @@ -142,8 +141,8 @@ public class TestReadAudit extends BaseTestCase { resetCounters(); List list = server.find(EBasicChangeLog.class) - .where().startsWith("shortDescription", "readAudit") - .findList(); + .where().startsWith("shortDescription", "readAudit") + .findList(); assertThat(list).hasSize(2); assertThat(readAuditPrepare.count).isEqualTo(1); @@ -153,8 +152,8 @@ public class TestReadAudit extends BaseTestCase { assertThat(readAuditLogger.many.get(0).getIds()).contains(id1, id2); server.find(EBasicChangeLog.class) - .where().startsWith("shortDescription", "readAudit") - .findList(); + .where().startsWith("shortDescription", "readAudit") + .findList(); assertThat(readAuditPrepare.count).isEqualTo(2); assertThat(readAuditLogger.plans).hasSize(1); @@ -169,9 +168,9 @@ public class TestReadAudit extends BaseTestCase { LoggedSqlCollector.start(); List list = server.find(EBasicChangeLog.class) - .setUseQueryCache(true) - .where().startsWith("shortDescription", "readAudit") - .findList(); + .setUseQueryCache(true) + .where().startsWith("shortDescription", "readAudit") + .findList(); System.out.println("test_findList_useL2Cache> first query"); @@ -183,19 +182,19 @@ public class TestReadAudit extends BaseTestCase { assertThat(readAuditLogger.many.get(0).getIds()).contains(id1, id2); List list1 = server.find(EBasicChangeLog.class) - .setUseQueryCache(true) - .where().startsWith("shortDescription", "readAudit") - .findList(); + .setUseQueryCache(true) + .where().startsWith("shortDescription", "readAudit") + .findList(); - System.out.println("test_findList_useL2Cache> second query "+list1.size()); + System.out.println("test_findList_useL2Cache> second query " + list1.size()); assertThat(list1).hasSize(2); List sql = LoggedSqlCollector.stop(); - System.out.println("test_findList_useL2Cache> sql: "+sql); + System.out.println("test_findList_useL2Cache> sql: " + sql); //assertThat(sql).hasSize(1); System.out.println("test_findList_useL2Cache> prepare:" + readAuditPrepare.count - + " plans:" + readAuditLogger.plans - + " many:" + readAuditLogger.many); + + " plans:" + readAuditLogger.plans + + " many:" + readAuditLogger.many); assertThat(readAuditPrepare.count).isEqualTo(2); assertThat(readAuditLogger.plans).hasSize(1); @@ -208,8 +207,8 @@ public class TestReadAudit extends BaseTestCase { resetCounters(); FutureList futureList = server.find(EBasicChangeLog.class) - .where().startsWith("shortDescription", "readAudit") - .findFutureList(); + .where().startsWith("shortDescription", "readAudit") + .findFutureList(); List list = futureList.get(); assertThat(list).hasSize(2); @@ -220,8 +219,8 @@ public class TestReadAudit extends BaseTestCase { assertThat(readAuditLogger.many.get(0).getIds()).contains(id1, id2); server.find(EBasicChangeLog.class) - .where().startsWith("shortDescription", "readAudit") - .findList(); + .where().startsWith("shortDescription", "readAudit") + .findList(); assertThat(readAuditPrepare.count).isEqualTo(2); assertThat(readAuditLogger.plans).hasSize(1); @@ -234,8 +233,8 @@ public class TestReadAudit extends BaseTestCase { resetCounters(); Set list = server.find(EBasicChangeLog.class) - .where().startsWith("shortDescription", "readAudit") - .findSet(); + .where().startsWith("shortDescription", "readAudit") + .findSet(); assertThat(list).hasSize(2); assertThat(readAuditPrepare.count).isEqualTo(1); @@ -244,8 +243,8 @@ public class TestReadAudit extends BaseTestCase { assertThat(readAuditLogger.many.get(0).getIds()).contains(id1, id2); server.find(EBasicChangeLog.class) - .where().startsWith("shortDescription", "readAudit") - .findSet(); + .where().startsWith("shortDescription", "readAudit") + .findSet(); assertThat(readAuditPrepare.count).isEqualTo(2); assertThat(readAuditLogger.plans).hasSize(1); @@ -257,9 +256,9 @@ public class TestReadAudit extends BaseTestCase { resetCounters(); - Map list = server.find(EBasicChangeLog.class) - .where().startsWith("shortDescription", "readAudit") - .findMap(); + Map list = server.find(EBasicChangeLog.class) + .where().startsWith("shortDescription", "readAudit") + .findMap(); assertThat(list).hasSize(2); assertThat(readAuditPrepare.count).isEqualTo(1); @@ -268,8 +267,8 @@ public class TestReadAudit extends BaseTestCase { assertThat(readAuditLogger.many.get(0).getIds()).contains(id1, id2); server.find(EBasicChangeLog.class) - .where().startsWith("shortDescription", "readAudit") - .findMap(); + .where().startsWith("shortDescription", "readAudit") + .findMap(); assertThat(readAuditPrepare.count).isEqualTo(2); assertThat(readAuditLogger.plans).hasSize(1); @@ -283,8 +282,8 @@ public class TestReadAudit extends BaseTestCase { final AtomicInteger count = new AtomicInteger(); server.find(EBasicChangeLog.class) - .where().startsWith("shortDescription", "readAudit") - .findEach(bean -> count.incrementAndGet()); + .where().startsWith("shortDescription", "readAudit") + .findEach(bean -> count.incrementAndGet()); assertThat(count.get()).isEqualTo(2); assertThat(readAuditPrepare.count).isEqualTo(1); @@ -293,8 +292,8 @@ public class TestReadAudit extends BaseTestCase { assertThat(readAuditLogger.many.get(0).getIds()).contains(id1, id2); server.find(EBasicChangeLog.class) - .where().startsWith("shortDescription", "readAudit") - .findEach(bean -> count.incrementAndGet()); + .where().startsWith("shortDescription", "readAudit") + .findEach(bean -> count.incrementAndGet()); assertThat(readAuditPrepare.count).isEqualTo(2); assertThat(readAuditLogger.plans).hasSize(1); @@ -334,6 +333,7 @@ public class TestReadAudit extends BaseTestCase { TDReadAuditPrepare(boolean dummy) { } + void resetCounters() { count = 0; } @@ -355,6 +355,7 @@ public class TestReadAudit extends BaseTestCase { TDReadAuditLogger(boolean dummy) { } + void resetCounters() { plans.clear(); beans.clear(); diff --git a/src/test/java/com/avaje/tests/refresh/TestRefreshWithMany.java b/src/test/java/com/avaje/tests/refresh/TestRefreshWithMany.java index 8a3bb834a..a177a6de9 100644 --- a/src/test/java/com/avaje/tests/refresh/TestRefreshWithMany.java +++ b/src/test/java/com/avaje/tests/refresh/TestRefreshWithMany.java @@ -26,13 +26,13 @@ public class TestRefreshWithMany extends BaseTestCase { assertEquals(3, customer.getContacts().size()); int rc = Ebean.createSqlUpdate("update o_customer set name = :name where id = :id") - .setParameter("name", "ref-modified") - .setParameter("id", customer.getId()) - .execute(); + .setParameter("name", "ref-modified") + .setParameter("id", customer.getId()) + .execute(); int rc2 = Ebean.createSqlUpdate("update contact set first_name = concat(first_name,'-mod') where customer_id = :id") - .setParameter("id", customer.getId()) - .execute(); + .setParameter("id", customer.getId()) + .execute(); assertEquals(1, rc); assertEquals(3, rc2); @@ -46,20 +46,20 @@ public class TestRefreshWithMany extends BaseTestCase { // now try again when the bean is fully loaded Customer customer1 = Ebean.find(Customer.class) - .fetch("contacts") - .setId(customer.getId()) - .findUnique(); + .fetch("contacts") + .setId(customer.getId()) + .findUnique(); int rcb1 = Ebean.createSqlUpdate("update o_customer set name = :name where id = :id") - .setParameter("name", "ref-modified-again") - .setParameter("id", customer.getId()) - .execute(); + .setParameter("name", "ref-modified-again") + .setParameter("id", customer.getId()) + .execute(); int rcb2 = Ebean.createSqlUpdate("update contact set first_name = :first, last_name='foo' where customer_id = :id") - .setParameter("id", customer.getId()) - .setParameter("first","-alt") - .execute(); + .setParameter("id", customer.getId()) + .setParameter("first", "-alt") + .execute(); List sqlRows = Ebean.createSqlQuery("select id, first_name, last_name from contact").findList(); for (SqlRow sqlRow : sqlRows) { diff --git a/src/test/java/com/avaje/tests/saveassociation/TestSaveAssociation.java b/src/test/java/com/avaje/tests/saveassociation/TestSaveAssociation.java index f04a0a36a..815718237 100644 --- a/src/test/java/com/avaje/tests/saveassociation/TestSaveAssociation.java +++ b/src/test/java/com/avaje/tests/saveassociation/TestSaveAssociation.java @@ -1,12 +1,11 @@ package com.avaje.tests.saveassociation; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.TSDetail; import com.avaje.tests.model.basic.TSMaster; +import org.junit.Assert; +import org.junit.Test; public class TestSaveAssociation extends BaseTestCase { @@ -24,7 +23,7 @@ public class TestSaveAssociation extends BaseTestCase { Ebean.save(m0); TSMaster m0Check = Ebean.find(TSMaster.class).fetch("details").where().idEq(m0.getId()) - .findUnique(); + .findUnique(); Assert.assertEquals(2, m0Check.getDetails().size()); diff --git a/src/test/java/com/avaje/tests/saveassociation/TestSaveSamePK.java b/src/test/java/com/avaje/tests/saveassociation/TestSaveSamePK.java index fd1fdceac..31d18f69f 100644 --- a/src/test/java/com/avaje/tests/saveassociation/TestSaveSamePK.java +++ b/src/test/java/com/avaje/tests/saveassociation/TestSaveSamePK.java @@ -1,12 +1,11 @@ package com.avaje.tests.saveassociation; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.TSDetail; import com.avaje.tests.model.basic.TSMaster; +import org.junit.Assert; +import org.junit.Test; public class TestSaveSamePK extends BaseTestCase { @@ -27,11 +26,11 @@ public class TestSaveSamePK extends BaseTestCase { TSDetail tsDetail = new TSDetail("master1 detail1"); tsDetail.setId(10000); tsDetail.setMaster(m0); - + Ebean.save(tsDetail); TSDetail fetchedDetail = Ebean.find(TSDetail.class).setId(10000).fetch("master").findUnique(); - + Assert.assertNotNull(fetchedDetail); } } diff --git a/src/test/java/com/avaje/tests/singleTableInheritance/TestInheritQuery.java b/src/test/java/com/avaje/tests/singleTableInheritance/TestInheritQuery.java index 5afb69e61..d8e07ca86 100644 --- a/src/test/java/com/avaje/tests/singleTableInheritance/TestInheritQuery.java +++ b/src/test/java/com/avaje/tests/singleTableInheritance/TestInheritQuery.java @@ -1,13 +1,17 @@ package com.avaje.tests.singleTableInheritance; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; -import com.avaje.tests.singleTableInheritance.model.*; +import com.avaje.tests.singleTableInheritance.model.PalletLocation; +import com.avaje.tests.singleTableInheritance.model.PalletLocationExternal; +import com.avaje.tests.singleTableInheritance.model.Warehouse; +import com.avaje.tests.singleTableInheritance.model.Zone; +import com.avaje.tests.singleTableInheritance.model.ZoneExternal; +import com.avaje.tests.singleTableInheritance.model.ZoneInternal; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestInheritQuery extends BaseTestCase { @@ -24,7 +28,7 @@ public class TestInheritQuery extends BaseTestCase { // This line should work too: List locations = Ebean.find(PalletLocation.class).where().eq("zone", zone) - .findList(); + .findList(); // List locations = // Ebean.find(PalletLocation.class).where().eq("zone.id", // zone.getId()).findList(); @@ -37,7 +41,7 @@ public class TestInheritQuery extends BaseTestCase { Assert.assertNotNull(rereadZone); Assert.assertTrue(rereadZone instanceof ZoneExternal); } - + @Test public void testDiscriminator_bug417() { @@ -48,120 +52,120 @@ public class TestInheritQuery extends BaseTestCase { Ebean.deleteAll(Ebean.find(ZoneInternal.class).findList()); Ebean.deleteAll(Ebean.find(ZoneInternal.class).findList()); - ZoneInternal zoneInt = new ZoneInternal(); - zoneInt.setAttribute("some zone 1"); - Ebean.save(zoneInt); - - ZoneExternal zoneExt = new ZoneExternal(); - zoneExt.setAttribute("some zone 2"); - Ebean.save(zoneExt); - - // queries of Zone and subclasses as root node of query - - // query abstract class on attribute (root of heirarchy) - List zones = Ebean.find(Zone.class).where().startsWith("attribute", "some zone").findList(); - // select t0.type c0, t0.ID c1, t0.attribute c2, t0.attribute c3 from zones t0 where t0.attribute like ? ; --bind(some zone%) - Assert.assertEquals(2, zones.size()); - Assert.assertTrue(zones.contains(zoneInt)); - Assert.assertTrue(zones.contains(zoneExt)); - - // query internal zones only - // discriminator is in WHERE clause where it belongs - List internalZones = Ebean.find(ZoneInternal.class).where().startsWith("attribute", "some zone").findList(); - // select t0.type c0, t0.ID c1, t0.attribute c2 from zones t0 where t0.type = 'INT' and t0.attribute like ? ; --bind(some zone%) - Assert.assertEquals(1, internalZones.size()); - Assert.assertTrue(internalZones.contains(zoneInt)); - Assert.assertFalse(internalZones.contains(zoneExt)); - Assert.assertTrue(internalZones.get(0) instanceof ZoneInternal); + ZoneInternal zoneInt = new ZoneInternal(); + zoneInt.setAttribute("some zone 1"); + Ebean.save(zoneInt); - // query external zones only - List externalZones = Ebean.find(ZoneExternal.class).where().startsWith("attribute", "some zone").findList(); - // select t0.type c0, t0.ID c1, t0.attribute c2 from zones t0 where t0.type = 'EXT' and t0.attribute like ? ; --bind(some zone%) - Assert.assertEquals(1, externalZones.size()); - Assert.assertTrue(externalZones.contains(zoneExt)); - Assert.assertFalse(externalZones.contains(zoneInt)); - Assert.assertTrue(externalZones.get(0) instanceof ZoneExternal); - - // parents with children of Zones and subclasses - - Warehouse wh = new Warehouse(); - wh.setOfficeZone(zoneInt); // many-to-one - wh.getShippingZones().add(zoneExt); // many-to-many - Ebean.save(wh); - - // JOIN clause, no discriminator - // parent with many-to-one, doesn't put in discriminator, why not, PK sufficient? - // eager join - Warehouse wh2 = Ebean.find(Warehouse.class, wh.getId()); - Assert.assertNotNull(wh2); - Assert.assertEquals(wh.getId(), wh2.getId()); - Assert.assertEquals(wh.getOfficeZone(), wh2.getOfficeZone()); - Assert.assertEquals(wh.getOfficeZone().getAttribute(), wh2.getOfficeZone().getAttribute()); - - // before the fix, next assertion runs this lazy query: - - // select t0.ID c0, t1.type c1, t1.ID c2 from warehouses t0 - // left join WarehousesShippingZones t1z_ on t1z_.warehouseId = t0.ID - // left join zones t1 on t1.ID = t1z_.shippingZoneId - // where t1.type = 'EXT' // this should be in the join clause - // and t0.ID = ? - // order by t0.ID; --bind(1) - - // this works here because we have at least one shipping zone - - Assert.assertEquals(1, wh2.getShippingZones().size()); - Assert.assertTrue(wh2.getShippingZones().contains(zoneExt)); - - // set optional concrete to null to set stage for failure - wh.setOfficeZone(null); - Ebean.save(wh); - - // no discriminator here - wh2 = Ebean.find(Warehouse.class) - .where().eq("id", wh.getId()) - .findUnique(); + ZoneExternal zoneExt = new ZoneExternal(); + zoneExt.setAttribute("some zone 2"); + Ebean.save(zoneExt); - Assert.assertNotNull(wh2); - // discriminator is used here, should be in join - // assuming this "manual" fetch is equivalent to autofetch (i.e., autofetch should work the same way) - // before Daryl's fix - // select t0.ID c0, t1.type c1, t1.ID c2, t1.attribute c3 from warehouses t0 left join zones t1 on t1.ID = t0.officeZoneId where t1.type = 'INT' and t0.ID = ? - // todo: after Daryl's fix, not sure if this is proper, no discriminator at all, isn't PK/FK sufficient? - // select t0.ID c0, t1.type c1, t1.ID c2, t1.attribute c3 from warehouses t0 left join zones t1 on t1.ID = t0.officeZoneId where t0.ID = ? ; --bind(1) - wh2 = Ebean.find(Warehouse.class) - .fetch("officeZone") - .where().eq("id", wh.getId()) - .findUnique(); - // key assertion #1 - fails due to left join with discriminator in WHERE - Assert.assertNotNull(wh2); - - // clear children to set the stage for left join failure - wh.getShippingZones().clear(); - Ebean.save(wh); - - wh2 = Ebean.find(Warehouse.class, wh.getId()); - Assert.assertNotNull(wh2); - Assert.assertEquals(wh.getId(), wh2.getId()); - Assert.assertEquals(0, wh.getShippingZones().size()); - - // query with lazy load of abstract children - wh = Ebean.find(Warehouse.class) - .where().eq("id", wh.getId()) - .findUnique(); - Assert.assertNotNull(wh); - Assert.assertEquals(wh.getId(), wh2.getId()); - Assert.assertEquals(0, wh.getShippingZones().size()); - - // query with fetch of abstract children - wh = Ebean.find(Warehouse.class) - .fetch("shippingZones") - .where().eq("id", wh.getId()) - .findUnique(); - // key assertion #2 - fails due to left join with discriminator in WHERE - Assert.assertNotNull(wh); - Assert.assertEquals(wh.getId(), wh2.getId()); - Assert.assertEquals(0, wh.getShippingZones().size()); - - - } -} \ No newline at end of file + // queries of Zone and subclasses as root node of query + + // query abstract class on attribute (root of heirarchy) + List zones = Ebean.find(Zone.class).where().startsWith("attribute", "some zone").findList(); + // select t0.type c0, t0.ID c1, t0.attribute c2, t0.attribute c3 from zones t0 where t0.attribute like ? ; --bind(some zone%) + Assert.assertEquals(2, zones.size()); + Assert.assertTrue(zones.contains(zoneInt)); + Assert.assertTrue(zones.contains(zoneExt)); + + // query internal zones only + // discriminator is in WHERE clause where it belongs + List internalZones = Ebean.find(ZoneInternal.class).where().startsWith("attribute", "some zone").findList(); + // select t0.type c0, t0.ID c1, t0.attribute c2 from zones t0 where t0.type = 'INT' and t0.attribute like ? ; --bind(some zone%) + Assert.assertEquals(1, internalZones.size()); + Assert.assertTrue(internalZones.contains(zoneInt)); + Assert.assertFalse(internalZones.contains(zoneExt)); + Assert.assertTrue(internalZones.get(0) instanceof ZoneInternal); + + // query external zones only + List externalZones = Ebean.find(ZoneExternal.class).where().startsWith("attribute", "some zone").findList(); + // select t0.type c0, t0.ID c1, t0.attribute c2 from zones t0 where t0.type = 'EXT' and t0.attribute like ? ; --bind(some zone%) + Assert.assertEquals(1, externalZones.size()); + Assert.assertTrue(externalZones.contains(zoneExt)); + Assert.assertFalse(externalZones.contains(zoneInt)); + Assert.assertTrue(externalZones.get(0) instanceof ZoneExternal); + + // parents with children of Zones and subclasses + + Warehouse wh = new Warehouse(); + wh.setOfficeZone(zoneInt); // many-to-one + wh.getShippingZones().add(zoneExt); // many-to-many + Ebean.save(wh); + + // JOIN clause, no discriminator + // parent with many-to-one, doesn't put in discriminator, why not, PK sufficient? + // eager join + Warehouse wh2 = Ebean.find(Warehouse.class, wh.getId()); + Assert.assertNotNull(wh2); + Assert.assertEquals(wh.getId(), wh2.getId()); + Assert.assertEquals(wh.getOfficeZone(), wh2.getOfficeZone()); + Assert.assertEquals(wh.getOfficeZone().getAttribute(), wh2.getOfficeZone().getAttribute()); + + // before the fix, next assertion runs this lazy query: + + // select t0.ID c0, t1.type c1, t1.ID c2 from warehouses t0 + // left join WarehousesShippingZones t1z_ on t1z_.warehouseId = t0.ID + // left join zones t1 on t1.ID = t1z_.shippingZoneId + // where t1.type = 'EXT' // this should be in the join clause + // and t0.ID = ? + // order by t0.ID; --bind(1) + + // this works here because we have at least one shipping zone + + Assert.assertEquals(1, wh2.getShippingZones().size()); + Assert.assertTrue(wh2.getShippingZones().contains(zoneExt)); + + // set optional concrete to null to set stage for failure + wh.setOfficeZone(null); + Ebean.save(wh); + + // no discriminator here + wh2 = Ebean.find(Warehouse.class) + .where().eq("id", wh.getId()) + .findUnique(); + + Assert.assertNotNull(wh2); + // discriminator is used here, should be in join + // assuming this "manual" fetch is equivalent to autofetch (i.e., autofetch should work the same way) + // before Daryl's fix + // select t0.ID c0, t1.type c1, t1.ID c2, t1.attribute c3 from warehouses t0 left join zones t1 on t1.ID = t0.officeZoneId where t1.type = 'INT' and t0.ID = ? + // todo: after Daryl's fix, not sure if this is proper, no discriminator at all, isn't PK/FK sufficient? + // select t0.ID c0, t1.type c1, t1.ID c2, t1.attribute c3 from warehouses t0 left join zones t1 on t1.ID = t0.officeZoneId where t0.ID = ? ; --bind(1) + wh2 = Ebean.find(Warehouse.class) + .fetch("officeZone") + .where().eq("id", wh.getId()) + .findUnique(); + // key assertion #1 - fails due to left join with discriminator in WHERE + Assert.assertNotNull(wh2); + + // clear children to set the stage for left join failure + wh.getShippingZones().clear(); + Ebean.save(wh); + + wh2 = Ebean.find(Warehouse.class, wh.getId()); + Assert.assertNotNull(wh2); + Assert.assertEquals(wh.getId(), wh2.getId()); + Assert.assertEquals(0, wh.getShippingZones().size()); + + // query with lazy load of abstract children + wh = Ebean.find(Warehouse.class) + .where().eq("id", wh.getId()) + .findUnique(); + Assert.assertNotNull(wh); + Assert.assertEquals(wh.getId(), wh2.getId()); + Assert.assertEquals(0, wh.getShippingZones().size()); + + // query with fetch of abstract children + wh = Ebean.find(Warehouse.class) + .fetch("shippingZones") + .where().eq("id", wh.getId()) + .findUnique(); + // key assertion #2 - fails due to left join with discriminator in WHERE + Assert.assertNotNull(wh); + Assert.assertEquals(wh.getId(), wh2.getId()); + Assert.assertEquals(0, wh.getShippingZones().size()); + + + } +} diff --git a/src/test/java/com/avaje/tests/singleTableInheritance/model/PalletLocation.java b/src/test/java/com/avaje/tests/singleTableInheritance/model/PalletLocation.java index bffeeaaf6..6b8f1efe1 100644 --- a/src/test/java/com/avaje/tests/singleTableInheritance/model/PalletLocation.java +++ b/src/test/java/com/avaje/tests/singleTableInheritance/model/PalletLocation.java @@ -12,35 +12,30 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; @Entity -@Inheritance(strategy= InheritanceType.SINGLE_TABLE) -@DiscriminatorColumn(name="type", discriminatorType= DiscriminatorType.STRING) -public class PalletLocation -{ - @Id - @Column(name="id") - private Integer id; +@Inheritance(strategy = InheritanceType.SINGLE_TABLE) +@DiscriminatorColumn(name = "type", discriminatorType = DiscriminatorType.STRING) +public class PalletLocation { + @Id + @Column(name = "id") + private Integer id; - @ManyToOne(fetch= FetchType.LAZY, optional=false) - @JoinColumn(name="ZONE_SID") - private Zone zone; + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "ZONE_SID") + private Zone zone; - public Integer getId() - { - return id; - } + public Integer getId() { + return id; + } - public void setId(Integer id) - { - this.id = id; - } + public void setId(Integer id) { + this.id = id; + } - public Zone getZone() - { - return zone; - } + public Zone getZone() { + return zone; + } - public void setZone(Zone zone) - { - this.zone = zone; - } + public void setZone(Zone zone) { + this.zone = zone; + } } diff --git a/src/test/java/com/avaje/tests/singleTableInheritance/model/PalletLocationExternal.java b/src/test/java/com/avaje/tests/singleTableInheritance/model/PalletLocationExternal.java index 8f104aa44..e9bc37f50 100644 --- a/src/test/java/com/avaje/tests/singleTableInheritance/model/PalletLocationExternal.java +++ b/src/test/java/com/avaje/tests/singleTableInheritance/model/PalletLocationExternal.java @@ -5,17 +5,14 @@ import javax.persistence.Entity; @Entity @DiscriminatorValue("EXT") -public class PalletLocationExternal extends PalletLocation -{ - private String attribute; +public class PalletLocationExternal extends PalletLocation { + private String attribute; - public String getAttribute() - { - return attribute; - } + public String getAttribute() { + return attribute; + } - public void setAttribute(String attribute) - { - this.attribute = attribute; - } + public void setAttribute(String attribute) { + this.attribute = attribute; + } } diff --git a/src/test/java/com/avaje/tests/singleTableInheritance/model/Warehouse.java b/src/test/java/com/avaje/tests/singleTableInheritance/model/Warehouse.java index 80aa46e03..18d8b0800 100644 --- a/src/test/java/com/avaje/tests/singleTableInheritance/model/Warehouse.java +++ b/src/test/java/com/avaje/tests/singleTableInheritance/model/Warehouse.java @@ -1,49 +1,56 @@ package com.avaje.tests.singleTableInheritance.model; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; +import javax.persistence.Table; import java.util.Set; -import javax.persistence.*; - @Entity -@Table(name="warehouses") +@Table(name = "warehouses") public class Warehouse { - @Id - @Column(name="id") - private Integer id; - - @ManyToOne//(optional = false) //todo: should this be nullable with assertions made? - @JoinColumn(name = "officeZoneId") - private ZoneInternal officeZone; - - @ManyToMany(cascade = CascadeType.PERSIST) - @JoinTable(name = "warehousesshippingzones", - joinColumns = { @JoinColumn(name = "warehouseId", referencedColumnName = "ID") }, - inverseJoinColumns = { @JoinColumn(name = "shippingZoneId", referencedColumnName = "ID") } - ) - private Set shippingZones; + @Id + @Column(name = "id") + private Integer id; - public Integer getId() { - return id; - } + @ManyToOne//(optional = false) //todo: should this be nullable with assertions made? + @JoinColumn(name = "officeZoneId") + private ZoneInternal officeZone; - public void setId(Integer id) { - this.id = id; - } - - public ZoneInternal getOfficeZone() { - return officeZone; - } - - public void setOfficeZone(ZoneInternal officeZone) { - this.officeZone = officeZone; - } - - public Set getShippingZones() { - return shippingZones; - } + @ManyToMany(cascade = CascadeType.PERSIST) + @JoinTable(name = "warehousesshippingzones", + joinColumns = {@JoinColumn(name = "warehouseId", referencedColumnName = "ID")}, + inverseJoinColumns = {@JoinColumn(name = "shippingZoneId", referencedColumnName = "ID")} + ) + private Set shippingZones; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public ZoneInternal getOfficeZone() { + return officeZone; + } + + public void setOfficeZone(ZoneInternal officeZone) { + this.officeZone = officeZone; + } + + public Set getShippingZones() { + return shippingZones; + } + + public void setShippingZones(Set shippingZones) { + this.shippingZones = shippingZones; + } - public void setShippingZones(Set shippingZones) { - this.shippingZones = shippingZones; - } - } diff --git a/src/test/java/com/avaje/tests/singleTableInheritance/model/Zone.java b/src/test/java/com/avaje/tests/singleTableInheritance/model/Zone.java index 88814d274..2032d958d 100644 --- a/src/test/java/com/avaje/tests/singleTableInheritance/model/Zone.java +++ b/src/test/java/com/avaje/tests/singleTableInheritance/model/Zone.java @@ -10,36 +10,33 @@ import javax.persistence.InheritanceType; import javax.persistence.Table; @Entity -@Inheritance(strategy=InheritanceType.SINGLE_TABLE) -@DiscriminatorColumn(name="type", discriminatorType=DiscriminatorType.STRING) -@Table(name="zones") -public class Zone -{ - @Id - @Column(name="id") - private Integer id; +@Inheritance(strategy = InheritanceType.SINGLE_TABLE) +@DiscriminatorColumn(name = "type", discriminatorType = DiscriminatorType.STRING) +@Table(name = "zones") +public class Zone { + @Id + @Column(name = "id") + private Integer id; - public Integer getId() - { - return id; - } + public Integer getId() { + return id; + } - public void setId(Integer id) - { - this.id = id; - } - - public int hashCode() { - if (getId() != null) return getId().hashCode(); - else return super.hashCode(); - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof Zone) { - return ((Zone) obj).getId().equals(getId()); - } else { - return false; - } - } + public void setId(Integer id) { + this.id = id; + } + + public int hashCode() { + if (getId() != null) return getId().hashCode(); + else return super.hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof Zone) { + return ((Zone) obj).getId().equals(getId()); + } else { + return false; + } + } } diff --git a/src/test/java/com/avaje/tests/singleTableInheritance/model/ZoneExternal.java b/src/test/java/com/avaje/tests/singleTableInheritance/model/ZoneExternal.java index c3b24734e..1713dee77 100644 --- a/src/test/java/com/avaje/tests/singleTableInheritance/model/ZoneExternal.java +++ b/src/test/java/com/avaje/tests/singleTableInheritance/model/ZoneExternal.java @@ -5,22 +5,19 @@ import javax.persistence.Entity; @Entity @DiscriminatorValue("EXT") -public class ZoneExternal extends Zone -{ - private String attribute; +public class ZoneExternal extends Zone { + private String attribute; - public String getAttribute() - { - return attribute; - } + public String getAttribute() { + return attribute; + } - public void setAttribute(String attribute) - { - this.attribute = attribute; - } - - @Override - public String toString() { - return "ZoneExternal " + getId() + " \"" + getAttribute() + "\""; - } + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + @Override + public String toString() { + return "ZoneExternal " + getId() + " \"" + getAttribute() + "\""; + } } diff --git a/src/test/java/com/avaje/tests/singleTableInheritance/model/ZoneInternal.java b/src/test/java/com/avaje/tests/singleTableInheritance/model/ZoneInternal.java index 0ed1af183..bfb602f99 100644 --- a/src/test/java/com/avaje/tests/singleTableInheritance/model/ZoneInternal.java +++ b/src/test/java/com/avaje/tests/singleTableInheritance/model/ZoneInternal.java @@ -6,19 +6,19 @@ import javax.persistence.Entity; @Entity @DiscriminatorValue("INT") public class ZoneInternal extends Zone { - - private String attribute; - public String getAttribute() { - return attribute; - } + private String attribute; - public void setAttribute(String attribute) { - this.attribute = attribute; - } - - @Override - public String toString() { - return "ZoneInternal " + getId() + " \"" + getAttribute() + "\""; - } + public String getAttribute() { + return attribute; + } + + public void setAttribute(String attribute) { + this.attribute = attribute; + } + + @Override + public String toString() { + return "ZoneInternal " + getId() + " \"" + getAttribute() + "\""; + } } diff --git a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java b/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java index 795d66307..8146b2ada 100644 --- a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java +++ b/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBasic.java @@ -30,15 +30,15 @@ public class TestSoftDeleteBasic extends BaseTestCase { assertThat(sqlRow).isNotNull(); EBasicSoftDelete findNormal = Ebean.find(EBasicSoftDelete.class) - .setId(bean.getId()) - .findUnique(); + .setId(bean.getId()) + .findUnique(); assertThat(findNormal).isNull(); EBasicSoftDelete findInclude = Ebean.find(EBasicSoftDelete.class) - .setId(bean.getId()) - .setIncludeSoftDeletes() - .findUnique(); + .setId(bean.getId()) + .setIncludeSoftDeletes() + .findUnique(); assertThat(findInclude).isNotNull(); } @@ -53,11 +53,11 @@ public class TestSoftDeleteBasic extends BaseTestCase { Ebean.delete(bean); Query query = Ebean.find(EBasicSoftDelete.class) - .setIncludeSoftDeletes() - .where() - .eq("deleted", true) - .eq("name", "softDelFetch") - .query(); + .setIncludeSoftDeletes() + .where() + .eq("deleted", true) + .eq("name", "softDelFetch") + .query(); List list = query.findList(); assertThat(query.getGeneratedSql()).contains("deleted = ?"); @@ -108,9 +108,9 @@ public class TestSoftDeleteBasic extends BaseTestCase { // partially loaded bean without deleted state loaded EBasicSoftDelete partial = Ebean.find(EBasicSoftDelete.class) - .select("id") - .setId(bean.getId()) - .findUnique(); + .select("id") + .setId(bean.getId()) + .findUnique(); LoggedSqlCollector.start(); Ebean.delete(partial); @@ -172,10 +172,10 @@ public class TestSoftDeleteBasic extends BaseTestCase { LoggedSqlCollector.start(); Query query1 = - Ebean.find(EBasicSoftDelete.class) - .fetch("children") - .where().eq("id", bean.getId()) - .query(); + Ebean.find(EBasicSoftDelete.class) + .fetch("children") + .where().eq("id", bean.getId()) + .query(); List fetch1 = query1.findList(); String generatedSql = query1.getGeneratedSql(); @@ -194,9 +194,9 @@ public class TestSoftDeleteBasic extends BaseTestCase { // fetch includeSoftDeletes using lazy loading EBasicSoftDelete fetchAllWithLazy = - Ebean.find(EBasicSoftDelete.class) - .setId(bean.getId()) - .where() + Ebean.find(EBasicSoftDelete.class) + .setId(bean.getId()) + .where() .setIncludeSoftDeletes() .findUnique(); @@ -215,8 +215,8 @@ public class TestSoftDeleteBasic extends BaseTestCase { Ebean.deleteAll(bean.getChildren()); Query query = Ebean.find(EBasicSoftDelete.class) - .setId(bean.getId()) - .fetch("children"); + .setId(bean.getId()) + .fetch("children"); EBasicSoftDelete found = query.findUnique(); diff --git a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBook.java b/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBook.java index 311679b01..60610d998 100644 --- a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBook.java +++ b/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteBook.java @@ -16,7 +16,7 @@ public class TestSoftDeleteBook extends BaseTestCase { @Test public void test() { - // Create users + // Create users ESoftDelUser user1 = new ESoftDelUser("user1"); Ebean.save(user1); @@ -27,19 +27,19 @@ public class TestSoftDeleteBook extends BaseTestCase { Ebean.save(user3); // Create books - ESoftDelBook book1 = new ESoftDelBook("book1"); + ESoftDelBook book1 = new ESoftDelBook("book1"); book1.setLendBy(user1); book1.setLendBys(Arrays.asList(user2, user3)); Ebean.save(book1); - ESoftDelBook book2 = new ESoftDelBook("book2"); + ESoftDelBook book2 = new ESoftDelBook("book2"); book2.setLendBy(user2); book2.setLendBys(Arrays.asList(user1, user3)); Ebean.save(book2); // check if everything is stored correctly in DB book1 = Ebean.find(ESoftDelBook.class).where().eq("bookTitle", "book1").findUnique(); - book2 = Ebean.find(ESoftDelBook.class).where().eq("bookTitle", "book2").findUnique(); + book2 = Ebean.find(ESoftDelBook.class).where().eq("bookTitle", "book2").findUnique(); assertThat(book1.getLendBys().size()).isEqualTo(2); assertThat(book2.getLendBys().size()).isEqualTo(2); @@ -51,7 +51,7 @@ public class TestSoftDeleteBook extends BaseTestCase { // check if everything is still stored correctly in DB (softdeletes included) book1 = Ebean.find(ESoftDelBook.class).where().eq("bookTitle", "book1").setIncludeSoftDeletes().findUnique(); - book2 = Ebean.find(ESoftDelBook.class).where().eq("bookTitle", "book2").setIncludeSoftDeletes().findUnique(); + book2 = Ebean.find(ESoftDelBook.class).where().eq("bookTitle", "book2").setIncludeSoftDeletes().findUnique(); assertThat(book1.getLendBys().size()).isEqualTo(2); assertThat(book2.getLendBys().size()).isEqualTo(2); @@ -66,10 +66,10 @@ public class TestSoftDeleteBook extends BaseTestCase { assertThat(book1.getLendBys().size()).isEqualTo(2); // user2 & user3 assertThat(book2.getLendBys().size()).isEqualTo(1); // user1 (deleted) & user3 assertThat(book2.getLendBy().getUserName()).isEqualTo("user2"); - - // expected behaviour: + + // expected behaviour: // book1.getLendBy() == null - // current behaviour: + // current behaviour: // book1.getLendBy() is a "dead" object. nearly every operation on the // user object leads into an EntityNotFoundException @@ -98,8 +98,8 @@ public class TestSoftDeleteBook extends BaseTestCase { Ebean.delete(user2); Query query = Ebean.find(ESoftDelBook.class) - .setId(book1.getId()) - .fetch("lendBys"); + .setId(book1.getId()) + .fetch("lendBys"); ESoftDelBook found = query.findUnique(); diff --git a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteOptionalRelationship.java index 916299bff..f90e063e1 100644 --- a/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteOptionalRelationship.java +++ b/src/test/java/com/avaje/tests/softdelete/TestSoftDeleteOptionalRelationship.java @@ -16,9 +16,9 @@ public class TestSoftDeleteOptionalRelationship extends BaseTestCase { Ebean.save(mid1); ESoftDelMid bean = Ebean.find(ESoftDelMid.class) - .setId(mid1.getId()) - .fetch("top") - .findUnique(); + .setId(mid1.getId()) + .fetch("top") + .findUnique(); assertThat(bean).isNotNull(); assertThat(bean.getTop()).isNull(); diff --git a/src/test/java/com/avaje/tests/sp/TestManyToManySaveTwice.java b/src/test/java/com/avaje/tests/sp/TestManyToManySaveTwice.java index b700e3a93..e83bb9917 100644 --- a/src/test/java/com/avaje/tests/sp/TestManyToManySaveTwice.java +++ b/src/test/java/com/avaje/tests/sp/TestManyToManySaveTwice.java @@ -1,15 +1,14 @@ package com.avaje.tests.sp; -import java.util.LinkedList; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.sp.model.car.Car; import com.avaje.tests.sp.model.car.Wheel; +import org.junit.Assert; +import org.junit.Test; + +import java.util.LinkedList; +import java.util.List; public class TestManyToManySaveTwice extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/sp/model/IdEntity.java b/src/test/java/com/avaje/tests/sp/model/IdEntity.java index d8ccfc9b6..563ecafa6 100644 --- a/src/test/java/com/avaje/tests/sp/model/IdEntity.java +++ b/src/test/java/com/avaje/tests/sp/model/IdEntity.java @@ -9,49 +9,50 @@ import javax.persistence.Version; @MappedSuperclass public abstract class IdEntity { - @Id @GeneratedValue(strategy = GenerationType.SEQUENCE) - protected Long id; - - @Version - private int version; - - public int getVersion() { - return version; - } - - public void setVersion(int version) { - this.version = version; - } - - public Long getId() { - return id; - } + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + protected Long id; - public void setId(Long id) { - this.id = id; - } - - @Override - public int hashCode() { - return id == null ? 31 : 31 + 31 * id.hashCode(); - } - - @Override - public boolean equals(Object obj) { - - if (this == obj) - return true; - - if (obj == null || !this.getClass().isInstance(obj)) - return false; - - IdEntity o = (IdEntity)obj; - - return id != null && o.id != null && id.equals(o.id); - } - - @Override - public String toString() { - return this.getClass().getSimpleName() + "[" + id + "]"; - } + @Version + private int version; + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + @Override + public int hashCode() { + return id == null ? 31 : 31 + 31 * id.hashCode(); + } + + @Override + public boolean equals(Object obj) { + + if (this == obj) + return true; + + if (obj == null || !this.getClass().isInstance(obj)) + return false; + + IdEntity o = (IdEntity) obj; + + return id != null && o.id != null && id.equals(o.id); + } + + @Override + public String toString() { + return this.getClass().getSimpleName() + "[" + id + "]"; + } } diff --git a/src/test/java/com/avaje/tests/sp/model/car/Car.java b/src/test/java/com/avaje/tests/sp/model/car/Car.java index 4851c2e58..15f488936 100644 --- a/src/test/java/com/avaje/tests/sp/model/car/Car.java +++ b/src/test/java/com/avaje/tests/sp/model/car/Car.java @@ -1,6 +1,6 @@ package com.avaje.tests.sp.model.car; -import java.util.List; +import com.avaje.tests.sp.model.IdEntity; import javax.persistence.CascadeType; import javax.persistence.Entity; @@ -8,24 +8,23 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToMany; import javax.persistence.Table; - -import com.avaje.tests.sp.model.IdEntity; +import java.util.List; @Entity -@Table(name="sp_car_car") +@Table(name = "sp_car_car") public class Car extends IdEntity { - private static final long serialVersionUID = 2579148859565507940L; - - @ManyToMany(cascade = CascadeType.ALL) - @JoinTable(name = "sp_car_car_wheels", joinColumns = {@JoinColumn(name = "car")}, inverseJoinColumns = {@JoinColumn(name = "wheel")}) - private List wheels; - - public List getWheels() { - return wheels; - } - - public void setWheels(List wheels) { - this.wheels = wheels; - } + private static final long serialVersionUID = 2579148859565507940L; + + @ManyToMany(cascade = CascadeType.ALL) + @JoinTable(name = "sp_car_car_wheels", joinColumns = {@JoinColumn(name = "car")}, inverseJoinColumns = {@JoinColumn(name = "wheel")}) + private List wheels; + + public List getWheels() { + return wheels; + } + + public void setWheels(List wheels) { + this.wheels = wheels; + } } diff --git a/src/test/java/com/avaje/tests/sp/model/car/Wheel.java b/src/test/java/com/avaje/tests/sp/model/car/Wheel.java index 997fb0103..c2ac2ba49 100644 --- a/src/test/java/com/avaje/tests/sp/model/car/Wheel.java +++ b/src/test/java/com/avaje/tests/sp/model/car/Wheel.java @@ -1,14 +1,14 @@ package com.avaje.tests.sp.model.car; +import com.avaje.tests.sp.model.IdEntity; + import javax.persistence.Entity; import javax.persistence.Table; -import com.avaje.tests.sp.model.IdEntity; - @Entity -@Table(name="sp_car_wheel") +@Table(name = "sp_car_wheel") public class Wheel extends IdEntity { - - private static final long serialVersionUID = 2399600193947163469L; + + private static final long serialVersionUID = 2399600193947163469L; } diff --git a/src/test/java/com/avaje/tests/text/csv/TestCsvReader.java b/src/test/java/com/avaje/tests/text/csv/TestCsvReader.java index b7bde0248..cdd619f06 100644 --- a/src/test/java/com/avaje/tests/text/csv/TestCsvReader.java +++ b/src/test/java/com/avaje/tests/text/csv/TestCsvReader.java @@ -1,17 +1,16 @@ package com.avaje.tests.text.csv; -import java.io.File; -import java.io.FileReader; -import java.net.URL; -import java.util.Locale; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; 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 org.junit.Test; + +import java.io.File; +import java.io.FileReader; +import java.net.URL; +import java.util.Locale; public class TestCsvReader extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/text/csv/TestCsvReaderWithCallback.java b/src/test/java/com/avaje/tests/text/csv/TestCsvReaderWithCallback.java index a31ab0203..81068380a 100644 --- a/src/test/java/com/avaje/tests/text/csv/TestCsvReaderWithCallback.java +++ b/src/test/java/com/avaje/tests/text/csv/TestCsvReaderWithCallback.java @@ -1,12 +1,5 @@ package com.avaje.tests.text.csv; -import java.io.File; -import java.io.FileReader; -import java.net.URL; -import java.util.Locale; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; @@ -14,6 +7,12 @@ import com.avaje.ebean.text.csv.CsvReader; import com.avaje.ebean.text.csv.DefaultCsvCallback; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Test; + +import java.io.File; +import java.io.FileReader; +import java.net.URL; +import java.util.Locale; public class TestCsvReaderWithCallback extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/text/csv/TestTimeStringParser.java b/src/test/java/com/avaje/tests/text/csv/TestTimeStringParser.java index 2cc0449ae..6e52a969e 100644 --- a/src/test/java/com/avaje/tests/text/csv/TestTimeStringParser.java +++ b/src/test/java/com/avaje/tests/text/csv/TestTimeStringParser.java @@ -1,12 +1,11 @@ package com.avaje.tests.text.csv; -import java.sql.Time; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.text.TimeStringParser; +import org.junit.Assert; +import org.junit.Test; + +import java.sql.Time; public class TestTimeStringParser extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonBeanDescriptorParse.java b/src/test/java/com/avaje/tests/text/json/TestJsonBeanDescriptorParse.java index 2db845ca0..2a55721e1 100644 --- a/src/test/java/com/avaje/tests/text/json/TestJsonBeanDescriptorParse.java +++ b/src/test/java/com/avaje/tests/text/json/TestJsonBeanDescriptorParse.java @@ -1,48 +1,47 @@ package com.avaje.tests.text.json; -import java.io.IOException; -import java.io.StringReader; -import java.util.Set; - -import com.avaje.ebeaninternal.server.text.json.ReadJson; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.BeanState; import com.avaje.ebean.Ebean; import com.avaje.ebeaninternal.api.SpiEbeanServer; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; +import com.avaje.ebeaninternal.server.text.json.ReadJson; import com.avaje.tests.model.basic.Customer; import com.fasterxml.jackson.core.JsonParser; +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; +import java.io.StringReader; +import java.util.Set; public class TestJsonBeanDescriptorParse extends BaseTestCase { @Test public void test() throws IOException { - - SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null); - + + SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); + BeanDescriptor descriptor = server.getBeanDescriptor(Customer.class); - - + + StringReader reader = new StringReader("{\"id\":123,\"name\":\"Hello rob\"}"); JsonParser parser = server.json().createParser(reader); ReadJson readJson = new ReadJson(descriptor, parser, null, null); - + Customer customer = descriptor.jsonRead(readJson, null); - + Assert.assertEquals(Integer.valueOf(123), customer.getId()); Assert.assertEquals("Hello rob", customer.getName()); - + BeanState beanState = Ebean.getBeanState(customer); Set loadedProps = beanState.getLoadedProps(); - + Assert.assertEquals(2, loadedProps.size()); Assert.assertTrue(loadedProps.contains("id")); Assert.assertTrue(loadedProps.contains("name")); - + } - + } diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonInheritanceDiscriminator.java b/src/test/java/com/avaje/tests/text/json/TestJsonInheritanceDiscriminator.java index a0174a618..8aeb3ff60 100644 --- a/src/test/java/com/avaje/tests/text/json/TestJsonInheritanceDiscriminator.java +++ b/src/test/java/com/avaje/tests/text/json/TestJsonInheritanceDiscriminator.java @@ -1,18 +1,17 @@ package com.avaje.tests.text.json; -import java.io.IOException; -import java.sql.Date; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.text.json.JsonContext; import com.avaje.tests.model.basic.Animal; import com.avaje.tests.model.basic.Cat; import com.avaje.tests.model.basic.Dog; +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; +import java.sql.Date; +import java.util.List; public class TestJsonInheritanceDiscriminator extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonMap.java b/src/test/java/com/avaje/tests/text/json/TestJsonMap.java index ecf582b50..68cd8ecdb 100644 --- a/src/test/java/com/avaje/tests/text/json/TestJsonMap.java +++ b/src/test/java/com/avaje/tests/text/json/TestJsonMap.java @@ -64,11 +64,11 @@ public class TestJsonMap extends BaseTestCase { ResetBasicData.reset(); PathProperties pathProperties = - PathProperties.parse("(id,status,name,shippingAddress(id,line1,city),billingAddress(*),contacts(*))"); + PathProperties.parse("(id,status,name,shippingAddress(id,line1,city),billingAddress(*),contacts(*))"); List customers = Ebean.find(Customer.class) - .apply(pathProperties) - .findList(); + .apply(pathProperties) + .findList(); Ebean.json().toJson(customers, pathProperties); diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonSimple.java b/src/test/java/com/avaje/tests/text/json/TestJsonSimple.java index 5ccf92d73..ad763caec 100644 --- a/src/test/java/com/avaje/tests/text/json/TestJsonSimple.java +++ b/src/test/java/com/avaje/tests/text/json/TestJsonSimple.java @@ -1,5 +1,12 @@ package com.avaje.tests.text.json; +import com.avaje.ebean.BaseTestCase; +import com.avaje.ebean.Ebean; +import com.avaje.ebean.text.json.EJson; +import com.avaje.ebean.text.json.JsonContext; +import org.junit.Assert; +import org.junit.Test; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -9,14 +16,6 @@ import java.io.Reader; import java.util.LinkedHashMap; import java.util.Map; -import org.junit.Assert; -import org.junit.Test; - -import com.avaje.ebean.BaseTestCase; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.text.json.EJson; -import com.avaje.ebean.text.json.JsonContext; - public class TestJsonSimple extends BaseTestCase { @SuppressWarnings("unchecked") @@ -39,10 +38,10 @@ public class TestJsonSimple extends BaseTestCase { Object el = EJson.parse(jsonText); - Map e2 = EJson.parseObject("{\"a\":12, \"name\":{\"first\":\"rob\", \"last\":\"byg\"}}"); + Map e2 = EJson.parseObject("{\"a\":12, \"name\":{\"first\":\"rob\", \"last\":\"byg\"}}"); Assert.assertEquals(12L, e2.get("a")); - Assert.assertEquals("rob", ((Map)e2.get("name")).get("first")); + Assert.assertEquals("rob", ((Map) e2.get("name")).get("first")); Map m = new LinkedHashMap<>(); m.put("hello", "rob"); @@ -56,9 +55,9 @@ public class TestJsonSimple extends BaseTestCase { Object jsonElement = EJson.parse(s); Assert.assertNotNull(jsonElement); - Map e3 = EJson.parseObject("{\"name\":\"\\u60a8\\u597d\"}"); + Map e3 = EJson.parseObject("{\"name\":\"\\u60a8\\u597d\"}"); - Assert.assertTrue(((String)e3.get("name")).length()==2); + Assert.assertTrue(((String) e3.get("name")).length() == 2); } diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonSomeEnumWithToString.java b/src/test/java/com/avaje/tests/text/json/TestJsonSomeEnumWithToString.java index 8c9c1709f..6e4aa450d 100644 --- a/src/test/java/com/avaje/tests/text/json/TestJsonSomeEnumWithToString.java +++ b/src/test/java/com/avaje/tests/text/json/TestJsonSomeEnumWithToString.java @@ -1,15 +1,14 @@ package com.avaje.tests.text.json; -import java.io.IOException; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.text.json.JsonContext; import com.avaje.tests.model.basic.SomeEnum; import com.avaje.tests.model.basic.SomeEnumBean; +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; public class TestJsonSomeEnumWithToString extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitor.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitor.java index 77c4e9489..fbe560d02 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitor.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitor.java @@ -1,17 +1,16 @@ package com.avaje.tests.text.json; -import java.io.IOException; -import java.io.StringReader; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.text.json.JsonContext; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; +import java.io.StringReader; +import java.util.List; public class TestTextJsonBeanReadVisitor extends BaseTestCase { @@ -21,11 +20,11 @@ public class TestTextJsonBeanReadVisitor extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Customer.class) - .select("id, name, status, shippingAddress") - .fetch("billingAddress", "line1, city") - .fetch("billingAddress.country", "*") - .fetch("contacts", "firstName,email") - .order().desc("id").findList(); + .select("id, name, status, shippingAddress") + .fetch("billingAddress", "line1, city") + .fetch("billingAddress.country", "*") + .fetch("contacts", "firstName,email") + .order().desc("id").findList(); JsonContext json = Ebean.json(); diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonCompoundType.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonCompoundType.java index 67f008149..938d58337 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonCompoundType.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonCompoundType.java @@ -3,9 +3,11 @@ package com.avaje.tests.text.json; //import java.util.Currency; // //import org.junit.Assert; -import org.junit.Test; -// + import com.avaje.ebean.BaseTestCase; +import org.junit.Test; + +// //import com.avaje.ebean.Ebean; //import com.avaje.ebean.text.json.JsonContext; //import com.avaje.tests.model.ddd.DExhEntity; diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java index fc567be68..402f05a73 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java @@ -1,21 +1,20 @@ package com.avaje.tests.text.json; -import java.io.IOException; -import java.util.List; - -import com.avaje.tests.model.basic.CarAccessory; -import com.avaje.tests.model.basic.CarFuse; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.text.json.JsonContext; import com.avaje.tests.model.basic.Car; +import com.avaje.tests.model.basic.CarAccessory; +import com.avaje.tests.model.basic.CarFuse; import com.avaje.tests.model.basic.Trip; import com.avaje.tests.model.basic.Truck; import com.avaje.tests.model.basic.Vehicle; import com.avaje.tests.model.basic.VehicleDriver; +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; +import java.util.List; public class TestTextJsonInheritance extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonInsertUpdate.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonInsertUpdate.java index c32dc132c..d8e9f8d95 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonInsertUpdate.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonInsertUpdate.java @@ -1,15 +1,14 @@ package com.avaje.tests.text.json; -import java.io.IOException; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.text.json.JsonContext; import com.avaje.ebeaninternal.server.lib.util.StringHelper; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Test; + +import java.io.IOException; public class TestTextJsonInsertUpdate extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonInvokeLazy.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonInvokeLazy.java index cb785a72d..95c4e329d 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonInvokeLazy.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonInvokeLazy.java @@ -1,16 +1,15 @@ package com.avaje.tests.text.json; -import java.io.IOException; -import java.util.List; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.text.json.JsonContext; import com.avaje.ebean.text.json.JsonWriteOptions; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Test; + +import java.io.IOException; +import java.util.List; public class TestTextJsonInvokeLazy extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonReadManyLazyLoad.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonReadManyLazyLoad.java index df7014606..8ce9fc560 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonReadManyLazyLoad.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonReadManyLazyLoad.java @@ -1,11 +1,5 @@ package com.avaje.tests.text.json; -import java.io.IOException; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.text.PathProperties; @@ -13,6 +7,11 @@ import com.avaje.ebean.text.json.JsonContext; import com.avaje.ebean.text.json.JsonWriteOptions; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; +import java.util.List; public class TestTextJsonReadManyLazyLoad extends BaseTestCase { @@ -22,7 +21,7 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Customer.class).select("id, status, shippingAddress").order() - .desc("id").findList(); + .desc("id").findList(); JsonContext json = Ebean.json(); @@ -43,7 +42,7 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Customer.class).select("id, status, shippingAddress") - .fetch("contacts").order().desc("id").findList(); + .fetch("contacts").order().desc("id").findList(); JsonContext json = Ebean.json(); @@ -64,8 +63,8 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Customer.class).select("id, name, status, shippingAddress") - // .fetch("contacts") - .order().desc("id").findList(); + // .fetch("contacts") + .order().desc("id").findList(); JsonContext json = Ebean.json(); diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonReferenceBean.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonReferenceBean.java index fea42d6b6..aaae27598 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonReferenceBean.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonReferenceBean.java @@ -1,11 +1,5 @@ package com.avaje.tests.text.json; -import java.io.IOException; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.BeanState; import com.avaje.ebean.Ebean; @@ -18,6 +12,11 @@ import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.Product; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; +import java.util.List; public class TestTextJsonReferenceBean extends BaseTestCase { @@ -26,8 +25,8 @@ public class TestTextJsonReferenceBean extends BaseTestCase { ResetBasicData.reset(); - SpiEbeanServer server = (SpiEbeanServer)Ebean.getServer(null); - + SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); + JsonContext jsonContext = Ebean.json(); Product product = Ebean.getReference(Product.class, 1); @@ -43,12 +42,12 @@ public class TestTextJsonReferenceBean extends BaseTestCase { Product refProd = jsonContext.toBean(Product.class, jsonString); BeanDescriptor prodDesc = server.getBeanDescriptor(Product.class); - EntityBean eb = (EntityBean)refProd; + EntityBean eb = (EntityBean) refProd; prodDesc.isReference(eb._ebean_getIntercept()); - + BeanState beanState = Ebean.getBeanState(refProd); Assert.assertTrue(beanState.isNew()); - + String name = refProd.getName(); Assert.assertNull(name); @@ -60,10 +59,10 @@ public class TestTextJsonReferenceBean extends BaseTestCase { } List orders = Ebean.find(Order.class) - // .setUseCache(false) - .select("status, orderDate, shipDate, customer").fetch("details", "*") - // .fetch("details.product","id") - .order().asc("id").findList(); + // .setUseCache(false) + .select("status, orderDate, shipDate, customer").fetch("details", "*") + // .fetch("details.product","id") + .order().asc("id").findList(); Order order = orders.get(0); @@ -73,10 +72,10 @@ public class TestTextJsonReferenceBean extends BaseTestCase { Order o2 = jsonContext.toBean(Order.class, jsonOrder); Customer customer = o2.getCustomer(); - + BeanDescriptor custDesc = server.getBeanDescriptor(Customer.class); - Assert.assertTrue(custDesc.isReference(((EntityBean)customer)._ebean_getIntercept())); + Assert.assertTrue(custDesc.isReference(((EntityBean) customer)._ebean_getIntercept())); } diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonSimple.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonSimple.java index 47767bd08..ed935b760 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonSimple.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonSimple.java @@ -24,7 +24,8 @@ public class TestTextJsonSimple extends BaseTestCase { class CustJsonRead implements JsonReadBeanVisitor { - Customer bean; Map unmapped; + Customer bean; + Map unmapped; @Override public void visit(Customer bean, Map unmapped) { @@ -35,7 +36,8 @@ public class TestTextJsonSimple extends BaseTestCase { class ContactJsonRead implements JsonReadBeanVisitor { - Contact bean; Map unmapped; + Contact bean; + Map unmapped; @Override public void visit(Contact bean, Map unmapped) { @@ -46,7 +48,8 @@ public class TestTextJsonSimple extends BaseTestCase { class AddressJsonRead implements JsonReadBeanVisitor
{ - Address bean; Map unmapped; + Address bean; + Map unmapped; @Override public void visit(Address bean, Map unmapped) { @@ -61,10 +64,10 @@ public class TestTextJsonSimple extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Customer.class) - .select("id, name, status, shippingAddress") - .fetch("billingAddress", "line1, city").fetch("billingAddress.country", "*") - .fetch("contacts", "firstName,email") - .order().desc("id").findList(); + .select("id, name, status, shippingAddress") + .fetch("billingAddress", "line1, city").fetch("billingAddress.country", "*") + .fetch("contacts", "firstName,email") + .order().desc("id").findList(); EbeanServer server = Ebean.getServer(null); @@ -99,8 +102,8 @@ public class TestTextJsonSimple extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Customer.class) - .select("id, name") - .order().desc("id").findList(); + .select("id, name") + .order().desc("id").findList(); EbeanServer server = Ebean.getServer(null); @@ -122,8 +125,8 @@ public class TestTextJsonSimple extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Customer.class) - .select("id, name") - .order().desc("id").findList(); + .select("id, name") + .order().desc("id").findList(); EbeanServer server = Ebean.getServer(null); diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonSuperSimple.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonSuperSimple.java index f46ff2963..40b74e65f 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonSuperSimple.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonSuperSimple.java @@ -1,17 +1,16 @@ package com.avaje.tests.text.json; -import java.io.IOException; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; import com.avaje.ebean.text.json.JsonContext; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; +import java.util.List; public class TestTextJsonSuperSimple extends BaseTestCase { @@ -21,7 +20,7 @@ public class TestTextJsonSuperSimple extends BaseTestCase { ResetBasicData.reset(); List list = Ebean.find(Customer.class).select("id, name").order().desc("id") - .findList(); + .findList(); EbeanServer server = Ebean.getServer(null); diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonUpdateCascade.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonUpdateCascade.java index ffd599d4a..21c92a433 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonUpdateCascade.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonUpdateCascade.java @@ -1,11 +1,5 @@ package com.avaje.tests.text.json; -import java.io.IOException; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; @@ -18,6 +12,11 @@ import com.avaje.tests.model.basic.Order.Status; import com.avaje.tests.model.basic.OrderDetail; import com.avaje.tests.model.basic.Product; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; +import java.util.List; public class TestTextJsonUpdateCascade extends BaseTestCase { @@ -87,8 +86,8 @@ public class TestTextJsonUpdateCascade extends BaseTestCase { jsonContext.toJson(u0); String s = "{\"userid\":" + u0.getUserid() - + ",\"userName\":\"userj1\", \"roles\":[{\"roleid\":" + r2.getRoleid() + "},{\"roleid\":" - + r3.getRoleid() + "}]} "; + + ",\"userName\":\"userj1\", \"roles\":[{\"roleid\":" + r2.getRoleid() + "},{\"roleid\":" + + r3.getRoleid() + "}]} "; MUser updMUser = jsonContext.toBean(MUser.class, s); diff --git a/src/test/java/com/avaje/tests/timezone/TimezoneTests.java b/src/test/java/com/avaje/tests/timezone/TimezoneTests.java index f70574345..4860b513f 100644 --- a/src/test/java/com/avaje/tests/timezone/TimezoneTests.java +++ b/src/test/java/com/avaje/tests/timezone/TimezoneTests.java @@ -50,11 +50,11 @@ public class TimezoneTests { PreparedStatement statement = connection.prepareStatement("select * from tztest"); ResultSet resultSet = statement.executeQuery(); while (resultSet.next()) { - System.out.println(" zone:"+resultSet.getString("zone")); - System.out.println(" ts:"+tsof(resultSet.getTimestamp("ts"))); - System.out.println(" tstz:"+tsof(resultSet.getTimestamp("tstz"))); - System.out.println(" ts1:"+tsof(resultSet.getTimestamp("ts1", cal()))); - System.out.println("tstz1:"+tsof(resultSet.getTimestamp("tstz1", cal()))); + System.out.println(" zone:" + resultSet.getString("zone")); + System.out.println(" ts:" + tsof(resultSet.getTimestamp("ts"))); + System.out.println(" tstz:" + tsof(resultSet.getTimestamp("tstz"))); + System.out.println(" ts1:" + tsof(resultSet.getTimestamp("ts1", cal()))); + System.out.println("tstz1:" + tsof(resultSet.getTimestamp("tstz1", cal()))); } System.out.println(""); resultSet.close(); @@ -63,7 +63,7 @@ public class TimezoneTests { } private String tsof(Timestamp timestamp) { - return ""+timestamp.getTime()+", "+timestamp.toString()+", "+timestamp.toInstant(); + return "" + timestamp.getTime() + ", " + timestamp.toString() + ", " + timestamp.toInstant(); } private void setZone(String zone) { diff --git a/src/test/java/com/avaje/tests/timezone/TzBean.java b/src/test/java/com/avaje/tests/timezone/TzBean.java index 258c8b2d5..86a3092ed 100644 --- a/src/test/java/com/avaje/tests/timezone/TzBean.java +++ b/src/test/java/com/avaje/tests/timezone/TzBean.java @@ -7,7 +7,7 @@ import javax.persistence.Table; import java.sql.Timestamp; @Entity -@Table(name="tz_bean") +@Table(name = "tz_bean") public class TzBean { @Id diff --git a/src/test/java/com/avaje/tests/timezone/TzBeanTests.java b/src/test/java/com/avaje/tests/timezone/TzBeanTests.java index d03a20fa1..b7e519e4d 100644 --- a/src/test/java/com/avaje/tests/timezone/TzBeanTests.java +++ b/src/test/java/com/avaje/tests/timezone/TzBeanTests.java @@ -10,7 +10,6 @@ import java.util.TimeZone; //import java.util.TimeZone; - // Postgres // manually create table // create table tz_bean (id serial, mode varchar(40), ts timestamp, tstz timestamp with time zone); @@ -79,16 +78,16 @@ public class TzBeanTests { System.setProperty("ebean.dataTimeZone", "UTC"); List list = Ebean.find(TzBean.class) - .findList(); + .findList(); for (TzBean bean : list) { - System.out.println(" mode:"+bean.getMode()); - System.out.println(" ts:"+tsof(bean.getTs())); - System.out.println(" tstz:"+tsof(bean.getTstz())); + System.out.println(" mode:" + bean.getMode()); + System.out.println(" ts:" + tsof(bean.getTs())); + System.out.println(" tstz:" + tsof(bean.getTstz())); } } private String tsof(Timestamp timestamp) { - return ""+timestamp.getTime()+", "+timestamp.toString()+", "+timestamp.toInstant(); + return "" + timestamp.getTime() + ", " + timestamp.toString() + ", " + timestamp.toInstant(); } } diff --git a/src/test/java/com/avaje/tests/transaction/TestBatchPersistCascade.java b/src/test/java/com/avaje/tests/transaction/TestBatchPersistCascade.java index db66fb72f..fd9dfb7ea 100644 --- a/src/test/java/com/avaje/tests/transaction/TestBatchPersistCascade.java +++ b/src/test/java/com/avaje/tests/transaction/TestBatchPersistCascade.java @@ -68,7 +68,7 @@ public class TestBatchPersistCascade extends BaseTestCase { txn.setBatchOnCascade(PersistBatch.ALL); for (int i = 0; i < 3; i++) { - UTMaster master = createMaster(i+500); + UTMaster master = createMaster(i + 500); logger.info("save ------------ {}", i); server.save(master); } @@ -77,11 +77,11 @@ public class TestBatchPersistCascade extends BaseTestCase { UTMaster lastMaster = null; for (UTMaster utMaster : list) { - utMaster.setName(utMaster.getName()+" + mod"); + utMaster.setName(utMaster.getName() + " + mod"); List details = utMaster.getDetails(); for (UTDetail detail : details) { - detail.setQty(detail.getQty()+7); - detail.setName(detail.getName()+" + foo"); + detail.setQty(detail.getQty() + 7); + detail.setName(detail.getName() + " + foo"); } server.save(utMaster); @@ -91,7 +91,7 @@ public class TestBatchPersistCascade extends BaseTestCase { logger.info("starting some inserts ------------ "); for (int i = 0; i < 3; i++) { - UTMaster master = createMaster(i+1000); + UTMaster master = createMaster(i + 1000); logger.info("save ------------ {}", i); server.save(master); if (i == 1) { @@ -112,7 +112,7 @@ public class TestBatchPersistCascade extends BaseTestCase { private UTDetail createUTDetail(String master, int count) { UTDetail detail = new UTDetail(); - detail.setName(master+"-"+count); + detail.setName(master + "-" + count); detail.setAmount(50d); detail.setQty(count); return detail; @@ -120,11 +120,11 @@ public class TestBatchPersistCascade extends BaseTestCase { private UTMaster createMaster(int count) { - String name = "master"+count; + String name = "master" + count; UTMaster m0 = new UTMaster(); m0.setName(name); - for (int i =0; i< 5; i++) { + for (int i = 0; i < 5; i++) { m0.addDetail(createUTDetail(name, i)); } return m0; diff --git a/src/test/java/com/avaje/tests/transaction/TestCreateTransactionWithIsolation.java b/src/test/java/com/avaje/tests/transaction/TestCreateTransactionWithIsolation.java index 575a0e0d9..4b372e6ee 100644 --- a/src/test/java/com/avaje/tests/transaction/TestCreateTransactionWithIsolation.java +++ b/src/test/java/com/avaje/tests/transaction/TestCreateTransactionWithIsolation.java @@ -1,6 +1,6 @@ package com.avaje.tests.transaction; -import com.avaje.ebean.*; +import com.avaje.ebean.BaseTestCase; import org.junit.Test; public class TestCreateTransactionWithIsolation extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/transaction/TestDeleteFromPersistenceContext.java b/src/test/java/com/avaje/tests/transaction/TestDeleteFromPersistenceContext.java index 79d26407b..6571f37ed 100644 --- a/src/test/java/com/avaje/tests/transaction/TestDeleteFromPersistenceContext.java +++ b/src/test/java/com/avaje/tests/transaction/TestDeleteFromPersistenceContext.java @@ -15,29 +15,29 @@ public class TestDeleteFromPersistenceContext extends BaseTestCase { @Test public void testDeleteBean() { - + ResetBasicData.reset(); - + EBasicVer bean = new EBasicVer("Please Delete Me"); Ebean.save(bean); - - SpiTransaction transaction = (SpiTransaction)Ebean.beginTransaction(); + + SpiTransaction transaction = (SpiTransaction) Ebean.beginTransaction(); try { - + EBasicVer bean2 = Ebean.find(EBasicVer.class, bean.getId()); assertNotSame(bean, bean2); - + EBasicVer bean3 = Ebean.find(EBasicVer.class, bean.getId()); - // same instance from PersistenceContext + // same instance from PersistenceContext assertSame(bean2, bean3); - + Object bean4 = transaction.getPersistenceContext().get(EBasicVer.class, bean.getId()); assertSame(bean2, bean4); - + Ebean.delete(bean2); Object bean5 = transaction.getPersistenceContext().get(EBasicVer.class, bean.getId()); - assertNull("Bean is deleted from PersistenceContext",bean5); + assertNull("Bean is deleted from PersistenceContext", bean5); Ebean.commitTransaction(); @@ -46,12 +46,12 @@ public class TestDeleteFromPersistenceContext extends BaseTestCase { } EBasicVer bean6 = Ebean.find(EBasicVer.class).where().eq("id", bean.getId()).findUnique(); - assertNull("Bean where id eq is not found "+bean6, bean6); + assertNull("Bean where id eq is not found " + bean6, bean6); awaitL2Cache(); EBasicVer bean7 = Ebean.find(EBasicVer.class, bean.getId()); - assertNull("Bean is not expected to be found? "+bean7, bean7); + assertNull("Bean is not expected to be found? " + bean7, bean7); } - + } diff --git a/src/test/java/com/avaje/tests/transaction/TestInsertManyAndRef.java b/src/test/java/com/avaje/tests/transaction/TestInsertManyAndRef.java index e83c9b328..ed8f1d652 100644 --- a/src/test/java/com/avaje/tests/transaction/TestInsertManyAndRef.java +++ b/src/test/java/com/avaje/tests/transaction/TestInsertManyAndRef.java @@ -1,14 +1,13 @@ package com.avaje.tests.transaction; -import java.util.ArrayList; -import java.util.List; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.BBookmark; import com.avaje.tests.model.basic.BBookmarkUser; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; public class TestInsertManyAndRef extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/transaction/TestNested.java b/src/test/java/com/avaje/tests/transaction/TestNested.java index 7d0519c77..74fb4e870 100644 --- a/src/test/java/com/avaje/tests/transaction/TestNested.java +++ b/src/test/java/com/avaje/tests/transaction/TestNested.java @@ -1,11 +1,10 @@ package com.avaje.tests.transaction; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.TxRunnable; +import org.junit.Assert; +import org.junit.Test; public class TestNested extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequired.java b/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequired.java index 163463ed5..685103f9e 100644 --- a/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequired.java +++ b/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequired.java @@ -1,6 +1,10 @@ package com.avaje.tests.transaction; -import com.avaje.ebean.*; +import com.avaje.ebean.BaseTestCase; +import com.avaje.ebean.Ebean; +import com.avaje.ebean.EbeanServer; +import com.avaje.ebean.Transaction; +import com.avaje.ebean.TxScope; import com.avaje.tests.model.basic.Country; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Product; diff --git a/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiredWithFailure.java b/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiredWithFailure.java index 1f52a9c03..af6d811c5 100644 --- a/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiredWithFailure.java +++ b/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiredWithFailure.java @@ -1,7 +1,14 @@ package com.avaje.tests.transaction; -import com.avaje.ebean.*; -import com.avaje.tests.model.basic.*; +import com.avaje.ebean.BaseTestCase; +import com.avaje.ebean.Ebean; +import com.avaje.ebean.EbeanServer; +import com.avaje.ebean.Transaction; +import com.avaje.ebean.TxScope; +import com.avaje.tests.model.basic.Country; +import com.avaje.tests.model.basic.Customer; +import com.avaje.tests.model.basic.EBasic; +import com.avaje.tests.model.basic.Product; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiresNew.java b/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiresNew.java index 21d85d4b0..54ea5c366 100644 --- a/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiresNew.java +++ b/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiresNew.java @@ -1,6 +1,10 @@ package com.avaje.tests.transaction; -import com.avaje.ebean.*; +import com.avaje.ebean.BaseTestCase; +import com.avaje.ebean.Ebean; +import com.avaje.ebean.EbeanServer; +import com.avaje.ebean.Transaction; +import com.avaje.ebean.TxScope; import com.avaje.tests.model.basic.Country; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Product; diff --git a/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiresNewWithFailure.java b/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiresNewWithFailure.java index a99324c69..10cbba35b 100644 --- a/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiresNewWithFailure.java +++ b/src/test/java/com/avaje/tests/transaction/TestNestedBeginRequiresNewWithFailure.java @@ -1,6 +1,10 @@ package com.avaje.tests.transaction; -import com.avaje.ebean.*; +import com.avaje.ebean.BaseTestCase; +import com.avaje.ebean.Ebean; +import com.avaje.ebean.EbeanServer; +import com.avaje.ebean.Transaction; +import com.avaje.ebean.TxScope; import com.avaje.tests.model.basic.Country; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Product; diff --git a/src/test/java/com/avaje/tests/transaction/TestPersistContextClear.java b/src/test/java/com/avaje/tests/transaction/TestPersistContextClear.java index b79c30348..f3b8c6db1 100644 --- a/src/test/java/com/avaje/tests/transaction/TestPersistContextClear.java +++ b/src/test/java/com/avaje/tests/transaction/TestPersistContextClear.java @@ -1,10 +1,5 @@ package com.avaje.tests.transaction; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; @@ -14,6 +9,10 @@ import com.avaje.ebeaninternal.api.SpiTransaction; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Order; import com.avaje.tests.model.basic.ResetBasicData; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestPersistContextClear extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/transaction/TransactionNotTerminatedAfterRollback.java b/src/test/java/com/avaje/tests/transaction/TransactionNotTerminatedAfterRollback.java index aff082d25..6dec3f255 100644 --- a/src/test/java/com/avaje/tests/transaction/TransactionNotTerminatedAfterRollback.java +++ b/src/test/java/com/avaje/tests/transaction/TransactionNotTerminatedAfterRollback.java @@ -1,73 +1,79 @@ package com.avaje.tests.transaction; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.List; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PersistenceException; -import javax.persistence.Table; - +import com.avaje.ebean.Ebean; +import com.avaje.ebean.annotation.Transactional; import org.avaje.agentloader.AgentLoader; import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.avaje.ebean.Ebean; -import com.avaje.ebean.annotation.Transactional; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.PersistenceException; +import javax.persistence.Table; +import java.util.List; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * It shows the issue that the user record does NOT rolback when there is an exception thrown */ public class TransactionNotTerminatedAfterRollback { - private static final Logger LOG = LoggerFactory.getLogger(TransactionNotTerminatedAfterRollback.class); + private static final Logger LOG = LoggerFactory.getLogger(TransactionNotTerminatedAfterRollback.class); - @BeforeClass public static void preStart() { - LOG.debug("... preStart"); - // display the log message to see if the UserService is enhanced - AgentLoader.loadAgentFromClasspath("avaje-ebeanorm-agent", "debug=1"); - } + @BeforeClass + public static void preStart() { + LOG.debug("... preStart"); + // display the log message to see if the UserService is enhanced + AgentLoader.loadAgentFromClasspath("avaje-ebeanorm-agent", "debug=1"); + } - @Test public void test() { - try { - new UserService().create(new User(1L, "David")); - fail("Exception should be thrown"); - } catch (PersistenceException pe) { - LOG.error("e: " + pe); - } - List users = Ebean.find(User.class).findList(); - LOG.debug("users: {}", users); - assertTrue("users should be empty", users.isEmpty()); - } + @Test + public void test() { + try { + new UserService().create(new User(1L, "David")); + fail("Exception should be thrown"); + } catch (PersistenceException pe) { + LOG.error("e: " + pe); + } + List users = Ebean.find(User.class).findList(); + LOG.debug("users: {}", users); + assertTrue("users should be empty", users.isEmpty()); + } - @Transactional(rollbackFor = PersistenceException.class) public class UserService { - public void create(User i) { - Ebean.save(i); - Ebean.save(new User(1L, "Peter")); // make it throw exception and rollback - } - } + @Transactional(rollbackFor = PersistenceException.class) + public class UserService { + public void create(User i) { + Ebean.save(i); + Ebean.save(new User(1L, "Peter")); // make it throw exception and rollback + } + } - @Entity @Table(name="tx_user") public static class User { - @Id Long id; - String name; + @Entity + @Table(name = "tx_user") + public static class User { + @Id + Long id; + String name; - public User() {} + public User() { + } - public User(Long id, String name) { - this.id = id; - this.name = name; - } + public User(Long id, String name) { + this.id = id; + this.name = name; + } - @Override public String toString() { - StringBuilder s = new StringBuilder(); - s.append("{"); - s.append("id: ").append(id).append(", "); - s.append("name: ").append(name); - s.append("}"); - return s.toString(); - } - } + @Override + public String toString() { + StringBuilder s = new StringBuilder(); + s.append("{"); + s.append("id: ").append(id).append(", "); + s.append("name: ").append(name); + s.append("}"); + return s.toString(); + } + } } diff --git a/src/test/java/com/avaje/tests/types/TestFileType.java b/src/test/java/com/avaje/tests/types/TestFileType.java index c08dce4eb..657b7327c 100644 --- a/src/test/java/com/avaje/tests/types/TestFileType.java +++ b/src/test/java/com/avaje/tests/types/TestFileType.java @@ -26,9 +26,9 @@ public class TestFileType extends BaseTestCase { Ebean.save(bean0); SomeFileBean bean1 = Ebean.find(SomeFileBean.class) - .select("name, file") - .setId(bean0.getId()) - .findUnique(); + .select("name, file") + .setId(bean0.getId()) + .findUnique(); assertEquals("afile", bean1.getName()); assertNull(bean1.getContent()); @@ -37,16 +37,16 @@ public class TestFileType extends BaseTestCase { Ebean.save(bean1); SomeFileBean bean2 = Ebean.find(SomeFileBean.class) - .select("name, file") - .setId(bean0.getId()) - .findUnique(); + .select("name, file") + .setId(bean0.getId()) + .findUnique(); assertEquals("afile", bean2.getName()); assertNotNull(bean2.getContent()); Ebean.delete(bean1); } - @Test + @Test public void test_insertUpdateDelete() { assertTrue(file.exists()); @@ -59,9 +59,9 @@ public class TestFileType extends BaseTestCase { Ebean.save(bean0); SomeFileBean bean1 = Ebean.find(SomeFileBean.class) - .select("name, file") - .setId(bean0.getId()) - .findUnique(); + .select("name, file") + .setId(bean0.getId()) + .findUnique(); assertEquals("afile", bean1.getName()); assertNotNull(bean1.getContent()); @@ -74,9 +74,9 @@ public class TestFileType extends BaseTestCase { SomeFileBean bean2 = Ebean.find(SomeFileBean.class) - .select("name, file") - .setId(bean0.getId()) - .findUnique(); + .select("name, file") + .setId(bean0.getId()) + .findUnique(); assertEquals(file2.length(), bean2.getContent().length()); @@ -86,9 +86,9 @@ public class TestFileType extends BaseTestCase { Ebean.save(bean2); SomeFileBean bean3 = Ebean.find(SomeFileBean.class) - .select("name, file") - .setId(bean0.getId()) - .findUnique(); + .select("name, file") + .setId(bean0.getId()) + .findUnique(); assertNull(bean3.getContent()); diff --git a/src/test/java/com/avaje/tests/types/TestFileTypeFetching.java b/src/test/java/com/avaje/tests/types/TestFileTypeFetching.java index a1fab4217..250a4c536 100644 --- a/src/test/java/com/avaje/tests/types/TestFileTypeFetching.java +++ b/src/test/java/com/avaje/tests/types/TestFileTypeFetching.java @@ -28,8 +28,8 @@ public class TestFileTypeFetching extends BaseTestCase { Ebean.save(bean0); SomeFileBean bean1 = Ebean.find(SomeFileBean.class) - .setId(bean0.getId()) - .findUnique(); + .setId(bean0.getId()) + .findUnique(); BeanState beanState = Ebean.getBeanState(bean1); Set loadedProps = beanState.getLoadedProps(); @@ -48,9 +48,9 @@ public class TestFileTypeFetching extends BaseTestCase { Ebean.update(statelessUpdateBean); SomeFileBean bean2 = Ebean.find(SomeFileBean.class) - .select("file") - .setId(bean0.getId()) - .findUnique(); + .select("file") + .setId(bean0.getId()) + .findUnique(); assertEquals(file2.length(), bean2.getContent().length()); diff --git a/src/test/java/com/avaje/tests/types/TestHstore.java b/src/test/java/com/avaje/tests/types/TestHstore.java index 2bd8c9d44..684963efe 100644 --- a/src/test/java/com/avaje/tests/types/TestHstore.java +++ b/src/test/java/com/avaje/tests/types/TestHstore.java @@ -65,7 +65,7 @@ public class TestHstore extends BaseTestCase { EBasicHstore found = Ebean.find(EBasicHstore.class, bean.getId()); found.setName("modNamePlus"); - found.getMap().put("foo","9987"); + found.getMap().put("foo", "9987"); LoggedSqlCollector.start(); Ebean.save(found); diff --git a/src/test/java/com/avaje/tests/types/TestNewTypes.java b/src/test/java/com/avaje/tests/types/TestNewTypes.java index 5fc5edaa4..02ef14732 100644 --- a/src/test/java/com/avaje/tests/types/TestNewTypes.java +++ b/src/test/java/com/avaje/tests/types/TestNewTypes.java @@ -8,16 +8,24 @@ import org.junit.Test; import java.io.File; import java.io.IOException; import java.nio.file.Paths; -import java.time.*; +import java.time.DayOfWeek; +import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.Month; +import java.time.OffsetDateTime; +import java.time.Year; +import java.time.YearMonth; +import java.time.ZoneId; +import java.time.ZonedDateTime; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class TestNewTypes extends BaseTestCase { - private static final String TEMP_PATH = new File("/tmp").getAbsolutePath(); + private static final String TEMP_PATH = new File("/tmp").getAbsolutePath(); + @Test public void testInsertUpdate() throws IOException, InterruptedException { SomeNewTypesBean bean = new SomeNewTypesBean(); diff --git a/src/test/java/com/avaje/tests/types/TestPeriodType.java b/src/test/java/com/avaje/tests/types/TestPeriodType.java index 4378f46f6..1b8c80043 100644 --- a/src/test/java/com/avaje/tests/types/TestPeriodType.java +++ b/src/test/java/com/avaje/tests/types/TestPeriodType.java @@ -39,29 +39,29 @@ public class TestPeriodType extends BaseTestCase { assertNull(bean3.getAnniversary()); List anniversaryList = Ebean.find(SomePeriodBean.class) - .where() - .eq("anniversary", MonthDay.of(4, 29)) - .eq("period_years", 3) - .eq("period_months", 4) - .findList(); + .where() + .eq("anniversary", MonthDay.of(4, 29)) + .eq("period_years", 3) + .eq("period_months", 4) + .findList(); assertEquals(1, anniversaryList.size()); // must use year 2000 for range predicates // ... using 2001 here so not finding anything anniversaryList = Ebean.find(SomePeriodBean.class) - .where() - .gt("anniversary", Date.valueOf(LocalDate.of(2001,4, 29))) - .findList(); + .where() + .gt("anniversary", Date.valueOf(LocalDate.of(2001, 4, 29))) + .findList(); assertEquals(0, anniversaryList.size()); // can use year 2000 for range predicates // ... and can use LocalDate to bind anniversaryList = Ebean.find(SomePeriodBean.class) - .where() - .gt("anniversary", LocalDate.of(2000,4, 22)) - .findList(); + .where() + .gt("anniversary", LocalDate.of(2000, 4, 22)) + .findList(); assertEquals(1, anniversaryList.size()); diff --git a/src/test/java/com/avaje/tests/unidirectional/TestUniDirectional.java b/src/test/java/com/avaje/tests/unidirectional/TestUniDirectional.java index 44f0cf9b5..f967aae1e 100644 --- a/src/test/java/com/avaje/tests/unidirectional/TestUniDirectional.java +++ b/src/test/java/com/avaje/tests/unidirectional/TestUniDirectional.java @@ -1,14 +1,13 @@ package com.avaje.tests.unidirectional; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.UTDetail; import com.avaje.tests.model.basic.UTMaster; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestUniDirectional extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/unitinternal/HelloMain.java b/src/test/java/com/avaje/tests/unitinternal/HelloMain.java index 659ade8a4..421ff81ae 100644 --- a/src/test/java/com/avaje/tests/unitinternal/HelloMain.java +++ b/src/test/java/com/avaje/tests/unitinternal/HelloMain.java @@ -1,16 +1,15 @@ package com.avaje.tests.unitinternal; -import java.io.File; - -import org.avaje.agentloader.AgentLoader; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.avaje.ebean.EbeanServer; import com.avaje.ebean.EbeanServerFactory; -import org.avaje.datasource.DataSourceConfig; import com.avaje.ebean.config.ServerConfig; import com.avaje.tests.model.basic.TOne; +import org.avaje.agentloader.AgentLoader; +import org.avaje.datasource.DataSourceConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; public class HelloMain { diff --git a/src/test/java/com/avaje/tests/unitinternal/TestBasics.java b/src/test/java/com/avaje/tests/unitinternal/TestBasics.java index 520ec21ff..8d6d5a0d0 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestBasics.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestBasics.java @@ -1,29 +1,28 @@ - package com.avaje.tests.unitinternal; import org.junit.Assert; import org.junit.Test; -public class TestBasics { +public class TestBasics { - private String parentPath(String path) { - - int pos = path.lastIndexOf('.'); - if (pos == -1){ - return null; - } else { - return path.substring(0, pos); - } - } - - @Test - public void testParentPath() { - - Assert.assertTrue((parentPath("banana") == null)); - Assert.assertTrue((parentPath("banana.apple").equals("banana"))); - Assert.assertTrue((parentPath("banana.apple.o").equals("banana.apple"))); - - } + private String parentPath(String path) { + + int pos = path.lastIndexOf('.'); + if (pos == -1) { + return null; + } else { + return path.substring(0, pos); + } + } + + @Test + public void testParentPath() { + + Assert.assertTrue((parentPath("banana") == null)); + Assert.assertTrue((parentPath("banana.apple").equals("banana"))); + Assert.assertTrue((parentPath("banana.apple.o").equals("banana.apple"))); + + } } diff --git a/src/test/java/com/avaje/tests/unitinternal/TestEqualsOnEnhanced.java b/src/test/java/com/avaje/tests/unitinternal/TestEqualsOnEnhanced.java index 83a6f0ea3..d88af051c 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestEqualsOnEnhanced.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestEqualsOnEnhanced.java @@ -1,12 +1,11 @@ package com.avaje.tests.unitinternal; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.bean.EntityBean; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.Order; +import org.junit.Assert; +import org.junit.Test; public class TestEqualsOnEnhanced extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/unitinternal/TestLocaleParse.java b/src/test/java/com/avaje/tests/unitinternal/TestLocaleParse.java index 0f12dfa1c..33eed175e 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestLocaleParse.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestLocaleParse.java @@ -1,11 +1,10 @@ package com.avaje.tests.unitinternal; -import java.util.Locale; - +import com.avaje.ebeaninternal.server.type.ScalarTypeLocale; import org.junit.Assert; import org.junit.Test; -import com.avaje.ebeaninternal.server.type.ScalarTypeLocale; +import java.util.Locale; public class TestLocaleParse { diff --git a/src/test/java/com/avaje/tests/unitinternal/TestNamingConvention.java b/src/test/java/com/avaje/tests/unitinternal/TestNamingConvention.java index ae5c8a196..2f251362a 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestNamingConvention.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestNamingConvention.java @@ -4,16 +4,16 @@ import junit.framework.TestCase; public class TestNamingConvention extends TestCase { - /** - * Test dummy method to allow rest to be commented out. - */ - public void testDummy() { - - } - - // Comment out for now so the entities do not get registered - // Run this manually as needed. - + /** + * Test dummy method to allow rest to be commented out. + */ + public void testDummy() { + + } + + // Comment out for now so the entities do not get registered + // Run this manually as needed. + // @Entity // @Table(name = "table1", schema = "annotationschema") // public class FooBar1 { diff --git a/src/test/java/com/avaje/tests/unitinternal/TestNullCollectionSet.java b/src/test/java/com/avaje/tests/unitinternal/TestNullCollectionSet.java index 108060325..f428afc12 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestNullCollectionSet.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestNullCollectionSet.java @@ -1,15 +1,14 @@ package com.avaje.tests.unitinternal; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.bean.BeanCollection; import com.avaje.tests.model.basic.ENullCollection; import com.avaje.tests.model.basic.ENullCollectionDetail; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestNullCollectionSet extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/unitinternal/TestOrderByParse.java b/src/test/java/com/avaje/tests/unitinternal/TestOrderByParse.java index 940b352e8..ff7507bf4 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestOrderByParse.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestOrderByParse.java @@ -4,9 +4,7 @@ import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.OrderBy; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; /** * Test the OrderBy object and especially its parsing. diff --git a/src/test/java/com/avaje/tests/unitinternal/TestOriginIntEncoding.java b/src/test/java/com/avaje/tests/unitinternal/TestOriginIntEncoding.java index f5e753ab6..627285b93 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestOriginIntEncoding.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestOriginIntEncoding.java @@ -1,10 +1,9 @@ package com.avaje.tests.unitinternal; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.bean.CallStack; +import org.junit.Assert; +import org.junit.Test; public class TestOriginIntEncoding extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/unitinternal/TestTxTypeOnTransactional.java b/src/test/java/com/avaje/tests/unitinternal/TestTxTypeOnTransactional.java index 63a76739a..7fdd5400f 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestTxTypeOnTransactional.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestTxTypeOnTransactional.java @@ -1,18 +1,17 @@ package com.avaje.tests.unitinternal; -import javax.persistence.OptimisticLockException; - -import org.junit.Assert; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.Transaction; import com.avaje.tests.model.basic.EBasicVer; import com.avaje.tests.model.basic.xtra.DummyDao; import com.avaje.tests.model.basic.xtra.OptimisticLockExceptionThrowingDao; +import org.junit.Assert; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.persistence.OptimisticLockException; public class TestTxTypeOnTransactional extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/unitinternal/TestVanillaCollectionSet.java b/src/test/java/com/avaje/tests/unitinternal/TestVanillaCollectionSet.java index b4aa4a90b..3b21938df 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestVanillaCollectionSet.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestVanillaCollectionSet.java @@ -1,15 +1,14 @@ package com.avaje.tests.unitinternal; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.bean.BeanCollection; import com.avaje.tests.model.basic.EVanillaCollection; import com.avaje.tests.model.basic.EVanillaCollectionDetail; +import org.junit.Assert; +import org.junit.Test; + +import java.util.List; public class TestVanillaCollectionSet extends BaseTestCase { diff --git a/src/test/java/com/avaje/tests/update/TestEmbeddedRefreshUpdate.java b/src/test/java/com/avaje/tests/update/TestEmbeddedRefreshUpdate.java index 24e832ead..75f2ebe51 100644 --- a/src/test/java/com/avaje/tests/update/TestEmbeddedRefreshUpdate.java +++ b/src/test/java/com/avaje/tests/update/TestEmbeddedRefreshUpdate.java @@ -1,14 +1,13 @@ package com.avaje.tests.update; -import java.util.Date; - -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.embedded.EEmbDatePeriod; import com.avaje.tests.model.embedded.EEmbInner; import com.avaje.tests.model.embedded.EEmbOuter; +import org.junit.Test; + +import java.util.Date; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/avaje/tests/update/TestJsonStatelessUpdate.java b/src/test/java/com/avaje/tests/update/TestJsonStatelessUpdate.java index 9678eb7f0..a3e8779f7 100644 --- a/src/test/java/com/avaje/tests/update/TestJsonStatelessUpdate.java +++ b/src/test/java/com/avaje/tests/update/TestJsonStatelessUpdate.java @@ -1,22 +1,21 @@ package com.avaje.tests.update; -import java.io.IOException; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.text.json.JsonContext; import com.avaje.ebean.text.json.JsonWriteOptions; import com.avaje.tests.model.basic.UUOne; import com.avaje.tests.model.basic.UUTwo; +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; public class TestJsonStatelessUpdate extends BaseTestCase { @Test public void test() throws IOException { - + UUOne one = new UUOne(); one.setName("oneName"); @@ -25,29 +24,29 @@ public class TestJsonStatelessUpdate extends BaseTestCase { UUTwo two = new UUTwo(); two.setMaster(one); two.setName("twoName"); - + Ebean.save(two); - + UUTwo twoX = Ebean.find(UUTwo.class, two.getId()); - + JsonContext jsonContext = Ebean.json(); - + JsonWriteOptions writeOptions = JsonWriteOptions.parsePath("(id,name,master(*))"); String jsonString = jsonContext.toJson(twoX, writeOptions); - + jsonString = jsonString.replace("twoName", "twoNameModified"); jsonString = jsonString.replace("oneName", "oneNameModified"); - - + + UUTwo two2 = jsonContext.toBean(UUTwo.class, jsonString); - + Assert.assertEquals(twoX.getId(), two2.getId()); Assert.assertEquals("twoNameModified", two2.getName()); Assert.assertEquals("oneNameModified", two2.getMaster().getName()); // The update below cascades to also save "master" and that fails // as it thinks it should INSERT master rather than UPDATE master - + Ebean.update(two2); awaitL2Cache(); @@ -57,7 +56,7 @@ public class TestJsonStatelessUpdate extends BaseTestCase { Assert.assertEquals("twoNameModified", twoConfirm.getName()); Assert.assertEquals("oneNameModified", twoConfirm.getMaster().getName()); - + } - + } diff --git a/src/test/java/com/avaje/tests/update/TestMarkAsDirty.java b/src/test/java/com/avaje/tests/update/TestMarkAsDirty.java index 789ec6e1d..55dcad9ff 100644 --- a/src/test/java/com/avaje/tests/update/TestMarkAsDirty.java +++ b/src/test/java/com/avaje/tests/update/TestMarkAsDirty.java @@ -1,27 +1,26 @@ package com.avaje.tests.update; -import java.sql.Timestamp; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.EBasicVer; +import org.junit.Assert; +import org.junit.Test; + +import java.sql.Timestamp; public class TestMarkAsDirty extends BaseTestCase { @Test public void test() throws InterruptedException { - + EBasicVer bean = new EBasicVer("markAsDirty"); Ebean.save(bean); - + Timestamp lastUpdate = bean.getLastUpdate(); Assert.assertNotNull(lastUpdate); - + Thread.sleep(100); - + // ensure the update occurs and version property is updated/incremented Ebean.markAsDirty(bean); Ebean.save(bean); @@ -29,7 +28,7 @@ public class TestMarkAsDirty extends BaseTestCase { Timestamp lastUpdate2 = bean.getLastUpdate(); Assert.assertNotNull(lastUpdate2); Assert.assertNotEquals(lastUpdate, lastUpdate2); - + } - + } diff --git a/src/test/java/com/avaje/tests/update/TestPostgresTruncate.java b/src/test/java/com/avaje/tests/update/TestPostgresTruncate.java index 84803ebce..dfec7829f 100644 --- a/src/test/java/com/avaje/tests/update/TestPostgresTruncate.java +++ b/src/test/java/com/avaje/tests/update/TestPostgresTruncate.java @@ -1,10 +1,9 @@ package com.avaje.tests.update; +import com.avaje.ebean.BaseTestCase; import org.junit.Assert; import org.junit.Test; -import com.avaje.ebean.BaseTestCase; - public class TestPostgresTruncate extends BaseTestCase { @Test diff --git a/src/test/java/com/avaje/tests/update/TestSqlUpdateBindMultipleLists.java b/src/test/java/com/avaje/tests/update/TestSqlUpdateBindMultipleLists.java index 4590fbf1a..fae9d4382 100644 --- a/src/test/java/com/avaje/tests/update/TestSqlUpdateBindMultipleLists.java +++ b/src/test/java/com/avaje/tests/update/TestSqlUpdateBindMultipleLists.java @@ -57,7 +57,7 @@ public class TestSqlUpdateBindMultipleLists extends BaseTestCase { sqlUpdate.execute(); assertEquals("delete from o_customer where id in (?) and name in (?,?)", sqlUpdate.getGeneratedSql()); - sqlUpdate.setParameter("ids", asList(9992,4545)); + sqlUpdate.setParameter("ids", asList(9992, 4545)); sqlUpdate.setParameter("names", asList("ro3b")); sqlUpdate.execute(); assertEquals("delete from o_customer where id in (?,?) and name in (?)", sqlUpdate.getGeneratedSql()); diff --git a/src/test/java/com/avaje/tests/update/TestSqlUpdateInTxn.java b/src/test/java/com/avaje/tests/update/TestSqlUpdateInTxn.java index f8eff5f18..6e80edd5f 100644 --- a/src/test/java/com/avaje/tests/update/TestSqlUpdateInTxn.java +++ b/src/test/java/com/avaje/tests/update/TestSqlUpdateInTxn.java @@ -1,13 +1,11 @@ package com.avaje.tests.update; -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.SqlUpdate; -import com.avaje.ebean.TxRunnable; import com.avaje.tests.idkeys.db.AuditLog; +import org.junit.Assert; +import org.junit.Test; public class TestSqlUpdateInTxn extends BaseTestCase { @@ -20,36 +18,36 @@ public class TestSqlUpdateInTxn extends BaseTestCase { AuditLog log = new AuditLog(); log.setDescription("foo"); - + Ebean.save(log); - + AuditLog log2 = Ebean.find(AuditLog.class, log.getId()); Assert.assertEquals("foo", log2.getDescription()); - + final Long id = log2.getId(); final String updateDml = "update audit_log set description = :desc where id = :id"; final String updateModDml = "update audit_log set modified_description = :desc"; - + SqlUpdate sqlUpdate = Ebean.createSqlUpdate(updateDml); sqlUpdate.setParameter("desc", "foo2"); sqlUpdate.setParameter("id", id); sqlUpdate.execute(); - - SqlUpdate updateMod = Ebean.createSqlUpdate( updateModDml ) ; + + SqlUpdate updateMod = Ebean.createSqlUpdate(updateModDml); updateMod.setParameter("desc", "mod0"); updateMod.execute(); - + AuditLog log3 = Ebean.find(AuditLog.class, log.getId()); Assert.assertEquals("foo2", log3.getDescription()); Assert.assertEquals("mod0", log3.getModifiedDescription()); Ebean.execute(() -> { - SqlUpdate update = Ebean.createSqlUpdate( updateDml ) ; + SqlUpdate update = Ebean.createSqlUpdate(updateDml); update.setParameter("desc", "foo3"); update.setParameter("id", id); update.execute(); - SqlUpdate updateMod1 = Ebean.createSqlUpdate( updateModDml ) ; + SqlUpdate updateMod1 = Ebean.createSqlUpdate(updateModDml); updateMod1.setParameter("desc", "mod1"); updateMod1.execute(); }); @@ -58,15 +56,15 @@ public class TestSqlUpdateInTxn extends BaseTestCase { Assert.assertEquals("foo3", log4.getDescription()); Assert.assertEquals("mod1", log4.getModifiedDescription()); - + Ebean.beginTransaction(); - - SqlUpdate update = Ebean.createSqlUpdate( updateDml) ; + + SqlUpdate update = Ebean.createSqlUpdate(updateDml); update.setParameter("desc", "foo4"); update.setParameter("id", id); update.execute(); - updateMod = Ebean.createSqlUpdate( updateModDml ) ; + updateMod = Ebean.createSqlUpdate(updateModDml); updateMod.setParameter("desc", "mod2"); updateMod.execute(); @@ -77,5 +75,5 @@ public class TestSqlUpdateInTxn extends BaseTestCase { Assert.assertEquals("mod2", log5.getModifiedDescription()); } - + } diff --git a/src/test/java/com/avaje/tests/update/TestStatelessUpdate.java b/src/test/java/com/avaje/tests/update/TestStatelessUpdate.java index a5d832825..45e9d5e53 100644 --- a/src/test/java/com/avaje/tests/update/TestStatelessUpdate.java +++ b/src/test/java/com/avaje/tests/update/TestStatelessUpdate.java @@ -1,15 +1,5 @@ package com.avaje.tests.update; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.EbeanServer; @@ -17,6 +7,14 @@ import com.avaje.tests.model.basic.Contact; import com.avaje.tests.model.basic.Customer; import com.avaje.tests.model.basic.EBasic; import com.avaje.tests.model.basic.EBasic.Status; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -156,7 +154,7 @@ public class TestStatelessUpdate extends BaseTestCase { Assert.assertNotNull(result.getContacts()); Assert.assertFalse("the contacts mustn't be deleted", result.getContacts().isEmpty()); } - + /** * When BeanCollection is inadvertantly initialised and empty then ignore it * Specifically a non-BeanCollection (like ArrayList) is not ignored in terms @@ -183,7 +181,7 @@ public class TestStatelessUpdate extends BaseTestCase { // with Ebean enhancement this loads the an empty contacts BeanList customerWithChange.getContacts(); - + // contacts has been initialised to empty BeanList Assert.assertTrue(containsContacts(customerWithChange)); server.update(customerWithChange); @@ -194,7 +192,7 @@ public class TestStatelessUpdate extends BaseTestCase { Assert.assertNotNull(result.getContacts()); Assert.assertFalse("the contacts mustn't be deleted", result.getContacts().isEmpty()); } - + @Test public void testStatelessUpdateDeleteChildrenForNonBeanCollection() { @@ -215,8 +213,8 @@ public class TestStatelessUpdate extends BaseTestCase { customerWithChange.setName("new name"); // with Ebean enhancement this loads the an empty contacts BeanList - customerWithChange.setContacts(Collections. emptyList()); - + customerWithChange.setContacts(Collections.emptyList()); + Assert.assertTrue(containsContacts(customerWithChange)); server.update(customerWithChange); @@ -226,11 +224,11 @@ public class TestStatelessUpdate extends BaseTestCase { Assert.assertNotNull(result.getContacts()); Assert.assertTrue("the contacts were deleted", result.getContacts().isEmpty()); } - + private boolean containsContacts(Customer cust) { return server.getBeanState(cust).getLoadedProps().contains("contacts"); } - + /** * when using stateless updates with recursive calls, * the version column shouldn't decide to use insert instead of update, @@ -258,7 +256,7 @@ public class TestStatelessUpdate extends BaseTestCase { Contact updateContact2 = new Contact(); updateContact2.setId(contact2.getId()); - + Customer updateCustomer = new Customer(); updateCustomer.setId(customer.getId()); updateCustomer.getContacts().add(updateContact1); @@ -270,7 +268,7 @@ public class TestStatelessUpdate extends BaseTestCase { // maybe check if update instead of insert has been executed, // currently "Unique index or primary key violation" PersistenceException is throwing } - + @Test public void testStatelessRecursiveUpdateWithChangesInDetailOnly() { // arrange @@ -286,7 +284,6 @@ public class TestStatelessUpdate extends BaseTestCase { customer.getContacts().add(contact2); server.save(customer); - // act @@ -294,11 +291,11 @@ public class TestStatelessUpdate extends BaseTestCase { updateContact1.setId(contact1.getId()); updateContact1.setLastName("contact1-changed"); - + Contact updateContact3 = new Contact(); //updateContact3.setId(contact3.getId()); updateContact3.setLastName("contact3-added"); - + Customer updateCustomer = new Customer(); updateCustomer.setId(customer.getId()); updateCustomer.getContacts().add(updateContact1); @@ -306,10 +303,10 @@ public class TestStatelessUpdate extends BaseTestCase { // not adding contact2 so it will get deleted //updateCustomer.getContacts().add(updateContact2); - + server.update(updateCustomer); - + // assert Customer assCustomer = server.find(Customer.class, customer.getId()); List assContacts = assCustomer.getContacts(); @@ -323,12 +320,12 @@ public class TestStatelessUpdate extends BaseTestCase { Assert.assertTrue(ids.contains(contact1.getId())); Assert.assertTrue(ids.contains(updateContact3.getId())); Assert.assertFalse(ids.contains(contact2.getId())); - + Assert.assertTrue(names.contains(updateContact1.getLastName())); Assert.assertTrue(names.contains(updateContact3.getLastName())); } - - + + @Test public void testStatelessRecursiveUpdateWithChangesInDetailOnlyAnd() { // arrange @@ -344,17 +341,17 @@ public class TestStatelessUpdate extends BaseTestCase { customer.getContacts().add(contact2); server.save(customer); - + // act Contact updateContact1 = new Contact(); updateContact1.setId(contact1.getId()); updateContact1.setLastName("contact1-changed"); - + Contact updateContact3 = new Contact(); updateContact3.setLastName("contact3-added"); - + Customer updateCustomer = new Customer(); updateCustomer.setId(customer.getId()); updateCustomer.getContacts().add(updateContact1); @@ -364,14 +361,14 @@ public class TestStatelessUpdate extends BaseTestCase { boolean deleteMissingChildren = false; server.update(updateCustomer, null, deleteMissingChildren); - + // assert Customer assCustomer = server.find(Customer.class, customer.getId()); List assContacts = assCustomer.getContacts(); - + // contact 2 was not deleted this time assertEquals(3, assContacts.size()); - + Set ids = new LinkedHashSet<>(); Set names = new LinkedHashSet<>(); for (Contact contact : assContacts) { @@ -381,7 +378,7 @@ public class TestStatelessUpdate extends BaseTestCase { Assert.assertTrue(ids.contains(contact1.getId())); Assert.assertTrue(ids.contains(updateContact3.getId())); Assert.assertTrue(ids.contains(contact2.getId())); - + Assert.assertTrue(names.contains(updateContact1.getLastName())); Assert.assertTrue(names.contains(contact2.getLastName())); Assert.assertTrue(names.contains(updateContact3.getLastName())); diff --git a/src/test/java/com/avaje/tests/update/TestUpdateAllLoadedProperties.java b/src/test/java/com/avaje/tests/update/TestUpdateAllLoadedProperties.java index a02782991..b892f6ebd 100644 --- a/src/test/java/com/avaje/tests/update/TestUpdateAllLoadedProperties.java +++ b/src/test/java/com/avaje/tests/update/TestUpdateAllLoadedProperties.java @@ -68,10 +68,10 @@ public class TestUpdateAllLoadedProperties extends BaseTestCase { ids.add(id2); List beans = Ebean.find(EBasicVer.class) - .select("name, other") - .where().idIn(ids) - .order().asc("id") - .findList(); + .select("name, other") + .where().idIn(ids) + .order().asc("id") + .findList(); assertEquals(2, beans.size()); diff --git a/src/test/java/com/avaje/tests/update/TestUpdatePartial.java b/src/test/java/com/avaje/tests/update/TestUpdatePartial.java index 6c6215627..f4a5e4283 100644 --- a/src/test/java/com/avaje/tests/update/TestUpdatePartial.java +++ b/src/test/java/com/avaje/tests/update/TestUpdatePartial.java @@ -23,11 +23,11 @@ public class TestUpdatePartial extends BaseTestCase { checkDbStatusValue(c.getId(), "A"); Customer c2 = Ebean.find(Customer.class) - .setUseCache(false) - .select("status, smallnote") - .setId(c.getId()) - .findUnique(); - + .setUseCache(false) + .select("status, smallnote") + .setId(c.getId()) + .findUnique(); + c2.setStatus(Customer.Status.INACTIVE); c2.setSmallnote("2nd note"); @@ -35,11 +35,11 @@ public class TestUpdatePartial extends BaseTestCase { checkDbStatusValue(c.getId(), "I"); Customer c3 = Ebean.find(Customer.class) - .setUseCache(false) - .select("status") - .setId(c.getId()) - .findUnique(); - + .setUseCache(false) + .select("status") + .setId(c.getId()) + .findUnique(); + c3.setStatus(Customer.Status.NEW); c3.setSmallnote("3rd note"); diff --git a/src/test/java/com/avaje/tests/update/TestUpdatePartialNoVer.java b/src/test/java/com/avaje/tests/update/TestUpdatePartialNoVer.java index c5da87de3..f72c6815e 100644 --- a/src/test/java/com/avaje/tests/update/TestUpdatePartialNoVer.java +++ b/src/test/java/com/avaje/tests/update/TestUpdatePartialNoVer.java @@ -1,11 +1,10 @@ package com.avaje.tests.update; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.tests.model.basic.EBasic; import com.avaje.tests.model.basic.EBasic.Status; +import org.junit.Test; public class TestUpdatePartialNoVer extends BaseTestCase {